Merge branch 'master' of https://git.library.upei.ca/rdrew/roblib_2023

css/global-style.css

@@ -17681,11 +17681,10 @@ ul.menu a.is-active {
   list-style: none;
 }
 
-#block-roblibsearchothersources,
+#block-roblib-2023-roblibsearchedsbooksblock .panel-pane,
-#block-roblib-2023-roblibsearchedsbooksblock,
+#block-roblib-2023-roblibsearchedsarticlesblock .panel-pane,
-#block-roblib-2023-roblibsearchedsarticlesblock,
+#block-roblib-2023-roblibsearchsolrsiteblock .panel-pane,
-#block-roblib-2023-roblibsearchsolrsiteblock,
+#block-roblibsearchsolrbestbetblock .panel-pane, #block-roblibsearchothersources {
-#block-roblibsearchsolrbestbetblock {
   border: 0px;
   transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
   box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
@@ -17961,6 +17960,7 @@ ul.tabs {
 .tabs a {
   display: block;
   padding: 0.2em 1em;
+  font-family: "Roboto Condensed", sans-serif;
   text-decoration: none;
 }
 
@@ -18535,7 +18535,9 @@ aside {
 
 main,
 .region-footer,
+.region-help,
 .region-breadcrumb,
+.region-primary-menu,
 .region-highlighted,
 .region-secondary-menu {
   padding-right: 0.625rem;
@@ -18544,11 +18546,15 @@ main,
   margin-left: auto;
   margin-right: auto;
   margin-top: 1rem;
+  display: flex;
+  flex-flow: row wrap;
 }
 @media print, screen and (min-width: 40em) {
   main,
   .region-footer,
+  .region-help,
   .region-breadcrumb,
+  .region-primary-menu,
   .region-highlighted,
   .region-secondary-menu {
     padding-right: 0.9375rem;
@@ -18745,6 +18751,7 @@ main,
   box-shadow: none;
   overflow: hidden;
   color: #333;
+  font-family: "Roboto Condensed", sans-serif;
 }
 .region-sidebar-first .block > :last-child,
 .region-sidebar-second .block > :last-child {

css/sass/components/_blocks.scss

@@ -1,17 +1,17 @@
 .region-sidebar-first .block,
 .region-sidebar-second .block {
   @include card-container();
+  font-family: 'Roboto Condensed', sans-serif;
   h3 {
     @include card-divider;
     background: #333;
     color: #fff;
     margin-bottom: 0;
     //line-height: 0;
-    padding: 1rem 1rem .6rem 1rem;
+    padding: 1rem 1rem 0.6rem 1rem;
     border-bottom: 4px solid $green;
   }
   .field--name-body {
-
     @include card-section;
   }
 }

css/sass/components/_page-layout.scss

@@ -3,12 +3,14 @@ aside {
 }
 main,
 .region-footer,
+.region-help,
 .region-breadcrumb,
+.region-primary-menu,
 .region-highlighted,
 .region-secondary-menu {
   @include xy-grid-container;
   margin-top: $global-margin;
-  //@include xy-grid;
+  @include xy-grid;
 }
 .layout-content {
   @include callout();

css/sass/components/_search-results.scss

@@ -86,13 +86,17 @@
     margin: 0;
   }
 }
-#block-roblibsearchothersources,
+#block-roblibsearchothersources {
+  @extend %search-pane;
+}
 #block-roblib-2023-roblibsearchedsbooksblock,
 #block-roblib-2023-roblibsearchedsarticlesblock,
 #block-roblib-2023-roblibsearchsolrsiteblock,
 #block-roblibsearchsolrbestbetblock {
+  .panel-pane {
     @extend %search-pane;
   }
+}
 .solr-site-results {
   white-space: normal;
   word-wrap: normal;

css/sass/components/_tabs.scss

@@ -22,6 +22,7 @@ ul.tabs {
 .tabs a {
   display: block;
   padding: 0.2em 1em;
+  font-family: 'Roboto Condensed', sans-serif;
   text-decoration: none;
 }
 .tabs a.is-active {