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

web/themes/custom/geofresco/compile

@@ -1 +0,0 @@
-./node_modules/gulp/bin/gulp.js

web/themes/custom/geofresco/css

@@ -0,0 +1 @@
+npm run compile

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

@@ -1243,6 +1243,23 @@ a.has-text-danger:hover, a.has-text-danger:focus {
 .menu {
   font-family: "Ocan", "Ubuntu", "Arial Narrow", "Helvetica", "Arial", "Lucida", sans-serif; }
 
+.green {
+  color: #478D00; }
+
+.yellow {
+  color: #ffdd57; }
+
+.geo-title {
+  display: block;
+  width: 6em;
+  position: relative;
+  bottom: 3.6rem;
+  overflow: visible;
+  height: 1rem; }
+
+.block-geofresco-branding {
+  margin-bottom: 0; }
+
 .image.no-upscale img {
   width: intrinsic;
   /* Safari/WebKit uses a non-standard name */

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

@@ -4,6 +4,9 @@
 .navbar > .container > .navbar-menu {
   margin-right: inherit; }
 
+.block-system-branding-block > figure {
+  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/GEOLogo.svg
+logo: images/geo-logo-sun-road.png
 
 
 regions:

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

@@ -13,6 +13,28 @@
   font-family: $family-geo;
 }
 
+// Give us some color classes
+.green {
+  color: $green;
+}
+
+.yellow {
+  color: $yellow;
+}
+
+.geo-title {
+  display: block;
+  width: 6em;
+  position: relative;
+  bottom: 3.6rem;
+  overflow: visible;
+  height: 1rem;
+}
+
+.block-geofresco-branding {
+  margin-bottom: 0;
+}
+
 // Prevent images from being larger than their Drupal-set size
 .image.no-upscale img {
   width: intrinsic;           /* Safari/WebKit uses a non-standard name */

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

@@ -9,6 +9,11 @@
   }
 }
 
+// Undo another weird Bulma theme override of Bulma
+.block-system-branding-block > figure {
+  margin-right: inherit;
+}
+
 /*
 .section {
   padding-top: 1.5rem;

web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig

@@ -17,11 +17,14 @@
 #}
 {% block content %}
   {% if site_logo %}
-    <figure class="wordmark image is-pulled-left">
+    <figure class="image is-pulled-left">
       <a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">
-        <img src="{{ site_logo }}" alt="{{ site_name }}" />
+        <img src="{{ site_logo }}" alt="{{ site_name }} Home" />
       </a>
     </figure>
   {% endif %}
-  <a class="title is-5 slogan" href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_slogan }}</a>
+  <a class="geo-title title is-3" href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">
+    <span class="green">Grassroots
+      Economic</span>
+    <span class="yellow">Organizing</span></a>
 {% endblock content %}

web/themes/custom/geofresco/src/templates/layout/page.html.twig

@@ -37,9 +37,7 @@
       <div class="columns is-vcentered">
         <div class="column">
           {{ page.header }}
-          {% if is_front and site_slogan %}
-            <h1 class="title">{{ site_slogan }}</h1>
-          {% endif %}
+          <h1 class="title">{{ site_slogan }}</h1>
         </div>
         <div class="column is-narrow">
           {{ page.header_search }}
@@ -108,25 +106,6 @@
         </aside>
       {% endif %}
       {% endblock sidebar_first %}
-      {% block sidebar_second %}
-      {# Sidebar second #}
-      {% if page.sidebar_second %}
-        {% if not page.sidebar_second_attributes %}
-        {%
-          set page = page|merge({
-            'sidebar_second_attributes': create_attribute().addClass([
-              'sidebar-second',
-              'column',
-              'is-2',
-            ]),
-          })
-        %}
-        {% endif %}
-        <aside{{page.sidebar_second_attributes|without('role')}} role="complimentary>
-          {{ page.sidebar_second }}
-        </aside>
-      {% endif %}
-      {% endblock sidebar_second %}
     </div>
     {{ page.content_bottom }}
   </main>
@@ -152,4 +131,4 @@
     </div>
   </footer>
 {% endif %}
-{% endblock footer %}
+{% endblock footer %}