diff --git a/_includes/header.html b/_includes/header.html --- a/_includes/header.html +++ b/_includes/header.html @@ -1,25 +1,19 @@ {% if page.title %}
-
-
-
-
-

{% if page.title %}{{ page.title }}{% else %}
{% endif %}

- {% if page.subtitle %} - {% if include.type == "page" %} -
- {{ page.subtitle }} - {% else %} -

{{ page.subtitle }}

- {% endif %} - {% endif %} - {% if include.type == "post" %} - Posted on {{ page.date | date: "%B %-d, %Y" }} - {% endif %} -
-
-
+
+

{% if page.title %}{{ page.title }}{% else %}
{% endif %}

+ {% if page.subtitle %} + {% if include.type == "page" %} +
+ {{ page.subtitle }} + {% else %} +

{{ page.subtitle }}

+ {% endif %} + {% endif %} + {% if include.type == "post" %} + Posted on {{ page.date | date: "%B %-d, %Y" }} + {% endif %}
diff --git a/_layouts/base.html b/_layouts/base.html --- a/_layouts/base.html +++ b/_layouts/base.html @@ -17,20 +17,14 @@ - {% include head.html %} - - {% include gtm_body.html %} - {% include nav.html %} - - {{ content }} - +
+ {{ content }} +
{% include footer.html %} - {% include footer-scripts.html %} - diff --git a/_layouts/doc.html b/_layouts/doc.html --- a/_layouts/doc.html +++ b/_layouts/doc.html @@ -6,39 +6,40 @@
Version {{ page.version }} -{% for group in groups %} -{% assign maybeHideOnStart = '' %} -{% if group.name != page.group %} - {% assign maybeHideOnStart = 'js-hide-on-start' %} -{% endif %} -
- {% if groups.size > 1 %} -

- - {{ group.name }} -

+ {% for group in groups %} + {% assign maybeHideOnStart = '' %} + {% if group.name != page.group %} + {% assign maybeHideOnStart = 'js-hide-on-start' %} {% endif %} -
- -
-
-{% endfor %} +
+ {% if groups.size > 1 %} +

+ + {{ group.name }} +

+ {% endif %} +
+ +
+
+ {% endfor %}
-{% include header.html type="page" %} +
+ {% include header.html type="page" %} -
-
-
- {% if page.category == "man" %} - {{ content }} - {% else %} - {% highlight text %}{{ content }}{% endhighlight %} - {% endif %} -
-
+ {% if page.category == "man" %} + {{ content }} + {% else %} + {% highlight text %}{{ content }}{% endhighlight %} + {% endif %}
+ + +
diff --git a/_layouts/page.html b/_layouts/page.html --- a/_layouts/page.html +++ b/_layouts/page.html @@ -2,12 +2,8 @@ layout: base --- -{% include header.html type="page" %} +
+ {% include header.html type="page" %} -
-
-
- {{ content }} -
-
+ {{ content }}
diff --git a/_layouts/post.html b/_layouts/post.html --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,11 +2,9 @@ layout: base --- -{% include header.html type="post" %} +
-
-
-
+{% include header.html type="post" %} {% if page.gh-repo %} {% assign gh_split = page.gh-repo | split:'/' %} @@ -64,6 +62,5 @@ {% endif %} -
-
+
diff --git a/css/main.css b/css/main.css --- a/css/main.css +++ b/css/main.css @@ -35,6 +35,7 @@ blockquote { color: #808080; font-style: italic; + word-wrap: break-word; } blockquote p:first-child { margin-top: 0; @@ -291,14 +292,13 @@ font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; } .post-entry-container { - display: inline-block; - width: 100%; + display: flex; } .post-entry { - width: 100%; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + flex: 1 100%; } .post-image { float: right; @@ -372,8 +372,12 @@ } /* --- Post and page headers --- */ +header { + flex: 1 100%; +} + .intro-header { - margin: 80px 0 20px; + margin-bottom: 20px; position: relative; pointer-events: none; } @@ -400,11 +404,6 @@ .intro-header .post-heading .post-subheading { margin-bottom: 20px; } -@media only screen and (min-width: 768px) { - .intro-header { - margin-top: 130px; - } -} .header-section.has-img .no-img { margin-top: 0; @@ -662,19 +661,9 @@ } .subnav { + flex: 1; font-size: 14px; - position: relative; -} -@media only screen and (max-width: 1000px) { - .subnav { - margin-top: 100px; - } -} -@media only screen and (min-width: 1000px) { - .subnav { - position: absolute; - left: 0; - } + min-width: 150px; } .subnav h3 { font-size: 18px; @@ -714,6 +703,29 @@ overflow: hidden; } +.flex-container { + display: flex; + flex-flow: row wrap; + justify-content: center; + margin: 120px 10px 0 10px; +} +@media only screen and (min-width: 768px) and (max-width: 1000px) { + .flex-container { + margin-top: 150px; + } +} +@media only screen and (max-width: 768px) { + .flex-container { + margin-top: 60px; + } +} + +.flex-content { + flex: 1 1 0; + width: 100%; + max-width: 1000px; +} + .flex-row { flex: 1 100%; }