Merge branch 'master' into master

openoakland · Nov 13, 2019 · 26fd522 · 26fd522
2 parents 4ed9531 + 29b747d
commit 26fd522
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/_includes/header.html b/src/_includes/header.html
@@ -3,7 +3,7 @@
     {%- assign default_paths = site.data.navigation | map: "path" -%}
     {%- assign page_paths = site.header_pages | default: default_paths -%}
     <a class="navbar-brand" rel="author" href="{{ "/" | relative_url }}">
-      <img src="/assets/images/OpenOakland-logo.png" width="280" alt="OpenOakland Logo">
+      <img src="/assets/images/OpenOakland-logo.png" class="header-logo" alt="OpenOakland Logo">
     </a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>

diff --git a/src/_sass/main.scss b/src/_sass/main.scss
@@ -69,6 +69,13 @@ main {
   min-height: $spacing-unit * 1.865;
 }
 
+.header-logo {
+  width: 280px;
+  @media (max-width: $mobile-up) {
+    width: 200px;
+  }
+}
+
 .site-footer {
   border-top: 1px solid $grey-color-light;
 }