2 files changed, 42 insertions(+), 57 deletions(-)

M _includes/masthead.html
M _sass/minimal-mistakes/_masthead.scss

@@ 1,33 1,31 @@
 {% capture logo_path %}{{ site.logo }}{% endcapture %}
 
 <div class="masthead">
-  <div class="masthead__menu">
-    <nav id="site-nav" class="greedy-nav">
-      {% unless logo_path == empty %}
-        <a class="site-logo" href="{{ '/' | relative_url }}"><img src="{{ logo_path | relative_url }}" alt=""></a>
-      {% endunless %}
-      <a class="site-title" href="{{ '/' | relative_url }}">
-        {{ site.masthead_title | default: site.title }}
-        {% if site.subtitle %}<span class="site-subtitle">{{ site.subtitle }}</span>{% endif %}
-      </a>
-      <ul class="visible-links">
-        {%- for link in site.data.navigation.main -%}
-          <li class="masthead__menu-item">
-            <a href="{{ link.url | relative_url }}"{% if link.description %} title="{{ link.description }}"{% endif %}>{{ link.title }}</a>
-          </li>
-        {%- endfor -%}
-      </ul>
-      {% if site.search == true %}
-      <button class="search__toggle" type="button">
-        <span class="visually-hidden">{{ site.data.ui-text[site.locale].search_label | default: "Toggle search" }}</span>
-  <i class="icon fas fa-fw fa-search"></i>
-      </button>
-      {% endif %}
-      <button class="greedy-nav__toggle hidden" type="button">
-        <span class="visually-hidden">{{ site.data.ui-text[site.locale].menu_label | default: "Toggle menu" }}</span>
-        <div class="navicon"></div>
-      </button>
-      <ul class="hidden-links hidden"></ul>
-    </nav>
-  </div>
+  <nav id="site-nav" class="greedy-nav">
+    {% unless logo_path == empty %}
+      <a class="site-logo" href="{{ '/' | relative_url }}"><img src="{{ logo_path | relative_url }}" alt=""></a>
+    {% endunless %}
+    <a class="site-title" href="{{ '/' | relative_url }}">
+      {{ site.masthead_title | default: site.title }}
+      {% if site.subtitle %}<span class="site-subtitle">{{ site.subtitle }}</span>{% endif %}
+    </a>
+    <ul class="visible-links">
+      {%- for link in site.data.navigation.main -%}
+        <li class="masthead__menu-item">
+          <a href="{{ link.url | relative_url }}"{% if link.description %} title="{{ link.description }}"{% endif %}>{{ link.title }}</a>
+        </li>
+      {%- endfor -%}
+    </ul>
+    {% if site.search == true %}
+    <button class="search__toggle" type="button">
+      <span class="visually-hidden">{{ site.data.ui-text[site.locale].search_label | default: "Toggle search" }}</span>
+<i class="icon fas fa-fw fa-search"></i>
+    </button>
+    {% endif %}
+    <button class="greedy-nav__toggle hidden" type="button">
+      <span class="visually-hidden">{{ site.data.ui-text[site.locale].menu_label | default: "Toggle menu" }}</span>
+      <div class="navicon"></div>
+    </button>
+    <ul class="hidden-links hidden"></ul>
+  </nav>
 </div>

@@ 11,12 11,7 @@
 	position: sticky;
 	top: 0;
   @include clearfix;
-  margin-left: auto;
-  margin-right: auto;
   padding: 0.625em 0 0.625em 1em;
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
 
   @include breakpoint($x-large) {
     max-width: $max-width;


@@ 29,29 24,6 @@
   a {
     text-decoration: none;
   }
-}
-
-.site-logo img {
-  max-height: 2rem;
-}
-
-.site-title {
-  display: flex;
-  align-self: center;
-  font-weight: bold;
-}
-
-.site-subtitle {
-  display: block;
-  font-size: $type-size-8;
-}
-
-.masthead__menu {
-  float: left;
-  margin-left: 0;
-  margin-right: 0;
-  width: 100%;
-  clear: both;
 
   .site-nav {
     margin-left: 0;


@@ 69,6 41,21 @@
   }
 }
 
+.site-logo img {
+  max-height: 2rem;
+}
+
+.site-title {
+  display: flex;
+  align-self: center;
+  font-weight: bold;
+}
+
+.site-subtitle {
+  display: block;
+  font-size: $type-size-8;
+}
+
 .masthead__menu-item {
   display: block;
   list-style-type: none;