diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss index cb7f32ab30c1c220212a4dee737dbae29296bf87..2ec7208aa6fee819e34ae66f6cc2d778ee0fe718 100644 --- a/themes/finc/scss/_customVariables.scss +++ b/themes/finc/scss/_customVariables.scss @@ -147,7 +147,7 @@ $btn-transparent-border: $border-color !default; $button-title-hover-bg: $brand-secondary !default; -$btn-language-hover-bg: $brand-secondary !default; +$btn-language-hover-bg: $brand-primary !default; $btn-language-active-hover-bg: $steel !default; // Padding for toolbar buttons in record view/detail view diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss index 71c54268af819e0b2de7fcee3e0961d343ab93aa..693a8217d1776965d6f32473e600ec1e756f6daa 100644 --- a/themes/finc/scss/compiled.scss +++ b/themes/finc/scss/compiled.scss @@ -374,10 +374,47 @@ legend { .text-success { background-color: $brand-success; margin-bottom: 0; + + // Warning signs in MyAccount sidebar + &.fa-bell, + &.fa-clock-o { + color: $brand-success; + } +} + +.text-warning { + // Warning signs in MyAccount sidebar + &.fa-bell, + &.fa-clock-o { + color: $brand-warning; + } } .text-danger { background-color: $brand-danger; + + // Warning sign in front of Login/MyAccount in header + &.fa-exclamation-triangle { + color: $brand-danger; + } +} + +// Warning signs in MyAccount sidebar and warning sign in front of Login/MyAccount in header +.text-danger, +.text-success, +.text-warning { + &.fa-bell, + &.fa-clock-o, + &.fa-exclamation-triangle { + background: transparent; + padding: 0; + + // icons in header navbar on Hover + .btn:focus &, + .btn:hover & { + color: inherit; + } + } } //// Required symbol @@ -1504,13 +1541,14 @@ header, padding-right: 0; // Make wider to fit searchbox and right-hand nav-elements in - @media only screen and (min-width: $screen-sm-min) { + @media (min-width: $screen-sm-min) { flex: 0 1 auto; padding-top: $button-top-padding; + width: auto; } // Float "Find" button next to searchbox on XS and SM - @media only screen and (max-width: $screen-sm-max) { + @media (max-width: $screen-sm-max) { padding-left: 0; .searchForm { @@ -2331,7 +2369,7 @@ body:not(.offcanvas) .sidebar { } } -//// Style my account sidebar menues to get the same look as facets +//// Style myaccount sidebar menues to get the same look as facets .myresearch-menu { border: 1px solid $border-color; @@ -2460,7 +2498,7 @@ body:not(.offcanvas) .sidebar { } } -//// OR- and AND-Facets + item counts in My Account +//// OR- and AND-Facets + item counts in MyAccount ///// Style the exclude icons .exclude i { color: $badge-link-color; @@ -2498,6 +2536,15 @@ body:not(.offcanvas) .sidebar { } } + // Numbers in MyAccount sidebar + &.ok, + &.overdue { + .myresearch-menu & { + color: $white; + padding: 3px 7px; + } + } + ////// light color on dark, when active (Facets + My Account) - we need the parent for specificity .facet.active > &, .sidebar a.active > & { diff --git a/themes/finc/templates/header.phtml b/themes/finc/templates/header.phtml index e277d9d9374976bbd3e34e3f0b88dea27fefbfb2..b2019c53f1fe2c15e6e4d3b2e757cce73be8f037 100644 --- a/themes/finc/templates/header.phtml +++ b/themes/finc/templates/header.phtml @@ -48,7 +48,7 @@ <li class="logoutOptions<?php if ($account->dropdownEnabled()): ?> with-dropdown<?php endif ?><?php if (!$account->isLoggedIn()): ?> hidden<?php endif ?>"> <a class="btn" href="<?=$this->url('myresearch-home', [], ['query' => ['redirect' => 0]])?>"> <i id="account-icon" class="fa fa-home" aria-hidden="true"></i> - <span class="sr-only"><?=$this->transEsc("Your Account")?></span> + <span><?=$this->transEsc("Your Account")?></span> </a> </li> <?php if ($account->dropdownEnabled()): ?> @@ -61,21 +61,21 @@ <?php endif; ?> <li class="logoutOptions<?php if (!$account->isLoggedIn()): ?> hidden<?php endif ?>"> <a href="<?=$this->url('myresearch-logout')?>" class="logout btn"> - <i class="fa fa-sign-out" aria-hidden="true" title="<?=$this->transEsc('Log Out')?>"></i> - <span class="sr-only"><?=$this->transEsc("Log Out")?></span> + <i class="fa fa-sign-out" aria-hidden="true"></i> + <span><?=$this->transEsc("Log Out")?></span> </a> </li> <li id="loginOptions"<?php if ($account->isLoggedIn()): ?> class="hidden"<?php endif ?>> <?php if ($account->getSessionInitiator($this->serverUrl($this->url('myresearch-home')))): ?> <a class="btn" href="<?=$this->url('myresearch-userlogin')?>"> - <i class="fa fa-sign-in" aria-hidden="true" title="<?=$this->transEsc('Institutional Login')?>"></i> - <span class="sr-only"><?=$this->transEsc("Institutional Login")?></span> + <i class="fa fa-sign-in" aria-hidden="true"></i> + <span><?=$this->transEsc("Institutional Login")?></span> </a> <?php else: ?> <a class="btn" href="<?=$this->url('myresearch-userlogin')?>" data-lightbox> - <i class="fa fa-sign-in" aria-hidden="true" title="<?=$this->transEsc('Login')?>"></i> - <span class="sr-only"><?=$this->transEsc("Login")?></span> + <i class="fa fa-sign-in" aria-hidden="true"></i> + <span><?=$this->transEsc("Login")?></span> </a> <?php endif; ?> </li> @@ -126,7 +126,7 @@ <?php /* finc searchbox: we use searchbox here so it becomes part of the sticky header, we need to place this after the navbar-right for anything but mobile - see flex-container in SCSS:*/ ?> <?php if ($this->layout()->searchbox !== false): ?> - <div class="search container navbar"> + <div class="search container"> <nav class="nav searchbox hidden-print" role="search"> <?=$this->layout()->searchbox?> </nav>