diff --git a/local/languages/de.ini b/local/languages/de.ini
index 61c1881c8fe1ebea193d730562e64f293df478ed..6f2899bb1c01b4f0b5df5e8aaceeba57c7d4edeb 100644
--- a/local/languages/de.ini
+++ b/local/languages/de.ini
@@ -254,6 +254,7 @@ Due Date = Fällig am
Each field should have a value = "Jedes Feld sollte einen Wert besitzen"
For technical reasons, this title can not be saved. = "Dieser Titel läßt sich aus technischen Gründen leider nicht als Favorit abspeichern."
Edit = Bearbeiten
+Edit this Advanced Search = "Suche bearbeiten"
Edition = Ausgabe
Electronic = Online-Ressource
Electronic Article = "Elektronischer Aufsatz"
@@ -506,6 +507,8 @@ Stackrequest = "Bestellungen"
Stack Request = "Bestellungen"
Stacks = Magazin
Staff View = Internformat
+Start a new Advanced Search = "Neue erweiterte Suche"
+Start a new Basic Search = "Neue einfache Suche"
Start Page = Startseite
Start browsing again = Stöbern neu beginnen
Status = Status
diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss
index 2ec7208aa6fee819e34ae66f6cc2d778ee0fe718..d8f505d4b88e7fd32bd74953b1592c2392463fb3 100644
--- a/themes/finc/scss/_customVariables.scss
+++ b/themes/finc/scss/_customVariables.scss
@@ -149,6 +149,9 @@ $button-title-hover-bg: $brand-secondary !default;
$btn-language-hover-bg: $brand-primary !default;
$btn-language-active-hover-bg: $steel !default;
+$btn-language-hover-color: $white !default;
+
+$btn-header-nav-medium-only-padding: 6px 2px !default;
// Padding for toolbar buttons in record view/detail view
$record-view-toolbar-button-padding: .5rem;
@@ -225,7 +228,7 @@ $navbar-height-sm: $navbar-height !default;
$navbar-height-xs: $navbar-height + 40px !default;
$navbar-max-height-xs: $navbar-height + 40px !default;
-//// Navigation elements default height: This height must be adapted to the button height, which changes with default font size; apply to navigation elements such as select dropdowns
+//// Navigation elements default height: This height _must_ be adapted to the button height (.btn, .search-filter-toggle {}), which changes with default font size; apply to navigation elements such as select dropdowns
$navigation-element-default-height: 38px;
//// Top-padding for #content -> .row first-of-type (and .sidebar) - change this value to change both;
diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss
index 77b05a8f6482be26ffdf73221e12cfaedc75813d..dce8272442bc2503932997b3945fa6e771c16f05 100644
--- a/themes/finc/scss/compiled.scss
+++ b/themes/finc/scss/compiled.scss
@@ -101,6 +101,11 @@ body {
}
}
+ // for XS
+ @media (max-width: $screen-xs-max) {
+ padding-top: 8.5rem;
+ }
+
// for tablet
@media (min-width: $screen-sm-min) {
padding-top: $navbar-height-sm;
@@ -131,25 +136,32 @@ label,
}
// HEADINGS
-//// All
-//// remove top margin to align with sidebars etc., except advanced search on XS
-h1:first-of-type {
- margin-top: 0;
-}
+//// h1
+h1 {
+ font-size: 2rem;
-@media only screen and (max-width: $screen-xs-max) {
- h1:first-of-type {
- margin-top: revert;
+ //// remove top margin to align with sidebars etc., except advanced search on XS
+ &:first-of-type {
+ margin-top: 0;
- body:not(.template-name-advanced) & {
- margin-top: 0;
+ @media (max-width: $screen-xs-max) {
+ margin-top: revert;
+
+ body:not(.template-name-advanced) & {
+ margin-top: 0;
+ }
}
}
-}
-//// h1
-h1 {
- font-size: 2rem;
+ .template-dir-cart.template-name-cart .container &,
+ .template-dir-content.template-name-content &,
+ .template-dir-myresearch.template-name-editlist &,
+ .template-dir-search.template-name-newitem &,
+ .template-dir-search.template-name-reserves & {
+ @media (max-width: $screen-xs-max) {
+ padding-top: 15px;
+ }
+ }
}
//// h2
@@ -159,16 +171,16 @@ h2 {
.sidebar & {
font-size: 1.5rem;
- @media only screen and (max-width: $screen-xs-max) {
+ @media (max-width: $screen-xs-max) {
margin-left: $grid-gutter-width / 2;
}
- @media only screen and (max-width: $screen-sm-max) {
+ @media (max-width: $screen-sm-max) {
font-size: 1.25rem;
margin-top: 1.75rem;
}
- @media only screen and (min-width: $screen-md-min) {
+ @media (min-width: $screen-md-min) {
&:first-of-type {
margin-top: 0;
}
@@ -184,20 +196,20 @@ h3 {
//// h4
h4 {
font-size: 1.25rem;
-}
-////// H4 atop Sidebar - align to limit and sort
-.sidebar h4 {
- margin-top: 0;
+ ////// H4 atop Sidebar - align to limit and sort
+ .sidebar & {
+ margin-top: 0;
- @media (max-width: $screen-sm-max) {
- text-align: center;
- }
+ @media (max-width: $screen-sm-max) {
+ text-align: center;
+ }
- // keep level with left-hand content
- @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
- font-size: $font-size-base + 2px;
- margin-top: ($grid-gutter-width / 2);
+ // keep level with left-hand content
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ font-size: $font-size-base + 2px;
+ margin-top: ($grid-gutter-width / 2);
+ }
}
}
@@ -370,7 +382,6 @@ legend {
}
//// label {}
-
.text-success,
.text-danger {
padding: .5em;
@@ -523,6 +534,13 @@ select {
.template-name-myresearch & {
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgeD0iMTJweCIgeT0iMHB4IiB3aWR0aD0iMjRweCIgaGVpZ2h0PSIzcHgiIHZpZXdCb3g9IjAgMCA2IDMiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYgMyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBvbHlnb24gcG9pbnRzPSI1Ljk5MiwwIDIuOTkyLDMgLTAuMDA4LDAgIi8+PC9zdmc+);
}
+
+ .searchForm & {
+ @media (min-width: $screen-sm-min) {
+ // prevent adv search button from breaking onto new line
+ max-width: 140px;
+ }
+ }
}
// remove icons in limiter select boxes in adv. search
@@ -565,6 +583,8 @@ a {
// CLASSES (Elements that are used in several places)
//// BUTTONS
+// NOTE: buttons have a default height of 38px, the same as $navigation-element-default-height for select boxes etc
+
////// Transparent buttons (button with border and darker text on light or white BGs)
.btn-transparent {
@include button-variant($btn-transparent-color, $btn-transparent-bg, $btn-transparent-border);
@@ -686,7 +706,7 @@ a {
//// HOVERABLE DROPDOWNS -- make DDs hoverable as in FNDTN
// Add the dropdown-on-hover class to the parent li container! OR use on all (see commented-out part below)
// Menu will show on hover
-@media only screen and (min-width: $screen-sm-min) {
+@media (min-width: $screen-sm-min) {
.dropdown-on-hover:hover .dropdown-menu {
display: block;
}
@@ -855,7 +875,7 @@ table.collapse.in {
// push COVER down on SM and XS
.media-left {
- @media only screen and (max-width: $screen-sm-max) {
+ @media (max-width: $screen-sm-max) {
margin-top: 15px;
}
}
@@ -869,6 +889,7 @@ table.collapse.in {
.cover-container {
min-width: 6em;
}
+
// cover - END
}
@@ -1015,6 +1036,40 @@ table.collapse.in {
position: absolute;
}
+// Class to remplace hidden-sm, hidden-md, hidden-lg
+.hidden-sm-up {
+ @media (min-width: $screen-sm-min) {
+ display: none;
+ }
+}
+
+.hidden-sm-md {
+ @media (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
+ display: none;
+ }
+}
+
+.visible-sm-only {
+ @media (max-width: $screen-xs-max) {
+ display: none;
+ }
+
+ @media (min-width: $screen-md-min) {
+ display: none;
+ }
+}
+
+.visible-sm-md-only {
+ @media (max-width: $screen-xs-max) {
+ display: none;
+ }
+
+ @media (min-width: $screen-lg-min) {
+ display: none;
+ }
+}
+
+
// Flex container for wrapping flex elements, such als header
.flex-container {
@media (min-width: $screen-sm-min) {
@@ -1305,7 +1360,7 @@ header,
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) {
+ @media (max-width: $screen-xs-max) {
flex-direction: column;
}
}
@@ -1319,7 +1374,7 @@ header,
//// Keep navbar on left, when offcanvas is active, give same appearance as ever
.offcanvas.active .navbar-fixed-top {
- @media only screen and (max-width: $screen-xs-max) {
+ @media (max-width: $screen-xs-max) {
margin-top: -$navbar-height-xs;
position: relative;
}
@@ -1339,9 +1394,9 @@ header,
min-height: 3rem;
}
- @media only screen and (max-width: $screen-xs-max) {
- header & {
- min-height: 5rem;
+ header & {
+ @media (max-width: $screen-xs-max) {
+ min-height: 9rem;
}
}
@@ -1364,12 +1419,12 @@ header,
// Searchbox see below
// Set max height for xs devices
- @media only screen and (max-width: $screen-xs-max) {
+ @media (max-width: $screen-xs-max) {
min-height: $navbar-height-xs;
}
// Define height for navbar on small, allow for stacked search box +
- @media only screen and (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
min-height: $navbar-height-sm;
//padding-bottom: ($grid-gutter-width / 2);
}
@@ -1385,9 +1440,9 @@ header,
}
// Style language dropdown for XS
-@media (max-width: $screen-xs-max) {
- // avoid BG bleed on small
- .navbar .navbar-nav {
+.navbar .navbar-nav {
+ @media (max-width: $screen-xs-max) {
+ // avoid BG bleed on small
margin-bottom: 0;
}
}
@@ -1401,12 +1456,15 @@ header,
border: 0;
min-width: auto;
- .btn:hover {
+ .btn:hover,
+ .btn:focus {
background-color: $btn-language-hover-bg;
+ color: $btn-language-hover-color;
}
.active .btn:hover {
background-color: $btn-language-active-hover-bg;
+ color: $btn-language-hover-color;
}
li a {
@@ -1422,18 +1480,40 @@ header,
}
}
}
+}
- &.oneLanguage {
- display: block;
- position: relative;
+// Language select when there is only one language
+.oneLanguage {
+ display: block;
+ margin-top: 0;
+ position: relative;
+
+ .btn {
+ background: transparent;
+ color: $brand-primary;
+
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ float: right;
+ padding: 6px 0;
+ }
+
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+ float: right;
+ padding: 6px;
+ }
+ }
+
+ .visible-sm-only {
+ text-transform: capitalize;
}
}
+
.navbar-header {
flex: 0 1 auto;
// ensure proper margins on XS in conjunction with flex-direction: column
- @media only screen and (max-width: $screen-xs-max) {
+ @media (max-width: $screen-xs-max) {
.container > & {
margin-left: 0;
margin-right: 0;
@@ -1482,7 +1562,7 @@ header,
// Remove cart text to make searchbox fit on intermediate tablets
.cart-label {
- @media only screen and (min-width: $screen-sm-min) and (max-width: 994px) {
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
display: none;
}
}
@@ -1532,8 +1612,8 @@ header,
}
//// navbar-right - add negative right margin to align last button in row to content in sidebar below (right padding)
-@media (min-width: $screen-sm-min) {
- .navbar-right {
+.navbar-right {
+ @media (min-width: $screen-sm-min) {
margin-right: -$navbar-padding-horizontal;
}
}
@@ -1542,6 +1622,11 @@ header,
.nav > li > a.btn {
@include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base);
+ // make buttons fit on SM
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ padding: $btn-header-nav-medium-only-padding; // 6px 2px
+ }
+
&:hover,
&:focus {
background-color: $component-active-bg; // Same hover-color must be applied to 'Advanced Search' button below
@@ -1552,108 +1637,64 @@ header,
// NAVBAR - END
+
// SEARCHBOX and Autocomplete
// Make seachbox container flexible -- values should complement those of #header-collapse (right-hand side navigation elements)
.search.container {
padding-right: 0;
- // Make wider to fit searchbox and right-hand nav-elements
- @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 (max-width: $screen-sm-max) {
padding-left: 0;
}
- @media only screen and (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
flex: content;
}
- .searchForm_lookfor {
- @media (max-width: $screen-xs-max) {
- //max-width: 80%;
- }
- }
-
- .searchForm {
- @media only screen and (max-width: $screen-sm-max) {
- display: flex;
-
- input {
- flex-grow: 2;
- flex-shrink: 2;
- // max-width: 43%;
- }
-
- .navbar {
- flex-grow: 1;
- flex-shrink: 1;
- }
-
- // take out of flexbox flow
- .checkbox {
- position: absolute;
- top: 40px;
- }
- }
-
- @media only screen and (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
- display: block;
-
- .checkbox {
- position: static;
- }
- }
- }
-
- .btn,
- .form-control {
- @media only screen and (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
- float: left;
- }
+ // Make wider to fit searchbox and right-hand nav-elements
+ @media (min-width: $screen-sm-min) {
+ flex: 0 1 auto;
+ padding-top: $button-top-padding;
+ width: auto;
}
}
-//// this will get search box and buttons in line
-
-.navbar-left {
- // push searchbox down on mobile
- @media only screen and (max-width: $screen-xs-max) {
- display: contents;
+.searchForm {
+ @media (max-width: $screen-sm-max) {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: flex-start;
margin-bottom: 0;
margin-top: 0;
-
- &.navbar-form {
- padding-top: 0;
- }
+ padding-top: 0;
}
-}
-.searchForm {
// Search slot inside the search container
- @media only screen and (min-width: $screen-sm-min) {
+ @media (min-width: $screen-sm-min) {
width: 100%;
}
- .list-unstyled li {
- float: left;
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ display: block;
+ }
- // Advanced Search button
- .btn.secondary {
- &:hover,
- &:focus {
- background-color: $component-active-bg; // Same hover-color must be applied to Header buttons above
- color: $white;
- }
+ // Searchform input field
+ input:not([type='checkbox']) {
+ @media (max-width: $screen-sm-max) {
+ display: flex;
+ flex-basis: 50%;
+ flex-grow: 2;
+ flex-shrink: 2;
}
}
- input {
- float: left;
+ // Fixme: Is there a navbar inside searchForm anywhere?
+ .navbar {
+ @media (max-width: $screen-sm-max) {
+ flex-grow: 1;
+ flex-shrink: 1;
+ }
}
// Keep filters, shards etc; apply same styles to checkboxes on HOME and all other pages,
@@ -1664,29 +1705,41 @@ header,
float: none;
padding-top: ($grid-gutter-width / 4);
+ @media (max-width: $screen-sm-max) {
+ // make this correspond to .searchForm @media (max-width: $screen-sm-max) {}, requires "flex-wrap: wrap" on parent
+ display: flex;
+ margin-top: .7rem;
+ padding-top: 0;
+ width: 100%;
+ }
+
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ position: static;
+ }
+
+ // actual checkbox box
input {
margin-right: .25rem;
// make sure, input and label are aligned in acceptable manner between 100% and 200% zoom
margin-top: $inputs-top-margin;
}
}
-}
-//// Searchbox on Homepage
-@media only screen and (max-width: $screen-xs-max) {
- .searchHomeContent {
- .well {
- background-color: transparent;
- border: 0;
- box-shadow: none;
- min-height: ($grid-gutter-width / 2);
- padding: 0;
+ // BUTTONS in search form
+ .btn,
+ .form-control {
+ // align pre-filter and search button
+ vertical-align: top;
+
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ float: left;
}
+ }
- .searchForm .navbar-left,
- .searchForm .navbar-right {
- border: 0;
- margin-top: 0;
+ // make advanced search button discernible
+ .btn-transparent {
+ @media (max-width: $screen-sm-max) {
+ border: 1px solid $oil;
}
}
}
@@ -1699,6 +1752,18 @@ header,
}
//// Advanced Search links in header
+// outer container for adv search links
+.navbar-form {
+ margin-bottom: 0; // overwrites BS theme
+
+ .result-advanced & {
+ // create sufficient space for header menu
+ @media (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
+ max-width: 400px;
+ }
+ }
+}
+
.adv_search_terms {
background-color: $brand-secondary;
border: 1px solid $brand-primary;
@@ -1708,13 +1773,15 @@ header,
}
.adv_search_links {
- border-bottom: 1px solid $brand-primary;
- border-left: 1px solid $brand-primary;
- border-right: 1px solid $brand-primary;
+ border: 1px solid $brand-primary;
list-style: none;
margin: 0;
padding: 0;
+ @media (min-width: $screen-sm-min) {
+ margin-top: 5px;
+ }
+
a {
border-top: 0;
display: inline;
@@ -1726,7 +1793,7 @@ header,
}
// 786px and above as inline list
- @media only screen and (min-width: $screen-sm-min) {
+ @media (min-width: $screen-sm-min) {
a {
border-bottom: 0;
border-right: 1px solid $brand-primary;
@@ -1740,6 +1807,7 @@ header,
}
}
+
// SEARCHBOX and Autocomplete - END
// BREADCRUMBS - for detailed switches see customVariables
@@ -1757,8 +1825,18 @@ header,
color: $white;
}
+ // Result list after an advanced search in width XS should not get this slash
+ > li + li::before {
+ @media (max-width: $screen-xs-max) {
+ display: none;
+ }
+ }
+
//// color of links in breadcrumbs
- a,
+ a {
+ color: $white;
+ }
+
> .active a {
color: darken($breadcrumb-active-color, 10%);
}
@@ -1766,15 +1844,16 @@ header,
//// more contrast: switch the colors
a:focus,
a:hover {
- background-color: $breadcrumb-color;
- color: $breadcrumb-bg;
+ background-color: transparent;
+ color: darken($white, 10%);
}
}
-////// Prevent overlapping of header on breadcrumb on 100% zoom on advanced search result list
-////// (works only correctly for one line in cell "Your search terms")
-.template-dir-search.template-name-results .search .navbar-form {
- margin-bottom: 5px;
+// Search result after advanced search needs padding for XS
+.result-advanced .breadcrumbs {
+ @media (max-width: $screen-xs-max) {
+ padding-top: .6rem;
+ }
}
// BREADCRUMBS - END
@@ -1805,7 +1884,7 @@ footer {
.sidebar {
padding-top: $content-top-padding;
- @media only screen and (max-width: $screen-sm-min) {
+ @media (max-width: $screen-xs-max) {
padding-top: 0;
}
}
@@ -1844,10 +1923,6 @@ footer {
float: left;
}
-.limit {
- margin-right: ($grid-gutter-width / 2);
-}
-
.limit,
.sort {
margin-bottom: 5px;
@@ -1855,6 +1930,7 @@ footer {
label {
line-height: normal;
margin-bottom: 0;
+ padding-right: 0;
}
select {
@@ -1862,9 +1938,28 @@ footer {
}
}
+.limit {
+ margin-right: ($grid-gutter-width / 2);
+
+ @media (max-width: $screen-xs-max) {
+ float: right;
+ margin-bottom: 7px;
+ margin-right: 0;
+ }
+
+ label {
+ text-align: left;
+ }
+}
+
.limit-inner,
.sort-inner {
display: inline-block;
+
+ // top align buttons and select boxes
+ .btn {
+ vertical-align: top;
+ }
}
.search-sort {
@@ -1874,11 +1969,15 @@ footer {
// limit the width of the select field if necessary - for more select details, see FORMS section above
.sort select {
max-width: 12em;
+
+ @media only screen and (max-width: 410px) {
+ max-width: 9em;
+ }
}
// FIXME: THis needs to be reviewed for #18810 - CK
-@media only screen and (max-width: $screen-xs-max) {
+@media (max-width: $screen-sm-max) {
.limit,
.sort {
float: left;
@@ -1888,7 +1987,7 @@ footer {
select {
display: block;
}
-
+
select {
margin-bottom: 0;
margin-right: .2rem;
@@ -1902,8 +2001,10 @@ footer {
}
}
+// SEARCH CONTROLS - END
+
//// Off-Canvas
-@media only screen and (max-width: $screen-sm-min) {
+@media (max-width: $screen-sm-min) {
.close-offcanvas {
display: block;
}
@@ -1964,7 +2065,6 @@ footer {
}
//// Off-Canvas - END
-// SEARCH CONTROLS - END
//// Search Results padding
////// pulled out via .search-results, use negative gutter-width divided by 2
@@ -1978,13 +2078,26 @@ footer {
.bulk-action-buttons,
.bulkActionButtons {
padding-left: ($grid-gutter-width / 2);
+
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+ .btn-group {
+ margin-left: -($grid-gutter-width / 2);
+ }
+ }
+}
+
+// truncate "add to bookbag" to make it fit -- Fixme: needs review, CK
+#updateCart {
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+ max-width: 163px;
+ }
}
//// Result List ol, ul that contains li.result or facet group that contains li.facet
.record-list {
list-style: none;
- padding: 0;
margin: 0;
+ padding: 0;
}
//// Results (see BS SCSS/COMPONENTS/... for details)
@@ -2009,11 +2122,11 @@ footer {
font-weight: normal; // overwrites VF-BS-Theme setting
// reset font size for xs
- @media only screen and (max-width: $screen-xs-max) {
+ @media (max-width: $screen-xs-max) {
font-size: $font-size-base;
}
- @media only screen and (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
font-size: $font-size-base + 2px;
}
}
@@ -2184,7 +2297,7 @@ footer {
/////// Format items in availability column
.availability-column {
- @media only screen and (max-width: $screen-sm-max) {
+ @media (max-width: $screen-sm-max) {
a {
display: block;
margin-top: 6px;
@@ -2343,6 +2456,17 @@ footer {
////// Add top margin for better looks
.searchHomeContent {
margin-top: 1em;
+
+ @media (max-width: $screen-xs-max) {
+ // Fixme: Where is .well used? CK
+ .well {
+ background-color: transparent;
+ border: 0;
+ box-shadow: none;
+ min-height: ($grid-gutter-width / 2);
+ padding: 0;
+ }
+ }
}
////// browsing suggestion lists on home (prevent torn-apart look when 2 columns only)
@@ -2420,7 +2544,7 @@ footer {
// SIDEBAR
// Width when offcanvas is off
body:not(.offcanvas) .sidebar {
- @media only screen and (max-width: $screen-xs-max) {
+ @media (max-width: $screen-xs-max) {
width: 100%;
}
}
@@ -2486,7 +2610,7 @@ body:not(.offcanvas) .sidebar {
//// Offcanvas is used to widths of 767px ($screen-xs-max)
-@media only screen and (max-width: $screen-xs-max) {
+@media (max-width: $screen-xs-max) {
.offcanvas.active .sidebar {
padding-right: ($grid-gutter-width / 2);
}
@@ -2743,7 +2867,7 @@ footer ul {
opacity: unset;
right: 0;
- @media (min-width: 768px) {
+ @media (min-width: $screen-sm-min) {
right: -60px;
body.rtl & {
@@ -2913,7 +3037,6 @@ input {
// Accessibility - END
// Account
-
.has-error .form-control,
.sms-error .form-control {
border: 1px solid $brand-danger;
@@ -2928,7 +3051,9 @@ input {
// Account - END
// Dropdown Toggler color
-// WARNING: Potential Breaking Change! e.g. bookbag delete button with dropdown -- could result in white text on white background --> introduce variable "$btn-transparent-active-color" in custom themes and define color
+// WARNING: Potential Breaking Change!
+// e.g. bookbag delete button with dropdown -- could result in white text on white background
+// --> introduce variable "$btn-transparent-active-color" in custom themes and define color
// FIXME: MOVE TO buttons or dropdowns section
.open .btn-transparent.dropdown-toggle {
&[aria-expanded="true"] {
@@ -2951,11 +3076,19 @@ input {
}
// AMSL
-
.template-dir-amsl.template-name-sources-list {
.panel-body span {
margin: 10px 15px 10px 0;
}
}
-// AMSL - END
\ No newline at end of file
+// AMSL - END
+
+.template-dir-browse.template-name-home {
+ .browse-container {
+ @media (max-width: $screen-xs-max) {
+ padding-top: 15px;
+ }
+ }
+}
+
diff --git a/themes/finc/templates/header.phtml b/themes/finc/templates/header.phtml
index fc370fe70a5bb8367eab7727d972fb0dd3969b42..1f64dd68a52fb9b8c1732260854b20eebae2fc2d 100644
--- a/themes/finc/templates/header.phtml
+++ b/themes/finc/templates/header.phtml
@@ -17,7 +17,7 @@
<?php /* remove h1 from header and use h1 in content area instead - CK*/ ?>
<a class="navbar-brand lang-<?=$this->layout()->userLang?>" href="<?=$this->url('home')?>" aria-label="<?=$this->transEsc('Home')?>">
<?php /* Custom finc header - make sure that one variant of Library name is readable on any device - CK*/ ?>
- <span class="hidden-sm hidden-md hidden-lg"><?=$this->transEsc("LibraryName")?></span>
+ <span class="hidden-sm-up"><?=$this->transEsc("LibraryName")?></span>
<img src="<?=$this->imageLink('headerlogo.png')?>" class="hidden-xs" alt="Logo <?=$this->transEsc('LibraryName')?>" aria-hidden="true">
<?php /* Custom finc header - END */ ?>
</a>
@@ -48,7 +48,8 @@
<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><?=$this->transEsc("Your Account")?></span>
+ <span class="hidden-sm-md"><?=$this->transEsc("Your Account")?></span>
+ <span class="visible-sm-md-only"><?=$this->transEsc("Account")?></span>
</a>
</li>
<?php if ($account->dropdownEnabled()): ?>
@@ -109,7 +110,10 @@
<?php foreach ($this->layout()->allLangs as $langCode => $langName): ?>
<?php if ($langCode !== $this->layout()->userLang) : ?>
<li>
- <button type="submit" class="btn <?=(count($this->layout()->allLangs) == 2) ? ' btn-secondary' : ''?>" href="#" onClick="document.langForm.mylang.value='<?=$langCode?>';document.langForm.submit()"><?=$this->displayLanguageOption($langName)?></button>
+ <button type="submit" class="btn <?=(count($this->layout()->allLangs) == 2) ? ' btn-secondary' : ''?>" href="#" onClick="document.langForm.mylang.value='<?=$langCode?>';document.langForm.submit()">
+ <span class="visible-sm-md-only"><?=$langCode?></span>
+ <span class="hidden-sm-md"><?=$this->displayLanguageOption($langName)?></span>
+ </button>
</li>
<?php endif; ?>
<?php endforeach; ?>
diff --git a/themes/finc/templates/layout/layout.phtml b/themes/finc/templates/layout/layout.phtml
index de31a198ebb34751939531dd2df5d536f8046c64..fac3c55ea90673bac2a47b954084ead02a7cc4a3 100644
--- a/themes/finc/templates/layout/layout.phtml
+++ b/themes/finc/templates/layout/layout.phtml
@@ -142,7 +142,19 @@ JS;
?>
<?=$this->headScript()?>
</head>
-<body class="template-dir-<?=$this->templateDir?> template-name-<?=$this->templateName?> <?=$this->layoutClass('offcanvas-row')?><?php if ($this->layout()->rtl): ?> rtl<?php endif; ?>">
+<?php
+$searchType = '';
+// to determine the searchtype it is necessary to ask the child model for its searchType
+if ($this->layout()->templateName === 'results' && $this->layout()->hasChildren()) {
+ try {
+ $searchType
+ = current($this->layout()->getChildren())->params->getSearchType();
+ } catch (\Throwable $t) {
+ // ignore all errors
+ }
+}
+?>
+<body class="template-dir-<?=$this->templateDir?> template-name-<?=$this->templateName?> <?=$this->layoutClass('offcanvas-row')?><?php if ($this->layout()->rtl): ?> rtl<?php endif; ?><?php if ($searchType=='advanced'): ?> result-advanced<?php endif; ?>">
<?php // Set up the search box -- there are three possible cases:
// 1. No search box was set; we should default to the normal box
// 2. It was set to false; we should display nothing
@@ -185,9 +197,10 @@ if (!isset($this->layout()->searchbox)) {
&& !empty($this->layout()->breadcrumbs)
&& $this->layout()->breadcrumbs !== false
): ?>
- <ul class="breadcrumb large-centered hidden-xs hidden-print">
+ <?php /* The breadcrumb for the result list after advanced search will also be shown for XS but not with the Start link - #17720 - HR */ ?>
+ <ul class="breadcrumb large-centered<?php if (!(($this->templateDir=='search') && ($this->templateName=='results') && ($searchType=='advanced'))) : ?> hidden-xs<?php endif; ?> hidden-print">
<?php /* added Home link - #17603 - HR */?>
- <li><a href="<?=$this->url('home')?>"><?=$this->transEsc('Home')?></a></li>
+ <li <?php if (($this->templateDir=='search') && ($this->templateName=='results') && ($searchType=='advanced')) : ?> class="hidden-xs"<?php endif; ?>><a href="<?=$this->url('home')?>"><?=$this->transEsc('Home')?></a></li>
<?php if (is_array($this->layout()->breadcrumbs)): ?>
<?php if (count($this->layout()->breadcrumbs) > 1): ?>
<?=$this->render('breadcrumbs/multi.phtml', [
@@ -212,7 +225,6 @@ if (!isset($this->layout()->searchbox)) {
<?=$this->layout()->content?>
</div>
</div>
-
<?=$this->render('footer.phtml')?>
diff --git a/themes/finc/templates/search/searchbox.phtml b/themes/finc/templates/search/searchbox.phtml
index 3e8963def57269b1389a5f9cf8727fabd3a67044..6529d9cf80bec94a36c23c786561f41c587cdffa 100644
--- a/themes/finc/templates/search/searchbox.phtml
+++ b/themes/finc/templates/search/searchbox.phtml
@@ -35,7 +35,8 @@ $hiddenFilterParams = $this->searchTabs()->getCurrentHiddenFilterParams($this->s
<?php $tabs = $this->context($this)->renderInContext('search/searchTabs', ['searchTabs' => $tabConfig['tabs']]); ?>
<?php if (!empty($tabs)): ?><?=$tabs?>
<div class="tab-content clearfix no-gutter-all"><?php endif; ?>
- <p class="adv_search_terms"><?=$this->transEsc("Your search terms")?> : "<strong><?=$this->escapeHtml($this->lookfor)?></strong>"</p>
+ <?php /* Do not show the advanced search terms (adv_search_terms) because they will be shown within the breadcrumb - #17720 - HR */ ?>
+ <?php /* <p class="adv_search_terms"><?=$this->transEsc("Your search terms")?> : "<strong><?=$this->escapeHtml($this->lookfor)?></strong>"</p> */ ?>
<p class="adv_search_links">
<a href="<?=$this->url($advSearch)?>?edit=<?=$this->escapeHtmlAttr($this->searchId)?>"><?=$this->transEsc("Edit this Advanced Search")?></a>
<a href="<?=$this->url($advSearch) . $hiddenFilterParams?>"><?=$this->transEsc("Start a new Advanced Search")?></a>