diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss index c805f145d0cb23a9419f88b248844a02385628c6..7ffad75f242dfcc88dc4520e4b5c2ca1bb53d2f3 100644 --- a/themes/finc/scss/_customVariables.scss +++ b/themes/finc/scss/_customVariables.scss @@ -20,15 +20,14 @@ $font-size-breadcrumbs: ($font-size-base * .85) !default; $line-height-base: 1.5 !default; // COLORS -$brand-primary: #1779ba !default; +$brand-primary: #204563 !default; $brand-secondary: #e7e7e7 !default; $brand-danger: #cc4b37 !default; // darker red = #a94442 $brand-danger-transparent: transparentize($brand-danger, .1) !default; // used e.g. for invalid form fields -$brand-info: #008cba !default; -$brand-success: #43ac6a !default; // darker green = #3c763d +$brand-info: #083152 !default; +$brand-success: #085218 !default; // darker green = #3c763d $brand-warning: #f08a24 !default; -$traffic-light-yellow: #ffff00 !default; - +$traffic-light-yellow: #ff0 !default; $white: #fff; $ghost: #fafafa; @@ -104,7 +103,6 @@ $margin-right-width: inherit !default; $outline-default-style: solid !default; $outline-default-color: $brand-warning !default; - //// PAGER $pagination-disabled-color: $gainsboro !default; diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss index 495b3d4aa75e2904102d6d74101955c2cff82c31..6f257dbab490c4ff0ffe553841092f41dd22ff86 100644 --- a/themes/finc/scss/compiled.scss +++ b/themes/finc/scss/compiled.scss @@ -13,11 +13,11 @@ @import 'customMixins'; // ------------------------------------------------------- // 1.1 Unless imported, define standard colour variables here which are used in variables below prior to finc.scss import -// e.g. $brand-primary: #008CBA !default; // bondi-blue +// e.g. $brand-primary: #083152 !default; // blue // $brand-secondary: #e7e7e7 !default; // white-lilac // $brand-danger: #f04124 !default; // cinnabar // $brand-info: #a0d3e8 !default; // cornflower -// $brand-success: #43AC6A !default; // sea-green +// $brand-success: #085218 !default; // sea-green // $brand-warning: #f08a24 !default; // carrot // ------------------------------------------------------- // 1.2 DO NOT define site-specific colours in finc - this will be done in site-specific themes @@ -130,11 +130,21 @@ label, // HEADINGS //// All -//// remove top margin to align with sidebars etc +//// remove top margin to align with sidebars etc., except advanced search on XS h1:first-of-type { margin-top: 0; } +@media only screen and (max-width: $screen-xs-max) { + h1:first-of-type { + margin-top: revert; + + body:not(.template-name-advanced) & { + margin-top: 0; + } + } +} + //// h1 h1 { font-size: 2rem; @@ -386,7 +396,7 @@ select.form-control { } header & { - border: none; + border: 0; } } @@ -523,7 +533,7 @@ select { &:hover, &:focus { - color: darken($btn-transparent-color, 30%); + color: lighten($btn-transparent-color, 80%); } } @@ -1052,7 +1062,7 @@ header, // NAVBAR //// Container for Navbar .banner { - display: flex; // important for subsequent elements + display: flex; // important for subsequent flex elements // stack elements on top of each other on XS @media only screen and (max-width: $screen-xs-max) { @@ -1260,6 +1270,7 @@ header, &:hover, &:focus { background-color: $component-active-bg; // Same hover-color must be applied to 'Advanced Search' button below + color: $white; } } @@ -1332,6 +1343,7 @@ header, &:hover, &:focus { background-color: $component-active-bg; // Same hover-color must be applied to Header buttons above + color: $white; } } } @@ -2013,7 +2025,7 @@ footer { .sidebar .facet.active, .sidebar a.active { background-color: $brand-warning; - // border-color: $border-color; + color: $black; // also include icon .fa { @@ -2220,10 +2232,11 @@ footer ul { // Modal close button (Needs to be as fancy to override BS styles) #modal .modal-content > .close, #modal .modal-content > .adv-term-remove { - border: $border-default-styles; + background: $white; + border: 0; color: $btn-default-color; left: auto; - opacity: 1; + opacity: unset; right: 0; @media (min-width: 768px) { @@ -2236,6 +2249,8 @@ footer ul { &:hover { background-color: $black; + color: $white; + opacity: unset; } } diff --git a/themes/finc/templates/Recommend/SideFacets/single-facet.phtml b/themes/finc/templates/Recommend/SideFacets/single-facet.phtml index 6f6bb7f0bb9f6ea7ce19fc05ce5c140067012feb..ea0a7b9fd968b9dc657c3d00f5c1f8180f4d602a 100644 --- a/themes/finc/templates/Recommend/SideFacets/single-facet.phtml +++ b/themes/finc/templates/Recommend/SideFacets/single-facet.phtml @@ -51,7 +51,7 @@ <?php if ($this->exclude && !$this->facet['isApplied']): ?> <?php $excludeURL = $this->urlBase . $this->url->addFacet($this->group, $this->facet['value'], 'NOT'); ?> - <a href="<?=$excludeURL ?>" data-lightbox-ignore title="<?=$this->transEsc('exclude_facet') ?>" class="exclude"><i class="fa fa-times" aria-hidden="true"></i></a> + <a href="<?=$excludeURL ?>" data-lightbox-ignore title="<?=$this->transEsc('exclude_facet') ?>" class="exclude"><i class="fa fa-times" aria-hidden="true"></i><span class="sr-only"><?=$this->transEsc('exclude_facet') ?></span> </a> <?php endif; ?> <?=$hasSubLinks ? '</div>' : '</a>'; ?> diff --git a/themes/finc/templates/header.phtml b/themes/finc/templates/header.phtml index 250a1b6dbafe1a987b745a899c8ad8d948758841..2d6436ece011d54fd6e8bcfcae9a0fb21c94f4b5 100644 --- a/themes/finc/templates/header.phtml +++ b/themes/finc/templates/header.phtml @@ -46,8 +46,10 @@ <?php endif; ?> <?php if (is_object($account) && $account->loginEnabled()): // hide login/logout if unavailable ?> <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></a> + <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> + </a> </li> <?php if ($account->dropdownEnabled()): ?> <li id="login-dropdown" class="dropdown<?php if (!$account->isLoggedIn()): ?> hidden<?php endif ?>"> diff --git a/themes/finc/templates/myresearch/cataloglogin.phtml b/themes/finc/templates/myresearch/cataloglogin.phtml new file mode 100644 index 0000000000000000000000000000000000000000..840cb970a2e9a82efa34188b78c191f3302fe215 --- /dev/null +++ b/themes/finc/templates/myresearch/cataloglogin.phtml @@ -0,0 +1,43 @@ +<?php + // Set up page title: + $this->headTitle($this->translate('Login')); + + // Set up breadcrumbs: + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Login') . '</li>'; + + // Convenience variable: + $offlineMode = $this->ils()->getOfflineMode(); +?> +<?php if ($offlineMode == "ils-offline"): ?> + <?=$this->render('Helpers/ils-offline.phtml', ['offlineModeMsg' => 'ils_offline_login_message'])?> +<?php else: ?> + <h2><?=$this->transEsc('Library Catalog Profile')?></h2> + <?=$this->flashmessages()?> + <p> + <?=$this->context($this)->renderInContext('librarycards/selectcard.phtml', ['user' => $this->auth()->isLoggedIn()]); ?> + </p> + <p><?=$this->transEsc('cat_establish_account')?></p> + <form method="post" action="<?=$this->serverUrl(true)?>" class="form-catalog-login"> + <?php if ($this->targets !== null): ?> + <div class="form-group"> + <label class="control-label" for="login_target"><?=$this->transEsc('login_target')?>:</label> + <select id="login_target" name="target" class="form-control"> + <?php foreach ($this->targets as $target): ?> + <option value="<?=$this->escapeHtmlAttr($target)?>"><?=$this->transEsc("source_$target", null, $target)?></option> + <?php endforeach; ?> + </select> + </div> + <?php endif; ?> + <div class="form-group"> + <label class="control-label" for="profile_cat_username"><?=$this->transEsc('Library Catalog Username')?>:</label> + <input id="profile_cat_username" type="text" name="cat_username" value="" class="form-control"/> + </div> + <div class="form-group"> + <label class="control-label" for="profile_cat_password"><?=$this->transEsc('Library Catalog Password')?>:</label> + <input id="profile_cat_password" type="password" name="cat_password" value="" class="form-control"/> + </div> + <div class="form-group"> + <input class="btn btn-primary" type="submit" name="processLogin" value="<?=$this->transEsc('Login')?>"> + </div> + </form> +<?php endif; ?> diff --git a/themes/finc/templates/myresearch/profile.phtml b/themes/finc/templates/myresearch/profile.phtml index cce30cd0cc688df5b353e71728e6438e02580fc9..a0f1061fc6a4c71089bf679ab055053f7b166e00 100644 --- a/themes/finc/templates/myresearch/profile.phtml +++ b/themes/finc/templates/myresearch/profile.phtml @@ -1,4 +1,4 @@ -<!-- finc: myresearch - profile ?? --> +<!-- finc: myresearch - profile --> <?php // Set up page title: $this->headTitle($this->translate('My Profile'));