New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase linklog against master #1320

Open
wants to merge 16 commits into
base: master
from
Jump to file or symbol
Failed to load files and symbols.
+235 −183
Diff settings

Always

Just for now

@@ -6,6 +6,13 @@ $heading-font-family: "PT Serif", "Georgia", "Helvetica Neue", Arial, sans-serif
$header-title-font-family: $heading-font-family !default;
$header-subtitle-font-family: $heading-font-family !default;
$h1: 2.2em !default;
$h2: 1.5em !default;
$h3: 1.3em !default;
$h4: 1em !default;
$h5: .9em !default;
$h6: .8em !default;
// Fonts
.heading {
font-family: $heading-font-family;
@@ -15,7 +22,7 @@ $header-subtitle-font-family: $heading-font-family !default;
.mono { font-family: $mono; }
body > header h1 {
font-size: 2.2em;
font-size: $h1;
@extend .heading;
font-family: $header-title-font-family;
font-weight: normal;
@@ -31,36 +38,35 @@ body {
color: $text-color;
@extend .serif;
}
h1 {
font-size: 2.2em;
line-height: 1.2em;
}
@media only screen and (min-width: 992px) {
body { font-size: 1.15em; }
h1 { font-size: 2.6em; line-height: 1.2em; }
}
#{headings()}{
@extend .heading;
text-rendering: optimizelegibility;
margin-bottom: 1em;
font-weight: bold;
}
h1 {
font-size: $h1;
line-height: 1.2em;
}
h2, section h1 {
font-size: 1.5em;
font-size: $h2;
}
h3, section h2, section section h1 {
font-size: 1.3em;
font-size: $h3;
}
h4, section h3, section section h2, section section section h1 {
font-size: 1em;
font-size: $h4;
}
h5, section h4, section section h3 {
font-size: .9em;
font-size: $h5;
}
h6, section h5, section section h4, section section section h3 {
font-size: .8em;
font-size: $h6;
}
@media only screen and (min-width: 992px) {
body { font-size: 1.15em; }
}
p, article blockquote, ul, ol { margin-bottom: 1.5em; }
@@ -2,32 +2,39 @@
#content > div { &, > article { padding-top: 0; } }
}
#blog-archives {
color: $text-color-light;
article {
padding: 1em 0 1em;
position: relative;
background: $img-border bottom left repeat-x;
&:last-child {
background: none;
}
footer { padding: 0; margin: 0;}
footer {
padding: 0; margin: 0;
font-size: .85em;
line-height: 1em;
}
}
h1 { color: $text-color; margin-bottom: .3em; }
h2 { display: none; }
h1 {
font-size: 1.5em;
.entry-title {
color: $text-color; margin-bottom: .3em;
font-size: $h3;
a {
@include hover-link;
color: inherit;
&:hover { color: $link-color-hover; }
font-weight: normal;
display: inline-block;
}
}
article[data-linklog] .entry-title {
font-size: $h4;
a { text-decoration: underline; }
}
a.category, time {
@extend .sans;
color: $text-color-light;
}
color: $text-color-light;
.entry-content { display: none; }
time {
font-size: .9em;
@@ -36,10 +43,13 @@
.month { text-transform: uppercase; }
}
p { margin-bottom: 1em; }
&, .entry-content { a { @include link-colors(inherit, $link-color-hover); }}
a:hover { color: $link-color-hover; }
@media only screen and (min-width: 550px) {
article { margin-left: 5em; }
article {
padding: { left: 4.5em; bottom: .7em;}
margin-left: 5em;
}
h2 {
margin-bottom: .3em;
font-weight: normal;
@@ -55,12 +65,7 @@
top: 1.8em;
}
.year { display: none; }
article {
padding:{left: 4.5em; bottom: .7em;}
}
a.category {
line-height: 1.1em;
}
a.category { line-height: 1.1em; }
}
}
#content > .category {
@@ -1,3 +1,8 @@
#content .blog-index {
padding: { top: 0; bottom: 0; }
article { padding-top: 2em; }
}
article {
padding-top: 1em;
a { @extend .force-wrap; }
@@ -7,70 +12,62 @@ article {
padding-bottom: 1em;
margin-bottom: 1em;
background: $img-border bottom left repeat-x;
h1 {
margin: 0;
a { text-decoration: none;
&:hover { text-decoration: underline; } }
@media only screen and (min-width: 768px) {
margin-bottom: 1.5em;
padding-bottom: 1em;
background: $img-border bottom left repeat-x;
}
.blog-index & { background: none; padding-bottom: 0; }
p {
font-size: .9em;
color: $text-color-light;
margin: 0;
&.meta {
@extend .sans;
text-transform: uppercase;
position: absolute; top: 0;
}
color: $text-color-light;
&.meta { @extend .sans; position: absolute; top: 0; }
}
@media only screen and (min-width: 768px) {
margin-bottom: 1.5em;
padding-bottom: 1em;
background: $img-border bottom left repeat-x;
time { text-transform: uppercase; }
}
.entry-title {
margin: 0;
a { text-decoration: none;
&:hover { text-decoration: underline; }
}
.blog-index & {
font-size: $h1;
a { color: inherit; &:hover { color: $link-color-hover; } }
}
}
a[rel=bookmark] { text-decoration: none; }
h2 {
padding-top: 0.8em;
background: $img-border top left repeat-x;
}
.entry-content & h2:first-child, header + h2 { padding-top: 0; }
h2:first-child, header + h2 { background: none; }
.feature {
padding-top: .5em;
margin-bottom: 1em;
padding-bottom: 1em;
background: $img-border bottom left repeat-x;
font-size: 2.0em; font-style: italic;
line-height: 1.3em;
}
img, video, .flash-video {
@extend .flex-content;
@extend .basic-alignment;
@include shadow-box;
}
video, .flash-video { margin: 0 auto 1.5em; }
video { display: block; width: 100%; }
.flash-video {
> div {
position: relative;
display: block;
padding-bottom: 56.25%;
padding-top: 1px;
height: 0;
overflow: hidden;
iframe, object, embed {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
.entry-content & h2:first-child, header + h2 { padding-top: 0; }
&[data-linklog] {
.entry-title {
font-size: $h1;
a { text-decoration: underline; }
}
.blog-index & .entry-title { font-size: $h2; }
}
.linklog-marker {
color: $text-color-light;
font-size: .8em;
line-height: 1em;
position: relative; top: -.15em;
}
> footer {
padding-bottom: 2.5em;
margin-top: 2em;
@extend .sans;
p.meta {
.blog-index & { margin-top: 1em; }
.meta {
margin-bottom: .8em;
font-size: .85em;
clear: both;
@@ -81,20 +78,6 @@ article {
}
}
}
article + article {
.blog-index & {
background: $img-border top left repeat-x;
}
}
#content .blog-index {
padding: { top: 0; bottom: 0; }
article { padding-top: 2em; }
article header { background: none; padding-bottom: 0; }
article h1 {
font-size: 2.2em;
a { color: inherit; &:hover { color: $link-color-hover; } }
}
a[rel=full-article] {
background: darken($main-bg, 5);
display: inline-block;
@@ -110,9 +93,43 @@ article + article {
color: $main-bg;
}
}
footer {
@extend .sans;
margin-top: 1em;
.blog-index & + article {
background: $img-border top left repeat-x;
}
.feature {
padding-top: .5em;
margin-bottom: 1em;
padding-bottom: 1em;
background: $img-border bottom left repeat-x;
font-size: 2.0em; font-style: italic;
line-height: 1.3em;
}
img, video, .flash-video {
@extend .flex-content;
@extend .basic-alignment;
@include shadow-box;
}
video, .flash-video { margin: 0 auto 1.5em; }
video { display: block; width: 100%; }
.flash-video {
> div {
position: relative;
display: block;
padding-bottom: 56.25%;
padding-top: 1px;
height: 0;
overflow: hidden;
iframe, object, embed {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
}
}
}
@@ -1,8 +1,12 @@
{% capture category %}{{ post.categories | size }}{% endcapture %}
<h1><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1>
{% include post/title.html %}
<time datetime="{{ post.date | datetime | date_to_xmlschema }}" pubdate>{{ post.date | date: "<span class='month'>%b</span> <span class='day'>%d</span> <span class='year'>%Y</span>"}}</time>
{% if category != '0' %}
<footer>
{% if linklog %}
<a rel="bookmark" href="{{ permalink }}">{{ site.permalink_label }}</a>
{% endif %}
{% if category != '0' %}
{% if linklog %} &bull; {% endif %}
<span class="categories">posted in {{ post.categories | category_links }}</span>
{% endif %}
</footer>
{% endif %}
@@ -1,28 +1,23 @@
{% unless page.no_header %}
<header>
{% if index %}
<h1 class="entry-title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1>
{% else %}
<h1 class="entry-title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1>
{% endif %}
{% include post/title.html %}
{% unless page.meta == false %}
<p class="meta">
{% include post/date.html %}{{ time }}
{% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %}
| <a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">Comments</a>
&bull; <a href="{% if index %}{{ permalink }}{% endif %}#disqus_thread">Comments</a>
{% endif %}
&bull; <a rel="bookmark" href="{{ permalink }}">{{ site.permalink_label }}</a>
</p>
{% endunless %}
</header>
{% endunless %}
{% if index %}
{% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
{% if index and excerpted != 'false' %}
<div class="entry-content">{{ content | excerpt }}</div>
{% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
{% if excerpted == 'true' %}
<footer>
<a rel="full-article" href="{{ root_url }}{{ post.url }}">{{ site.excerpt_link }}</a>
</footer>
{% endif %}
<footer>
<a rel="full-article" href="{{ permalink }}">{{ site.excerpt_link }}</a>
</footer>
{% else %}
<div class="entry-content">{{ content }}</div>
<div class="entry-content">{{ content }}</div>
{% endif %}
@@ -0,0 +1,9 @@
{% assign linklog = false %}
{% if post.external-url %}{% capture linklog %}{{ post.external-url }}{% endcapture %}{% endif %}
{% capture title_url %}{% if linklog %}{{ linklog }}{% else %}{{ site.url }}{{ post.url }}{% endif %}{% endcapture %}
{% capture title %}{% if linklog and site.linklog_marker_position_feed == 'before' %}{% unless linklog %}{{ site.standard_post_marker }}{% endunless %}{{ site.linklog_marker }} {% endif %}{{ post.title }}{% if linklog and site.linklog_marker_position_feed == 'after' %} {{ site.linklog_marker }}{% endif %}{% endcapture %}
{% capture content %}{% if site.excerpt_in_feed %}{{ post.content | excerpt | expand_urls: site.url }}<p><a rel="bookmark" href="{{ site.url }}{{ post.url }}">{{ site.excerpt_link }}</a></p>{% else %}{{ post.content | expand_urls: site.url }}{% endif %}{% if linklog and site.permalink_label_feed %}<p><a rel="bookmark" href="{{ site.url }}{{ post.url }}">{{ site.permalink_label_feed }}</a></p>{% endif %}{% endcapture %}
<title type="html"><![CDATA[{{ title | cdata_escape }}]]></title>
<link href="{{ title_url }}"/>
<updated>{{ post.date | date_to_xmlschema }}</updated>
<id>{{ site.url }}{{ post.id }}</id>
Oops, something went wrong.
ProTip! Use n and p to navigate between commits in a pull request.