diff --git a/_includes/header.html b/_includes/header.html index f837405..096045d 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,28 +1,22 @@ {% 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 %}
{% else %}
{% endif %} diff --git a/_layouts/base.html b/_layouts/base.html index 453194c..ca33136 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -1,36 +1,30 @@ --- common-css: - "/css/bootstrap.min.css" - "/css/bootstrap-social.css" - "/css/main.css" common-ext-css: - "//maxcdn.bootstrapcdn.com/font-awesome/4.6.0/css/font-awesome.min.css" common-googlefonts: - "Lora:400,700,400italic,700italic" - "Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" common-js: - "/js/jquery-1.11.2.min.js" - "/js/bootstrap.min.js" - "/js/main.js" - "/js/blog-feed.js" --- - {% 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 index 8ec71a1..bb5bbce 100644 --- a/_layouts/doc.html +++ b/_layouts/doc.html @@ -1,44 +1,45 @@ --- layout: base --- {% assign groups = site.doc | where:"version", page.version | where:"category", page.category | group_by:"group" | sort:"name" %}
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 index 90107f3..c75b776 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -1,13 +1,9 @@ --- layout: base --- -{% include header.html type="page" %} +
+ {% include header.html type="page" %} -
-
-
- {{ content }} -
-
+ {{ content }}
diff --git a/_layouts/post.html b/_layouts/post.html index 471e317..ad96dc0 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,69 +1,66 @@ --- layout: base --- -{% include header.html type="post" %} +
-
-
-
+{% include header.html type="post" %} {% if page.gh-repo %} {% assign gh_split = page.gh-repo | split:'/' %} {% assign gh_user = gh_split[0] %} {% assign gh_repo = gh_split[1] %}
{% if page.gh-badge.size > 0 %} {% for badge in page.gh-badge %} {% case badge %} {% when 'star'%} {% when 'watch'%} {% when 'fork'%} {% when 'follow'%} {% endcase %} {% endfor %} {% endif %}
{% endif %}
{{ content }}
{% if page.tags.size > 0 %}
Tags: {% if site.link-tags %} {% for tag in page.tags %} {{- tag -}} {% endfor %} {% else %} {{ page.tags | join: ", " }} {% endif %}
{% endif %} {% if page.social-share %} {% include social-share.html %} {% endif %} -
-
+
diff --git a/css/main.css b/css/main.css index 4193981..977d542 100644 --- a/css/main.css +++ b/css/main.css @@ -1,719 +1,731 @@ --- layout: null --- @import url("pygment_highlights.css"); /* --- General --- */ body { font-family: 'Lora', 'Times New Roman', serif; font-size: 18px; color: #404040; position: relative; background-color: {{ site.page-col }}; {% if site.page-img %} background-image: url({{ site.page-img }}); background-attachment: fixed; {% endif %} } p { line-height: 1.5; margin: 30px 0; } h1,h2,h3,h4,h5,h6 { font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 800; } a { color: {{ site.link-col }}; } a:hover, a:focus { color: {{ site.hover-col }}; } blockquote { color: #808080; font-style: italic; + word-wrap: break-word; } blockquote p:first-child { margin-top: 0; } hr.small { max-width: 100px; margin: 15px auto; border-width: 4px; border-color: inherit; border-radius: 3px; } .main-content { padding-top: 80px; } @media only screen and (min-width: 768px) { .main-content { padding-top: 130px; } } .main-explain-area { font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 15px inherit; } .hideme { display: none; } ::-moz-selection { color: white; text-shadow: none; background-color: {{ site.hover-col }}; } ::selection { color: white; text-shadow: none; background-color: {{ site.hover-col }}; } img::selection { color: white; background: transparent; } img::-moz-selection { color: white; background: transparent; } img { max-width: 100%; } .linked-section { padding-top: 60px; margin-top: -25px; } /* --- Navbar --- */ .navbar-custom { background-color: {{ site.navbar-col }}; border-bottom: 1px solid #EAEAEA; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; {% if site.navbar-img %} background-image: url({{ site.navbar-img }}); background-attachment: fixed; {% endif %} } .navbar-custom .nav li a { text-transform: uppercase; font-size: 12px; letter-spacing: 1px; } .navbar-custom .navbar-brand, .navbar-custom .nav li a { font-weight: 800; color: {{ site.navbar-text-col }}; } .navbar-custom .navbar-brand:hover, .navbar-custom .navbar-brand:focus , .navbar-custom .nav li a:hover, .navbar-custom .nav li a:focus { color: {{ site.hover-col }}; } .navbar-custom .navbar-brand-logo { padding-top: 0; -webkit-transition: padding .5s ease-in-out; -moz-transition: padding .5s ease-in-out; transition: padding .5s ease-in-out; } .navbar-custom .navbar-brand-logo img { -webkit-transition: height .5s ease-in-out; -moz-transition: height .5s ease-in-out; transition: height .5s ease-in-out; } .navbar-custom.top-nav-short .navbar-brand-logo { padding-top: 5px; } .navbar-custom.top-nav-short .navbar-brand-logo img { } @media only screen and (min-width: 768px) { .navbar-custom { padding: 20px 0; -webkit-transition: background .5s ease-in-out,padding .5s ease-in-out; -moz-transition: background .5s ease-in-out,padding .5s ease-in-out; transition: background .5s ease-in-out,padding .5s ease-in-out; } .navbar-custom.top-nav-short { padding: 0; } } /* Multi-level navigation links */ .navbar-custom .nav .navlinks-container { position: relative; } .navbar-custom .nav .navlinks-parent:after { content: " \25BC"; } .navbar-custom .nav .navlinks-children { width: 100%; display: none; word-break: break-word; } .navbar-custom .nav .navlinks-container .navlinks-children a { display: block; padding: 10px; padding-left: 30px; background-color: {{ site.navbar-children-col }}; text-decoration: none !important; border-width: 0 1px 1px 1px; font-weight: normal; } @media only screen and (max-width: 767px) { .navbar-custom .nav .navlinks-container.show-children { background: rgba(0, 0, 0, 0.2); } .navbar-custom .nav .navlinks-container.show-children .navlinks-children { display: block; } } @media only screen and (min-width: 768px) { .navbar-custom .nav .navlinks-container { text-align: center; } .navbar-custom .nav .navlinks-container:hover { background: rgba(0, 0, 0, 0.1); } .navbar-custom .nav .navlinks-container:hover .navlinks-children { display: block; } .navbar-custom .nav .navlinks-children { position: absolute; } .navbar-custom .nav .navlinks-container .navlinks-children a { padding-left: 10px; border: 1px solid #eaeaea; border-width: 0 1px 1px; } } /* --- Footer --- */ footer { display: flex; flex: 1 100%; flex-flow: row wrap; text-align: center; padding: 20px 0; border-top: 1px #EAEAEA solid; margin-top: 50px; font-size: 14px; background-color: {{ site.footer-col }}; {% if site.footer-img %} background-image: url({{ site.footer-img }}); background-attachment: fixed; {% endif %} } footer p.text-muted { color: {{ site.footer-text-col }}; } footer a { color: {{site.footer-link-col}}; font-weight: bold; } footer .copyright { font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; text-align: center; margin-top: 1em; } @media only screen and (min-width: 768px) { footer .footer-links { font-size: 18px; } footer .copyright { font-size: 16px; } } /* --- Post preview --- */ .post-preview { padding: 20px 0; border-bottom: 1px solid #eee; } @media only screen and (min-width: 768px) { .post-preview { padding: 35px 0; } } .post-preview a { text-decoration: none; color: #404040; } .post-preview a:focus, .post-preview a:hover { text-decoration: none; color: {{ site.hover-col }}; } .post-preview .post-title { font-size: 30px; margin-top: 0; } .post-preview .post-subtitle { margin: 0; font-weight: 300; margin-bottom: 10px; } .post-preview .post-meta, .post-heading .post-meta { color: #808080; font-size: 18px; font-style: italic; margin: 0; } .post-preview .post-entry { 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; height: 192px; width: 192px; margin-top: -35px; filter: grayscale(90%); } .post-image:hover { filter: grayscale(0%); } .post-image img { border-radius: 100px; height: 192px; width: 192px; } .post-preview .post-read-more { font-weight: 800; } @media only screen and (min-width: 768px) { .post-preview .post-title { font-size: 36px; } } /* --- Tags --- */ .blog-tags { font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #999; font-size: 15px; margin-bottom: 30px; } .blog-tags a { color: {{ site.link-col }}; text-decoration: none; padding: 0px 5px; } .blog-tags a:hover { border-radius: 2px; color: {{ site.hover-col }}; background-color: #EEE; } .post-preview .blog-tags { margin-top: 5px; margin-bottom: 0; } @media only screen and (min-width: 768px) { .post-preview .blog-tags { margin-top: 10px; } } @media only screen and (max-width: 500px) { .post-image, .post-image img { height: 100px; width: 100px; } .post-image { width: 100%; text-align: center; margin-top: 0; float: left; } } /* --- Post and page headers --- */ +header { + flex: 1 100%; +} + .intro-header { - margin: 80px 0 20px; + margin-bottom: 20px; position: relative; pointer-events: none; } .intro-header .page-heading { text-align: center; } .intro-header .page-heading h1 { margin-top: 0; font-size: 40px; } .intro-header .post-heading h1 { margin-top: 0; font-size: 35px; } .intro-header .page-heading .page-subheading, .intro-header .post-heading .post-subheading { font-size: 27px; line-height: 1.1; display: block; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 300; margin: 10px 0 0; } .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; background-color: #FCFCFC; margin: 0 0 40px; padding: 20px 0; box-shadow: 0 0 5px #AAA; } /* Many phones are 320 or 360px, so make sure images are a proper aspect ratio in those cases */ .header-section.has-img .intro-header.no-img { display: none; } @media only screen and (max-width: 365px) { .header-section.has-img .intro-header.no-img { display: block; } } .caption { text-align: center; font-size: 14px; padding: 10px; font-style: italic; margin: 0; display: block; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; } #header-gh-btns { margin-bottom: 15px; } @media only screen and (max-width: 500px) { #header-gh-btns > iframe { display: block; margin-bottom: 5px; } } /* --- Pager --- */ .pager li a { font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; text-transform: uppercase; font-size: 14px; font-weight: 800; letter-spacing: 1px; padding: 10px 5px; background-color: #FFF; border-radius: 0; color: #404040; } @media only screen and (min-width: 768px) { .pager li a { padding: 15px 25px; } } .pager li a:hover, .pager li a:focus { color: #FFF; border: 1px solid {{ site.hover-col }}; background-color: {{ site.hover-col }}; } .pager { margin: 10px 0 0; } .pager.blog-pager { margin-top: 0; } @media only screen and (min-width: 768px) { .pager.blog-pager { margin-top: 10px; } } /* --- Tables --- */ table { padding: 0; } table tr { border-top: 1px solid #cccccc; background-color: #ffffff; margin: 0; padding: 0; } table tr:nth-child(2n) { background-color: #f8f8f8; } table tr th { font-weight: bold; border: 1px solid #cccccc; text-align: left; margin: 0; padding: 6px 13px; } table tr td { border: 1px solid #cccccc; text-align: left; margin: 0; padding: 6px 13px; } table tr th :first-child, table tr td :first-child { margin-top: 0; } table tr th :last-child, table tr td :last-child { margin-bottom: 0; } /* --- Code blocks --- */ pre { font-size: 16px; line-height: 1.5em; } pre code { white-space: pre-wrap; word-break: break-word; } pre.highlight, .highlight > pre, td.code pre { background-color: #FAFAFA; background-image: linear-gradient(#FDFDFD 50%, #F7F9FF 50%); background-repeat: repeat; background-size: 3em 3em; background-position: 0px 5px; border-left: 5px solid #9AC; padding: 5px 7px; } code table, code table td, code table th, code table tbody, code table tr, td.gutter pre { padding: 0; border: none; background-color: #fff; } td.code pre { border-width: 0 0 0 2px; border-style: solid; border-color: #444; border-radius: 0; } td.gutter { padding-top: 3px; } /* --- Social media sharing section --- */ #social-share-section { margin-bottom: 30px; } /* --- Notification boxes --- */ .box-note, .box-warning, .box-error { padding: 15px 15px 15px 10px; margin: 20px 20px 20px 5px; border: 1px solid #eee; border-left-width: 5px; border-radius: 5px 3px 3px 5px; } .box-note { background-color: #eee; border-left-color: #2980b9; } .box-warning { background-color: #fdf5d4; border-left-color: #f1c40f; } .box-error { background-color: #f4dddb; border-left-color: #c0392b; } /* Fix table border github gist snippets */ .gist, .gist-file table tr { border: unset; } .gist, .gist-file table tr td { border: unset; } /* Fix .navbar-toggle */ .navbar-default button.navbar-toggle:focus, .navbar-default button.navbar-toggle:hover { background-color: initial; } .navbar-default button.navbar-toggle[aria-expanded="true"] { background-color: rgba(0, 0, 0, 0.2); } /* Tags page */ .tag-btn { margin: 5px; } #full-tags-list { font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; } #full-tags-list .tag-entry { margin: 0 0 15px 25px; } #full-tags-list .tag-entry a { font-size: 20px; } #full-tags-list .tag-entry .entry-date { color: #808080; font-style: italic; font-size: 16px; } .email-obfuscation span:nth-child(2n){ display: none; } .footer-donation-addr { margin-bottom: 1em; } .footer-donation-addr a { font-size: 0.8vw } @media only screen and (max-width: 1400px) { .footer-donation-addr a { font-size: 1.7vw } } @media only screen and (max-width: 600px) { .footer-donation-addr a { font-size: 2.9vw } } .sponsor-container { display: flex; align-items: baseline; justify-content: center; flex-wrap: wrap; } .sponsor { margin: 10px 30px; } .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; margin: 5px; text-transform: uppercase; } .subnav h3:hover { cursor: pointer; } .subnav li { list-style-type: none; } .subnav-header { } .subnav-drawer { } .subnav-selected { text-decoration: underline; font-size: 1.15em; } .subnav-strong-link { font-size: 18px; font-weight: bold; margin: 0px 0px 20px 5px; } .subnav-strong-link:before { margin-right: 5px; } .js-hidden { max-height: 0; 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%; }