Skip to content

Commit 0968fff

Browse files
PhlowPhlow
committed
Cleaned up Assets and refined page layout with <figcaption>
1 parent 512a87e commit 0968fff

11 files changed

Lines changed: 26 additions & 2111 deletions

‎_layouts/page.html‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,25 @@
66
<div class="medium-8 columns{% if page.sidebar == NULL %} medium-offset-2 end{% endif %}{% if page.sidebar == "left" %} medium-push-4{% endif %}">
77
<article itemscope itemtype="http://schema.org/Article">
88
<header>
9-
{% if page.image.title %}<img src="{{ site.url }}/images/{{ page.image.title }}" width="970" alt="{{ page.title escape_once }}" itemprop="image">{% endif %}
10-
{% if page.image.url && page.image.credit %}
11-
<p class="text-right caption">
12-
<a href="{{ page.image.url }}">{{ page.image.credit }}</a>
13-
</p>
9+
{% if page.image.title %}
10+
<figure>
11+
<img src="{{ site.url }}/images/{{ page.image.title }}" width="970" alt="{{ page.title escape_once }}" itemprop="image">
12+
13+
{% if page.image.url && page.image.credit %}
14+
<figcaption class="text-right">
15+
<a href="{{ page.image.url }}">{{ page.image.credit }}</a>
16+
</figcaption>
17+
{% elsif page.image.credit %}
18+
<figcaption class="text-right">
19+
{{ page.image.credit }}
20+
</figcaption>
21+
{% endif %}
22+
</figure>
1423
{% endif %}
1524

1625
<span itemprop="name">
17-
{% if page.subheadline %}<p class="subheadline">{{ page.subheadline }}</p>{% endif %}
18-
<h1>{{ page.title }}</h1>
26+
{% if page.subheadline %}<p class="subheadline">{{ page.subheadline }}</p>{% endif %}
27+
<h1>{{ page.title }}</h1>
1928
</span>
2029
</header>
2130

‎_sass/_06_typography.scss‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,16 @@ img { border-radius: $global-radius;}
104104
img.aligncenter,
105105
img.center { display: block; margin:0 auto 10px; }
106106

107+
figure {
108+
margin: 0 0 rem-calc(30) 0;
109+
}
110+
111+
figcaption a {
112+
border-bottom: 1px dotted $grey-4;
113+
color: $grey-10;
114+
font-size: rem-calc(13);
115+
font-family: $font-family-sans-serif;
116+
}
107117

108118

109119
/* Lists

‎_sass/_09_elements.scss‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ button, .button { letter-spacing: 1px; }
8686
.side-nav li a:not(.button):hover, .side-nav li a:not(.button):focus { background: #eee; }
8787

8888
.homepage p { margin: 0; padding: 0; color: $grey-10; }
89-
.caption a { border-bottom: 1px dotted $grey-4; color: $grey-10; font-size: rem-calc(13); }
90-
9189

9290
.meta-info p {
9391
font-size: rem-calc(13);

‎assets/scss/_1_color_settings_theme-fr.scss‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎assets/scss/_2_typography_settings_theme-fr.scss‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)