Skip to content

Commit ac69944

Browse files
committedJun 14, 2015
Re-style
1 parent 11d6c57 commit ac69944

File tree

7 files changed

+40
-18
lines changed

7 files changed

+40
-18
lines changed
 

‎SectionIndex.coffee

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ module.exports = React.createClass
2424
ul { className: 'post-list'},
2525
_.map @getSectionItems(), (item) =>
2626
# console.log item
27-
li key: item.url,
27+
li {className: 'post-list__item', key: item.url},
2828
h3 {className: 'post-list__heading'},
2929
SectionLink
3030
item: item
3131
, item.title
3232
if item.isDraft then span className: 'draft-text', ' Draft'
33+
p {className: 'post-list__preview'},
34+
item.preview
3335
if item.date
3436
MomentDisplay
3537
datetime: item.date
36-
p {className: 'post-list__preview'},
37-
item.preview

‎scss/_vars.scss

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $background-alt-color: #eee!default;
1919

2020
// Font and spacing
2121
$base-font-size: 20px!default;
22-
$base-line-height: 27px!default;
22+
$base-line-height: 30px!default;
2323
$base-spacing-unit: $base-line-height!default;
2424
$half-spacing-unit: $base-spacing-unit / 2!default;
2525
$line-height-ratio: $base-line-height / $base-font-size!default;
@@ -55,14 +55,15 @@ $light-tint: 97%!default;
5555

5656
// UI element colors
5757

58-
$action-color: $red!default;
58+
$action-color: lighten($dark, 10%)!default;
5959
$action-color-light: lighten($action-color, 10%)!default;
6060
$action-color-dark: darken($action-color, 10%)!default;
6161

6262
$sidebar-color: darken($light, 100 - $tint);
6363
$sidebar-font-color: $dark;
6464

65-
$link-color: darken($action-color, 20%);
65+
$link-color: $action-color;
66+
$link-color-active: lighten($action-color, 20%);
6667

6768
// Borders
6869
$border-color: mix($background-color, $font-color, 85%)!default;

‎scss/components/_links.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ a {
33
color: $link-color;
44
text-decoration: none;
55
&:hover {
6-
text-decoration: underline;
7-
color: $link-color;
6+
color: $link-color-active;
87
}
98
&,
109
&:focus,

‎scss/components/_nav.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ $line-height: 3px;
6363
top: $half-spacing-unit;
6464
right: $half-spacing-unit;
6565
z-index: 100;
66-
background-color: $sidebar-color;
66+
@include media-query($max-width) {
67+
background-color: $sidebar-color;
68+
}
6769
&:before {
6870
top: $base-spacing-unit - $line-height * 2;
6971
}

‎scss/components/_post-list.scss

+5-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@
1111
}
1212
.post-list__heading {
1313
margin: 0;
14+
font-weight: $fat;
1415
}
15-
.post-list__preview {
16+
.post-list__item {
1617
margin-bottom: $base-spacing-unit * 2;
1718
}
19+
.post-list__preview {
20+
margin-bottom: 0;
21+
}
1822
.draft-text {
1923
font-family: $small-font;
2024
color: #c40000;

‎scss/components/_post.scss

-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
img {
1212
width: 100%;
1313
}
14-
15-
> * {
16-
@include media-query('palm') {
17-
@include font-size(16px);
18-
}
19-
}
2014
}
2115
.header-image {
2216
width: 100%;

‎scss/components/_type.scss

+24-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ h1, h2, h3, h4, h5, h6 {
2828
}
2929
h1, h2, h3 {
3030
text-rendering: optimizeLegibility;
31-
font-style: italic;
31+
// font-style: italic;
3232
}
3333
h1 {
3434
@include font-size($h1-size);
@@ -39,21 +39,36 @@ h1 {
3939
// text-transform: uppercase;
4040
// letter-spacing: 1px;
4141
// margin-top: $base-spacing-unit;
42+
@include media-query('palm') {
43+
@include font-size($h2-size);
44+
}
4245
}
4346
h2 {
4447
@include font-size($h2-size);
4548
font-weight: $fat;
49+
@include media-query('palm') {
50+
@include font-size($h3-size);
51+
}
4652
}
4753
h3 {
4854
@include font-size($h3-size);
55+
@include media-query('palm') {
56+
@include font-size($h4-size);
57+
}
4958
}
5059
h4 {
5160
@include font-size($h4-size);
61+
@include media-query('palm') {
62+
@include font-size($h5-size);
63+
}
5264
}
5365
h5 {
5466
@include font-size($h5-size);
5567
text-transform: uppercase;
5668
margin-bottom: 0;
69+
@include media-query('palm') {
70+
@include font-size($h6-size);
71+
}
5772
}
5873
p {
5974
margin-bottom: $base-spacing-unit;
@@ -144,7 +159,7 @@ time {
144159
font-family: $small-font;
145160
color: $quiet-font-color;
146161
font-weight: $bold;
147-
@include font-size($deci-size);
162+
@include font-size($milli-size);
148163
}
149164

150165
@mixin font-size-micro () {
@@ -166,3 +181,10 @@ time {
166181
@include font-size($deci-size);
167182
// letter-spacing: 1px;
168183
}
184+
185+
186+
p, code, blockquote, pre {
187+
@include media-query('palm') {
188+
@include font-size(18px);
189+
}
190+
}

0 commit comments

Comments
 (0)