Merge branch 'master' of gitlab.com:agaric/sites/geo

web/themes/custom/geofresco/dist/css/overrides.css

@@ -1,7 +1,10 @@
-/* .navbar > .container > .navbar-brand {
-  margin-left: inherit;
-}
+.navbar > .container > .navbar-brand {
+  margin-left: inherit; }
 
+.navbar > .container > .navbar-menu {
+  margin-right: inherit; }
+
+/*
 .section {
   padding-top: 1.5rem;
 }

web/themes/custom/geofresco/geofresco.info.yml

@@ -5,7 +5,7 @@ base theme: octavia
 package: Custom
 core: 8.x
 
-logo: images/logo-GEO-narrow.png
+logo: images/GEOLogo.svg
 
 
 regions:
@@ -50,4 +50,4 @@ libraries-override:
   bulma/global:
     css:
       base:
-        /themes/contrib/octavia/dist/css/bulma.css: dist/css/global.css
+        /themes/contrib/octavia/dist/css/modified-bulma.css: dist/css/global.css

web/themes/custom/geofresco/package.json

@@ -53,7 +53,7 @@
     "run-sequence": "^2.0.0"
   },
   "dependencies": {
-    "bulma": "^0.6.2",
+    "bulma": "^0.7.2",
     "bulma-extensions": "^1.0.4"
   }
 }

web/themes/custom/geofresco/src/global/_base.scss

@@ -1,14 +1,16 @@
 @charset "utf-8";
 
-// Set our custom font for headers
+// Set our custom font for all headers and menus
 .title,
+.subtitle,
 .content h1,
 .content h2,
 .content h3,
 .content h4,
 .content h5,
-.content h6 {
-  font-family: $family-serif;
+.content h6,
+.menu {
+  font-family: $family-geo;
 }
 
 // Prevent images from being larger than their Drupal-set size
@@ -18,6 +20,20 @@
   width: -webkit-max-content; /* Chrome */
 }
 
+// Add a gradient across only a portion of the vertical width of the navbar.
+.navbar {
+  background: linear-gradient(
+    $body-background-color,
+    $body-background-color 20px,
+    $light-green 20px,
+    $green 40px,
+    $green 60px,
+    $body-background-color 60px,
+    $body-background-color
+  );
+}
+
+
 // Style the wordmark (logo)
 .navbar-item .wordmark {
   max-height: 3rem; // 4rem

web/themes/custom/geofresco/src/global/_fonts.scss

@@ -1,29 +1,29 @@
-$family-serif: "Pagella", "Palatino", "Bookman", "Bookman Old Style", "Garamond", "Georgia", "Times", "Times New Roman", serif !default
+$family-geo: "Ocan", "Ubuntu", "Arial Narrow", "Helvetica", "Arial", "Lucida", sans-serif !default
 
 @font-face {
-    font-family: 'Pagella';
-    src: url('../../fonts/texgyrepagella-regular-webfont.woff') format('woff');
+    font-family: 'Ocan';
+    src: url('../../fonts/OcanSansStd-Book.woff') format('woff');
     font-weight: normal;
     font-style: normal;
 }
 
 @font-face {
-    font-family: 'Pagella';
-    src: url('../../fonts/texgyrepagella-bold-webfont.woff') format('woff');
+    font-family: 'Ocan';
+    src: url('../../fonts/OcanSansStd-Bold.woff') format('woff');
     font-weight: 700;
     font-style: normal;
 }
 
 @font-face {
-    font-family: 'Pagella';
-    src: url('../../fonts/texgyrepagella-italic-webfont.woff') format('woff');
+    font-family: 'Ocan';
+    src: url('../../fonts/OcanSansStd-BookIta.woff') format('woff');
     font-weight: normal;
     font-style: italic;
 }
 
 @font-face {
-    font-family: 'Pagella';
-    src: url('../../fonts/texgyrepagella-bolditalic-webfont.woff') format('woff');
+    font-family: 'Ocan';
+    src: url('../../fonts/OcanSansStd-BoldIta.woff') format('woff');
     font-weight: 700;
     font-style: italic;
 }

web/themes/custom/geofresco/src/global/global.scss

@@ -3,9 +3,11 @@
 // Set brand colors.
 $blue: #4391E0;
 $red: #a70c20;
+$light-green: #65AB1F;
+$green: #478D00;
 
 // Update Bulma's global variables.
-$primary: $blue;
+$primary: $green;
 
 // Import each part of Bulma separately so we can layer in our styles.
 // Extend or override Bulam's base styles in this themes base.scss etc.
@@ -15,6 +17,7 @@ $primary: $blue;
 @import "base";
 @import "../../node_modules/bulma/sass/elements/_all";
 @import "elements";
+$navbar-breakpoint: $tablet;
 @import "../../node_modules/bulma/sass/components/_all";
 @import "components";
 @import "../../node_modules/bulma/sass/grid/_all";

web/themes/custom/geofresco/src/global/overrides.scss

@@ -1,7 +1,15 @@
-/* .navbar > .container > .navbar-brand {
-  margin-left: inherit;
+// this is needed to override weirdness that Bulma theme is doing in its
+// own overrides file.
+.navbar > .container {
+  > .navbar-brand {
+    margin-left: inherit;
+  }
+  > .navbar-menu {
+    margin-right: inherit;
+  }
 }
 
+/*
 .section {
   padding-top: 1.5rem;
 }