From bc479f3c42f6df40465c811dcd1be066b5395de8 Mon Sep 17 00:00:00 2001 From: Claas Kazzer <kazzer@uni-leipzig.de> Date: Fri, 15 Jul 2022 16:52:10 +0200 Subject: [PATCH] refs #22126 [finc] vf6: post-SCSS corrections * corrects form-control in modals * corrects help-links in adv. search * corrects fieldset for Create New Favorites List * corrects navbar height on xs * corrects paste error --- themes/finc/scss/_customVariables.scss | 7 ++++--- themes/finc/scss/components/_forms.scss | 6 ++++++ themes/finc/scss/components/_modal.scss | 4 ++-- themes/finc/scss/components/_sidebar.scss | 3 ++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss index e8914ca83cf..cf7424408c5 100644 --- a/themes/finc/scss/_customVariables.scss +++ b/themes/finc/scss/_customVariables.scss @@ -659,8 +659,9 @@ $container-for-navbar-flex-direction-xs: column !default; // or set the paddings-top under 'body' in compiled.scss to '=0'; see also the comment in header.phtml $navbar-height: 112px !default; // = 7 x 1rem //80px !default; $navbar-height-sm: $navbar-height !default; -// Set navbar-height for small devices, USE px as rem will throw an error in conjunction _variables.scss -$navbar-height-xs: $navbar-height + 40px !default; + +// Set navbar-height for small devices, USE px as rem will throw an error in conjunction with _variables.scss +$navbar-height-xs: $navbar-height + 14px !default; $navbar-min-height-adv-search: 3rem !default; $navbar-max-height-xs: $navbar-height + 32px !default; @@ -808,7 +809,7 @@ $search-filter-remove-all-color: $black !default; $search-filter-remove-all-bg: $brand-warning !default; $search-filter-remove-hover-bg: $brand-warning !default; -$search-filter-remove-hover-color: $black !default; +$search-filter-remove-hover-color: $white !default; $search-filter-values-remove-color: $white !default; diff --git a/themes/finc/scss/components/_forms.scss b/themes/finc/scss/components/_forms.scss index 5d542787b90..41ee3112362 100644 --- a/themes/finc/scss/components/_forms.scss +++ b/themes/finc/scss/components/_forms.scss @@ -70,6 +70,12 @@ fieldset { float: $fieldset-edit-favorites-list-xs-float; } } + + .form-edit-list & { + border: 0; + float: none; + padding: 0; + } } diff --git a/themes/finc/scss/components/_modal.scss b/themes/finc/scss/components/_modal.scss index 45c4262582c..d8da8865f4e 100644 --- a/themes/finc/scss/components/_modal.scss +++ b/themes/finc/scss/components/_modal.scss @@ -13,9 +13,9 @@ width: $modal-dialog-width-sm-up; // Login form and others: - // Nesting inside '.modal-dialog' required to overwrite BS values, CK + // keep !important or rewrite using '#modal ...', CK input.form-control { - max-width: $modal-dialog-input-max-width-sm-up; + max-width: $modal-dialog-input-max-width-sm-up !important; } } diff --git a/themes/finc/scss/components/_sidebar.scss b/themes/finc/scss/components/_sidebar.scss index d19b1b27bbc..784e9013abe 100644 --- a/themes/finc/scss/components/_sidebar.scss +++ b/themes/finc/scss/components/_sidebar.scss @@ -119,7 +119,8 @@ a, .text, .badge, - .title { + .title, + .help-link { // Add facet item padding to items padding: $sidebar-item-padding; } -- GitLab