~xdavidwu/xdavidwu.link

95f3ea673e6ffd0e5a965bedc0e9e7d337b391ec — xdavidwu 3 years ago 757c219
masthead: merge css
M _includes/masthead.html => _includes/masthead.html +1 -1
@@ 1,6 1,6 @@
{% capture logo_path %}{{ site.logo }}{% endcapture %}

<nav id="site-nav" class="greedy-nav masthead">
<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 %}

M _sass/minimal-mistakes/_colors.scss => _sass/minimal-mistakes/_colors.scss +1 -5
@@ 16,7 16,7 @@ a {
  color: $link-color;
}

.archive__subtitle, .feature__wrapper, .masthead, hr {
.archive__subtitle, .feature__wrapper, .greedy-nav, hr {
  border-color: $border-color;
}



@@ 92,10 92,6 @@ figcaption {
  }
}

.masthead {
  background: $background-color;
}

.pagination {
  li {
    a {

M _sass/minimal-mistakes/_masthead.scss => _sass/minimal-mistakes/_masthead.scss +20 -27
@@ 2,7 2,7 @@
   MASTHEAD
   ========================================================================== */

.masthead {
.greedy-nav {
  border-bottom-width: 1px;
  border-bottom-style: solid;
  animation: $intro-transition;


@@ 12,6 12,9 @@
	top: 0;
  @include clearfix;
  padding: 0.625em 0 0.625em 1em;
  display: flex;
  align-items: center;
  min-height: $nav-height;

  @include breakpoint($x-large) {
    max-width: $max-width;


@@ 23,33 26,8 @@

  a {
    text-decoration: none;
  }

  .site-nav {
    margin-left: 0;

    @include breakpoint($small) {
      float: right;
    }
  }

  ul {
    margin: 0;
    padding: 0;
    clear: both;
    list-style-type: none;
  }
}

.greedy-nav {
  display: flex;
  align-items: center;
  min-height: $nav-height;

  a {
    display: block;
    margin: 0 1rem;
    text-decoration: none;

    &.site-logo {
      margin-left: 0;


@@ 61,12 39,27 @@
    }
  }

  &__toggle {
  .site-nav {
    margin-left: 0;

    @include breakpoint($small) {
      float: right;
    }
  }

  .greedy-nav__toggle {
    align-self: center;
    height: $nav-toggle-height;
    border: 0;
    outline: none;
    cursor: pointer;
   }

  ul {
    margin: 0;
    padding: 0;
    clear: both;
    list-style-type: none;
  }

  .visible-links {