From 1f43f6f552852ecc095ad037e5db9b5ac9c08555 Mon Sep 17 00:00:00 2001 From: Svetlana Rastegina Date: Thu, 11 Feb 2021 14:11:34 +0100 Subject: [PATCH] Fixed fonts size in search block on various screen resolutions. --- webapp/src/main/webapp/themes/iph/css/iph.css | 105 +++++++++++++++++- .../themes/iph/css/query-builder-theme.css | 2 + .../webapp/themes/iph/css/query-builder.css | 3 +- .../themes/iph/templates/queryBuilder.ftl | 4 +- 4 files changed, 108 insertions(+), 6 deletions(-) diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css index da6c5569..36a1eae3 100644 --- a/webapp/src/main/webapp/themes/iph/css/iph.css +++ b/webapp/src/main/webapp/themes/iph/css/iph.css @@ -97,6 +97,8 @@ select, input[type="password"] { border: 0; font-size: 1rem; + font-family: Roboto; + font-style: italic; padding: .5em; background: #fff; border: 1px dashed #000000; @@ -108,12 +110,23 @@ input[type="password"] { select.form-control { padding: 5px; + font-family: Roboto; + font-style: normal; } +input.form-control { + font-family: Roboto; + font-size: 1rem; + color: #000000; + opacity: 0.5; +} + + .btn-success.set-json { background-color: #ffffff; border: 1px dashed #000000; font-size: 1rem; + font-family: Roboto; flex-grow: 1; margin-right: 10px; } @@ -681,7 +694,7 @@ input.search-vivo { #OuterWrapperButtons { display: flex; justify-content: space-between; - width: 70%; + width: auto; margin-left: 2%; background-color: #F1F1F1; padding: 15px 10px 15px 10px; @@ -692,6 +705,10 @@ input.search-vivo { #SearchTitle { background-color: #F1F1F1; + font-size: 1.3rem; + padding-left: 20px; + padding-top: 15px; + font-family: Roboto; } #SelectResults { @@ -701,13 +718,16 @@ input.search-vivo { padding-left: 5px; margin-left: 10px; } - +#SelectResults >label { + padding-left: 5px; + padding-right: 5px; +} #btn-search-expand { width: 15%; margin-right: 2%; background-color: #ffffff; border: 1px solid #DD9F00; - font-size: 1.2rem; + font-size: 1rem; height: 49px; } @@ -723,6 +743,9 @@ input.search-vivo { border-right: 0px; border-top: 0px; border-bottom: 0px; + font-family: Roboto; + font-size: 1rem; + font-style: normal; } #btn-get-standard-searchform { @@ -2193,6 +2216,10 @@ span.subclassExpandMinus { ul#main-nav { font-size: 1rem; } + #main-nav li a { + padding-left: 15px; + padding-right: 15px; + } #wrapper-content { width: 95%; padding-top: 5px; @@ -2228,10 +2255,80 @@ span.subclassExpandMinus { } } + +@media screen and (max-width: 800px) { + input.form-control { + font-size: 0.8rem; + } + input[type="text"], + select, + input[type="password"] { + font-size: 0.8rem; + } + .btn-success.set-json { + font-size: 0.8rem; + } + #btn-reset-button { + font-size: 0.8rem; + } + #btn-search-expand { + font-size: 0.8rem; + height: 44px; + } + .query-builder .btn-xs, .query-builder .btn-group-xs>.btn { + font-size: 0.8rem; + } + #SelectResults { + font-size: 0.8rem; + } + #hitsPerPageSelect { + font-size: 0.8rem; + } + #OuterWrapperButtons { + padding-top: 10px; + } + #builder_group_0 { + padding-bottom: 5px; + } + .btn.btn-xs.btn-success { + font-size: 0.8rem; + } + .btn.btn-xs.btn-danger { + font-size: 0.8rem; + } + .query-builder .btn-primary.active { + font-size: 0.8rem; + } + .btn.btn-xs.btn-primary { + font-size: 0.8rem; + } + ul#main-nav { + font-size: 0.9rem; + } + #main-nav li a { + padding-left: 14px; + padding-right: 14px; + } + #SearchTitle { + font-size: 1.1rem; + } +} + @media screen and (max-width: 720px) { #stats li { width: 80px; } #stats > li { - margin-left: 5px;} + margin-left: 5px; + } + ul#main-nav { + font-size: 0.9rem; + } + #main-nav li a { + padding-left: 10px; + padding-right: 10px; + } + #SearchTitle { + font-size: 1rem; + } } \ No newline at end of file diff --git a/webapp/src/main/webapp/themes/iph/css/query-builder-theme.css b/webapp/src/main/webapp/themes/iph/css/query-builder-theme.css index 5f39c6c7..e6858d0e 100644 --- a/webapp/src/main/webapp/themes/iph/css/query-builder-theme.css +++ b/webapp/src/main/webapp/themes/iph/css/query-builder-theme.css @@ -63,6 +63,7 @@ icons: { color: #000000; background-color: #ffffff; border: 0px; + font-family: Roboto; /*box-shadow: 0px 4px 2px #aeaeae;*/ } @@ -91,6 +92,7 @@ icons: { button.btn.btn-xs.btn-danger { /*box-shadow: 0px 0px 0px #000000;*/ border-left: 1px solid #ead6a2; + font-family: Roboto; } diff --git a/webapp/src/main/webapp/themes/iph/css/query-builder.css b/webapp/src/main/webapp/themes/iph/css/query-builder.css index 97b03b6e..50018156 100644 --- a/webapp/src/main/webapp/themes/iph/css/query-builder.css +++ b/webapp/src/main/webapp/themes/iph/css/query-builder.css @@ -31,7 +31,7 @@ } .query-builder .rules-group-container { - padding: 20px 20px 15px 20px; + padding: 12px 20px 10px 20px; /*border-right: 1px solid #8B4513; border-left: 1px solid #8B4513; border-top: 1px solid #8B4513; @@ -40,6 +40,7 @@ outline: 1px dashed #000000; outline-offset: 0px; margin-bottom: 10px; + font-family: Roboto; } #builder_group_0 { diff --git a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl index a88f52d7..103d9e38 100644 --- a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl +++ b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl @@ -1,6 +1,8 @@