... | ... |
@@ -3,9 +3,15 @@ |
3 | 3 |
|
4 | 4 |
html, body { |
5 | 5 |
font: $font-size-default/$line-height-default $font-family; |
6 |
+} |
|
7 |
+ |
|
8 |
+#wrapper { |
|
9 |
+ @include for-tablet { |
|
10 |
+ font-size: 16px; |
|
11 |
+ } |
|
6 | 12 |
|
7 | 13 |
@include for-mobile { |
8 |
- font-size: 18px; |
|
14 |
+ font-size: 14px; |
|
9 | 15 |
} |
10 | 16 |
} |
11 | 17 |
|
... | ... |
@@ -39,10 +45,15 @@ p { |
39 | 45 |
&:last-child { |
40 | 46 |
margin-bottom: 0; |
41 | 47 |
} |
48 |
+ |
|
49 |
+ + ul, |
|
50 |
+ + ol { |
|
51 |
+ margin-top: -1.5em; |
|
52 |
+ } |
|
42 | 53 |
} |
43 | 54 |
h1,h2,h3,h4,h5,h6 { |
44 | 55 |
@include headline(); |
45 |
- margin: 0 0 1.25em; |
|
56 |
+ margin: 0 0 0.75em; |
|
46 | 57 |
line-height: 1.15; |
47 | 58 |
|
48 | 59 |
em,i { |
... | ... |
@@ -82,28 +93,28 @@ h5 { |
82 | 93 |
|
83 | 94 |
@include for-tablet { |
84 | 95 |
h1, h2 { |
85 |
- font-size: font-size(55px); |
|
96 |
+ font-size: font-size(27px); |
|
86 | 97 |
} |
87 | 98 |
|
88 | 99 |
h3 { |
89 |
- font-size: font-size(35px); |
|
100 |
+ font-size: font-size(23px); |
|
90 | 101 |
} |
91 | 102 |
|
92 | 103 |
h4,h5 { |
93 |
- font-size: font-size(30px); |
|
104 |
+ font-size: font-size(19px); |
|
94 | 105 |
} |
95 | 106 |
} |
96 | 107 |
@include for-mobile { |
97 | 108 |
h1, h2 { |
98 |
- font-size: font-size(37px); |
|
109 |
+ font-size: font-size(22px); |
|
99 | 110 |
} |
100 | 111 |
|
101 | 112 |
h3 { |
102 |
- font-size: font-size(32px); |
|
113 |
+ font-size: font-size(18px); |
|
103 | 114 |
} |
104 | 115 |
|
105 | 116 |
h4,h5 { |
106 |
- font-size: font-size(28px); |
|
117 |
+ font-size: font-size(15px); |
|
107 | 118 |
} |
108 | 119 |
} |
109 | 120 |
|
... | ... |
@@ -74,13 +74,10 @@ h4 { |
74 | 74 |
} |
75 | 75 |
|
76 | 76 |
h5 { |
77 |
- color: $color-text; |
|
78 |
- font-weight: 400; |
|
79 |
- font-size: font-size(32px); |
|
80 |
- |
|
81 |
- &.fw_normal { |
|
82 |
- font-weight: 400; |
|
83 |
- } |
|
77 |
+ font-size: font-size(22px); |
|
78 |
+ letter-spacing: 0.125em; |
|
79 |
+ text-transform: uppercase; |
|
80 |
+ margin-bottom: 0.25em; |
|
84 | 81 |
} |
85 | 82 |
|
86 | 83 |
@include for-tablet { |
... | ... |
@@ -42,7 +42,7 @@ p { |
42 | 42 |
} |
43 | 43 |
h1,h2,h3,h4,h5,h6 { |
44 | 44 |
@include headline(); |
45 |
- margin: 0 0 0.5em; |
|
45 |
+ margin: 0 0 1.25em; |
|
46 | 46 |
line-height: 1.15; |
47 | 47 |
|
48 | 48 |
em,i { |
... | ... |
@@ -62,10 +62,18 @@ h1, h2 { |
62 | 62 |
} |
63 | 63 |
|
64 | 64 |
h3 { |
65 |
- font-size: font-size(38px); |
|
65 |
+ font-size: font-size(27px); |
|
66 |
+ letter-spacing: 0.125em; |
|
67 |
+ text-transform: uppercase; |
|
68 |
+} |
|
69 |
+ |
|
70 |
+h4 { |
|
71 |
+ font-size: font-size(22px); |
|
72 |
+ letter-spacing: 0.125em; |
|
73 |
+ text-transform: uppercase; |
|
66 | 74 |
} |
67 | 75 |
|
68 |
-h4,h5 { |
|
76 |
+h5 { |
|
69 | 77 |
color: $color-text; |
70 | 78 |
font-weight: 400; |
71 | 79 |
font-size: font-size(32px); |
... | ... |
@@ -102,6 +102,11 @@ h4,h5 { |
102 | 102 |
} |
103 | 103 |
} |
104 | 104 |
|
105 |
+.ff-sans { |
|
106 |
+ font-family: $font-family-alternate; |
|
107 |
+ letter-spacing: 0.125em; |
|
108 |
+} |
|
109 |
+ |
|
105 | 110 |
.ff_h { |
106 | 111 |
font-family: $font-family-handwriting; |
107 | 112 |
font-weight: 400; |
... | ... |
@@ -121,4 +126,4 @@ h4,h5 { |
121 | 126 |
|
122 | 127 |
.fs_small { |
123 | 128 |
font-size: font-size(16px); |
124 |
-} |
|
125 | 129 |
\ No newline at end of file |
130 |
+} |
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,123 @@ |
1 |
+@if not-imported("import_once_func") { @import "import_once_func"; } |
|
2 |
+@if not-imported("framework") { @import "framework"; } |
|
3 |
+ |
|
4 |
+html, body { |
|
5 |
+ font: $font-size-default/$line-height-default $font-family; |
|
6 |
+ |
|
7 |
+ @include for-mobile { |
|
8 |
+ font-size: 18px; |
|
9 |
+ } |
|
10 |
+} |
|
11 |
+ |
|
12 |
+h1, h2, h3, h4, h5, h6, p, pre, blockquote, table, ol, ul, form { |
|
13 |
+ margin-bottom: $gutter-default; |
|
14 |
+} |
|
15 |
+ |
|
16 |
+body { |
|
17 |
+ font-weight: $font-weight-default; |
|
18 |
+ color: $color-text; |
|
19 |
+} |
|
20 |
+ |
|
21 |
+strong, |
|
22 |
+b { |
|
23 |
+ font-weight: 700; |
|
24 |
+} |
|
25 |
+ |
|
26 |
+a { |
|
27 |
+ text-decoration: none; |
|
28 |
+ color: $color-link; |
|
29 |
+ @include transition(color 0.2s ease); |
|
30 |
+ |
|
31 |
+ &:hover { |
|
32 |
+ color: mix($color-link,#000,80%); |
|
33 |
+ } |
|
34 |
+} |
|
35 |
+ |
|
36 |
+p { |
|
37 |
+ margin-bottom: 1.5em; |
|
38 |
+ |
|
39 |
+ &:last-child { |
|
40 |
+ margin-bottom: 0; |
|
41 |
+ } |
|
42 |
+} |
|
43 |
+h1,h2,h3,h4,h5,h6 { |
|
44 |
+ @include headline(); |
|
45 |
+ margin: 0 0 0.5em; |
|
46 |
+ line-height: 1.15; |
|
47 |
+ |
|
48 |
+ em,i { |
|
49 |
+ font-style: normal; |
|
50 |
+ color: $color-text-alt; |
|
51 |
+ } |
|
52 |
+ |
|
53 |
+ &:last-child { |
|
54 |
+ margin-bottom: 0; |
|
55 |
+ } |
|
56 |
+} |
|
57 |
+ |
|
58 |
+h1, h2 { |
|
59 |
+ font-size: font-size(65px); |
|
60 |
+ text-align: center; |
|
61 |
+} |
|
62 |
+ |
|
63 |
+h3 { |
|
64 |
+ font-size: font-size(38px); |
|
65 |
+} |
|
66 |
+ |
|
67 |
+h4,h5 { |
|
68 |
+ color: $color-text; |
|
69 |
+ font-weight: 400; |
|
70 |
+ font-size: font-size(32px); |
|
71 |
+ |
|
72 |
+ &.fw_normal { |
|
73 |
+ font-weight: 400; |
|
74 |
+ } |
|
75 |
+} |
|
76 |
+ |
|
77 |
+@include for-tablet { |
|
78 |
+ h1, h2 { |
|
79 |
+ font-size: font-size(55px); |
|
80 |
+ } |
|
81 |
+ |
|
82 |
+ h3 { |
|
83 |
+ font-size: font-size(35px); |
|
84 |
+ } |
|
85 |
+ |
|
86 |
+ h4,h5 { |
|
87 |
+ font-size: font-size(30px); |
|
88 |
+ } |
|
89 |
+} |
|
90 |
+@include for-mobile { |
|
91 |
+ h1, h2 { |
|
92 |
+ font-size: font-size(37px); |
|
93 |
+ } |
|
94 |
+ |
|
95 |
+ h3 { |
|
96 |
+ font-size: font-size(32px); |
|
97 |
+ } |
|
98 |
+ |
|
99 |
+ h4,h5 { |
|
100 |
+ font-size: font-size(28px); |
|
101 |
+ } |
|
102 |
+} |
|
103 |
+ |
|
104 |
+.ff_h { |
|
105 |
+ font-family: $font-family-handwriting; |
|
106 |
+ font-weight: 400; |
|
107 |
+ text-transform: none; |
|
108 |
+ letter-spacing: normal; |
|
109 |
+} |
|
110 |
+ |
|
111 |
+.ff_a { |
|
112 |
+ font-family: $font-family-alternate; |
|
113 |
+ letter-spacing: 0.1em; |
|
114 |
+ text-transform: none; |
|
115 |
+} |
|
116 |
+ |
|
117 |
+.ff_a_sc { |
|
118 |
+ @include small-caps; |
|
119 |
+} |
|
120 |
+ |
|
121 |
+.fs_small { |
|
122 |
+ font-size: font-size(16px); |
|
123 |
+} |
|
0 | 124 |
\ No newline at end of file |