From 6d89d74332254bb4a93827ff4d87aab59af2263a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Fri, 16 Aug 2019 12:39:34 -0400 Subject: [PATCH] Get rid of all kinds of crazy CSS in favor of Bulma classes --- .../custom/geofresco/src/global/_components.scss | 16 ---------------- .../custom/geofresco/src/global/_elements.scss | 13 +------------ .../block/block--system-branding-block.html.twig | 4 ++-- .../src/templates/layout/page.html.twig | 2 +- 4 files changed, 4 insertions(+), 31 deletions(-) diff --git a/web/themes/custom/geofresco/src/global/_components.scss b/web/themes/custom/geofresco/src/global/_components.scss index 1101e08..b6e29bc 100644 --- a/web/themes/custom/geofresco/src/global/_components.scss +++ b/web/themes/custom/geofresco/src/global/_components.scss @@ -14,22 +14,6 @@ } } -// Move the user account menu to the left of the hamburger menu on mobile -@include mobile { - #block-geofresco-account-menu .menubar { - position: absolute; - right: 3.25rem; - z-index: 40; - top: 1.75rem; - } -} - -// OK somehow now we need to give the navbar a z-index, any z-index at all, -// or else the slogan is hidden. -.navbar { - z-index: 0; -} - // Featured images on article pages .featured-image figure.image { diff --git a/web/themes/custom/geofresco/src/global/_elements.scss b/web/themes/custom/geofresco/src/global/_elements.scss index 2d66c66..eb28406 100644 --- a/web/themes/custom/geofresco/src/global/_elements.scss +++ b/web/themes/custom/geofresco/src/global/_elements.scss @@ -14,16 +14,7 @@ .user-account-menu li { display: inline-block; padding: .1rem .6rem; - float: right; -} - -.search-bar form { - float: right; -} - -.navbar-brand { - position: relative; - top: -36px; +// float: right; } // Add a gradient across only a portion of the vertical width of the navbar. @@ -40,9 +31,7 @@ } #navbar-menu .navbar-item { - height: 36px; font-size: 22px; - padding-top: 18px; } .slogan { diff --git a/web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig b/web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig index 417bdc4..996b9c2 100644 --- a/web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig +++ b/web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig @@ -15,7 +15,7 @@ */ #} {% if site_logo %} -