Conflict fixes

ac4e3cfe · Annabel Dunstone Gray · 940e7024 · ac4e3cfe
Commit ac4e3cfe authored Oct 02, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

app/assets/stylesheets/framework/header.scss app/assets/stylesheets/framework/header.scss +4 -4

No files found.
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -57,7 +57,7 @@ header {
      .navbar-toggle {
        min-width: 45px;
-        padding: 4px $gl-padding;
+        padding: 0 $gl-padding;
        margin-right: -7px;
        font-size: 14px;
        text-align: center;
@@ -73,16 +73,16 @@ header {
    }
  }
-  .fa-times {
+  .close-icon {
    display: none;
  }
  .menu-expanded {
-    .fa-ellipsis-v {
+    .more-icon {
      display: none;
    }
-    .fa-times {
+    .close-icon {
      display: block;
    }
  }