From 0cbebcdd1984d0ecae2241b20b265ce240774b17 Mon Sep 17 00:00:00 2001
From: ckaz <kazzer@uni-leipzig.de>
Date: Fri, 26 Jun 2020 16:56:36 +0200
Subject: [PATCH] refs #17599 [finc, VF5.1 BARF] restructures, corrects SCSS
* restructures and corrects SCSS for header and language dropdown
* corrects outline in header: removes solide white border for hover/focus
* fix header outline color: sets border color on focus to focus color
---
themes/finc/scss/compiled.scss | 144 +++++++++++++++------------------
1 file changed, 64 insertions(+), 80 deletions(-)
diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss
index c1a2a5bfb8d..798fa7ac0ed 100644
--- a/themes/finc/scss/compiled.scss
+++ b/themes/finc/scss/compiled.scss
@@ -381,9 +381,27 @@ input[type='text'] {
border: $border-default-styles;
padding: ($grid-gutter-width / 4);
- header,
+ &:hover {
+ outline: 1px $black solid;
+ }
+
+ header &,
#searchForm & {
border: $border-default-white;
+
+ &:hover {
+ box-shadow: none;
+ outline: 1px $black solid;
+ }
+ }
+}
+
+// pull from under fields select
+#searchForm input {
+ &:hover,
+ &:focus {
+ border-color: $input-border-focus;
+ outline-offset: -1px;
}
}
@@ -441,6 +459,10 @@ select.form-control {
}
}
+select:hover {
+ outline: 1px $black solid;
+}
+
//// Create list in add to favs dialog
.form-edit-list {
.radio {
@@ -475,34 +497,6 @@ select {
//// textarea {}
-// Mouse hover for input[type='text'] and select
-input[type='text'] {
- &:hover {
- outline: 1px $black solid;
- }
-
- header,
- #searchForm &:focus,
- #searchForm &:hover {
- box-shadow: none;
- outline: 1px $black solid;
- outline-offset: -1px;
- }
-}
-
-select {
- &:hover {
- outline: 1px $black solid;
- }
-
- header,
- #searchForm &:focus,
- #searchForm &:hover {
- box-shadow: none;
- outline: 1px $black solid;
- outline-offset: -1px;
- }
-}
// FORMS - END
@@ -1215,54 +1209,52 @@ header,
min-height: $navbar-height-sm;
//padding-bottom: ($grid-gutter-width / 2);
}
+}
+
+// style navbar toggler content when opened
+.navbar-collapse.collapse.in {
+ @media (min-width: $screen-sm-min) {
+ background-color: $navbar-bg-color;
+ position: absolute;
+ top: $navbar-height-xs * 1.5;
+ }
+}
- // style navbar toggler content when opened
- .navbar-collapse.collapse.in {
- @media (min-width: $screen-sm-min) {
- background-color: $navbar-bg-color;
- position: absolute;
- top: $navbar-height-xs * 1.5;
- }
+// Style language dropdown for XS
+@media (max-width: $screen-xs-max) {
+ // avoid BG bleed on small
+ .navbar .navbar-nav {
+ margin-bottom: 0;
}
+}
- // Style language dropdown for XS
- @media (max-width: $screen-xs-max) {
- // avoid BG bleed on small
- .navbar-nav {
- margin-bottom: 0;
- }
+.language .dropdown-menu {
+ background-color: $navbar-bg-color;
+ border: 0;
+ min-width: auto;
- .language .dropdown-menu {
- background-color: $navbar-bg-color;
- border: 0;
- min-width: 4em;
-
- li {
-
- a {
- color: $link-color;
-
- &.btn {
- @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base);
- padding-left: 0;
- padding-right: 0;
- }
- &.btn:hover {
- background-color: $white;
- }
- }
+ .btn:hover {
+ background-color: $btn-language-hover-bg;
+ }
+
+ li a {
+ color: $link-color;
+
+ &.btn {
+ @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base);
+ padding-left: 0;
+ padding-right: 0;
+
+ &:hover {
+ background-color: $white;
}
}
- .language .dropdown-menu.oneLanguage {
- display: block;
- position: relative;
- }
}
-}
-.language .dropdown-menu.oneLanguage {
- display: block;
- position: relative;
+ &.oneLanguage {
+ display: block;
+ position: relative;
+ }
}
.navbar-header {
@@ -1287,7 +1279,7 @@ header,
// Make smaller to fit searchbox and right-hand nav-elements
@media only screen and (min-width: $screen-sm-min) {
- flex: 1 0 22%;
+ flex: 1 0 30%;
}
// Make right-hand header parts full width for advanced search page since it doesn't use any left-hand header parts
@@ -2402,16 +2394,7 @@ footer ul {
// Bookbag - END
-// Accessibility
-.language .dropdown-menu {
- .btn:hover {
- background-color: $btn-language-hover-bg;
- }
-}
-
-// Accessibility - END
-
-// Translate feature
+// Translate feature (Admin panel)
#set-translation-form {
margin-top: 2em;
}
@@ -2625,6 +2608,7 @@ input {
}
}
+
// Account - END
.open .btn-transparent.dropdown-toggle {
--
GitLab