lines-engine 0.2 → 0.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0e4fa222321de48b46c34424452d5d17bcf4f86a
4
- data.tar.gz: 83ed0137e833ecb4560ae037fb364f150b30c30d
3
+ metadata.gz: 102ab36e8069def0ec587ad8212359cd08ae2459
4
+ data.tar.gz: 28b9ed32939326854249fafa42a582879b5ee1fe
5
5
  SHA512:
6
- metadata.gz: 79846c52d3b1115135c487509ebcfb249f8e6e3d7f92624b5c4d4109cedaac1e53609021d0c58a63c49ae5209baeacebf13e950818145b4ef1005b518b10358d
7
- data.tar.gz: 5922ce6e5b2c454e53107bb828e6040fc3e96aa0e648c8f9167c49b3603d6dacf006ed0ce9eddad5f01a232faf156caecb43187fafd2147edab6dbbb500958c5
6
+ metadata.gz: f4d976f97ccfd30ca929f50b8f2e13e8bb0fa4a0a1590b426fdc10b2711b0478e97bb128f7676eab722f3a40ab0b50e42aad953c7526bd114526d3a51f8abe90
7
+ data.tar.gz: 7cea63bd5a0ed6c8e6c5bd97e720b7f27a91f3348164da0be32a4826fbae41872b5daf8f2f225d62996feb148f2aa46d58026c89c09176edb09b372ff34689ed
data/CHANGELOG.md CHANGED
@@ -1,5 +1,15 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.3
4
+
5
+ - Heavily simplified CSS and markup for articles
6
+
7
+
8
+ ## 0.2
9
+
10
+ - Teaser is back!
11
+ - Various small bug fixes
12
+
3
13
  ## 0.1.11 / 0.1.12
4
14
 
5
15
  - Version badge added to README
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- lines-engine (0.2)
4
+ lines-engine (0.3)
5
5
  acts-as-taggable-on (~> 3.2.6, >= 3.2.6)
6
6
  bcrypt (~> 3.1.0, >= 3.1.0)
7
7
  carrierwave (~> 0.10.0, >= 0.10.0)
@@ -2,73 +2,25 @@
2
2
  smaller than 975px
3
3
  *************************************************************************************/
4
4
  @media screen and (max-width: 975px) {
5
- #pagewrap { width: 100%; padding: 0; }
6
- #content img { width:100%;}
7
- div.article, div.article.first {
8
- max-width: 100%; float: none; display: block;
9
- div.hero_image {
10
- text-align: center;
11
- a, img { width: 100%; height: auto; }
12
- }
13
-
14
- }
15
- div.rss { display: none; }
16
- #footer { padding: 30px 20px; }
17
- #topbar { padding: 0 1%; max-width:98%; }
18
- div.article_content, div.article_teaser {
19
- padding: 0 15px;
20
- h1 { line-height: 1.5em; }
21
- }
22
- div.article_header {
23
- h1 {
24
- width: 100%;
25
- a { width: 100%; display: block;}
26
- }
27
- }
28
- #footer-content img { max-width: 100%; }
29
- #footer .two-cols { max-width: 100%; display: block; float: none; }
30
5
  }
31
6
 
32
-
33
-
34
-
35
7
  /************************************************************************************
36
8
  smaller than 800px
37
9
  *************************************************************************************/
38
10
  @media screen and (max-width: 800px) {
39
- div.article_header h1.title { font-size: 1.6em; margin: 30px 0 10px 0; }
40
- div.sub_title { font-size: 1.1em; }
41
- #topbar {
42
- text-align:center;
43
- .right {float:none;}
44
- }
45
- div.article_content, div.article_teaser { padding: 0 10px; }
46
- .two-cols { float:none; width:100%; }
47
- h4.mobile-margin { margin: 40px 0 0 0;}
48
- #logo, #lines { text-align: center; width: 100%; }
49
- #lines { margin: 20px 0 0 0; }
50
- h5.margin-top a { margin-top: 40px; display: block; }
51
- #footer {
52
- .two-cols { padding: 0; width: 100%; line-height: 24px; float: none; display: block; }
53
- .row.about {
54
- text-align: center;
55
- .two-cols { padding: 0; width: 100%; line-height: 24px; }
56
- }
57
- .about-title { margin: 20px 0 5px 0; }
58
- hr { margin: 20px 0; }
59
- div.project-img { float: none; width: 100%; text-align: center; display: block; margin: 20px 0 0 0; }
60
- div.project-text { float: none; width: 100%; }
61
- .footer-headline { margin: 0; }
62
- }
63
-
11
+ html { font-size: 14px; }
12
+ }
64
13
 
14
+ /************************************************************************************
15
+ smaller than 600px
16
+ *************************************************************************************/
17
+ @media screen and (max-width: 600px) {
18
+ html { font-size: 12px; }
19
+ .article.small { width: 100%; max-width: 100%; }
65
20
  }
66
21
 
67
22
  /************************************************************************************
68
23
  smaller than 480px
69
24
  *************************************************************************************/
70
25
  @media screen and (max-width: 480px) {
71
- #footer {
72
- .footer-headline { font-size: 22px; }
73
- }
74
26
  }
@@ -39,6 +39,9 @@ $btn_active: $orange;
39
39
  }
40
40
 
41
41
  #navbar {
42
+ font-family: 'Cabin', sans-serif;
43
+ line-height: 1.5em;
44
+ font-size: 1.125em;
42
45
  height: 60px;
43
46
  background-color: $background;
44
47
  position: fixed;
@@ -1,3 +1,5 @@
1
+ $max-width: 960px;
2
+
1
3
  $darkgrey: #333;
2
4
  $lightgrey: #666;
3
5
  $orange: #e8581e;
@@ -10,54 +12,25 @@ $orange: #e8581e;
10
12
  -webkit-transition: all $x+s ease;
11
13
  }
12
14
 
13
-
14
- /*-----------------------------------------------------------*/
15
15
  /*-----------------------------------------------------------*/
16
16
  /*----------------------- 1. GENERAL ----------------------*/
17
17
  /*-----------------------------------------------------------*/
18
- /*-----------------------------------------------------------*/
19
18
 
20
- * { margin: 0; padding: 0; }
19
+ * {
20
+ margin: 0; padding: 0;
21
+ -webkit-box-sizing: border-box;
22
+ -moz-box-sizing: border-box;
23
+ box-sizing: border-box;
24
+ }
21
25
 
22
26
  body {
23
- font-family: 'Ubuntu';
24
- line-height: 1.5em;
25
- font-size: 1.125em;
26
- color: #555;
27
27
  height: 100%;
28
28
  background-color: #fff;
29
29
  }
30
30
 
31
- img, div { border: 0; }
32
-
33
- div { overflow: hidden; }
34
-
35
- p, h1 {
36
- width: 100%;
37
- display: block;
38
- min-width: 100%;
39
- }
40
-
41
- a, input[type=submit] {
42
- text-decoration: none;
43
- color:$darkgrey;
44
- @include addTransition(0.3);
45
-
46
- &:hover { color: $orange; }
47
- }
48
-
49
- i, em {
50
- font-family: 'UbuntuItalic';
51
- font-weight:normal;
52
- font-style:normal;
53
- }
54
-
55
- strong, b {
56
- font-family: 'UbuntuBold';
57
- font-weight:normal;
58
- font-style:normal;
59
- }
31
+ img, div { border: 0; display: block; }
60
32
 
33
+ div, header, footer { display: block; overflow: hidden; }
61
34
 
62
35
  img {
63
36
  max-width: 100%;
@@ -65,21 +38,22 @@ img {
65
38
  width: auto\9; /* ie8 */
66
39
  }
67
40
 
68
- ul {
69
- li { list-style-position:inside; }
41
+ a {
42
+ text-decoration: none;
43
+ color: $darkgrey;
44
+ @include addTransition(0.3);
45
+ &:hover { color: $orange; }
70
46
  }
71
47
 
72
- hr {
73
- background-color:#3d3d3d;
74
- height:1px;
75
- width: 100%;
76
- border:none;
77
- display: block;
78
- margin:30px 0px;
79
- }
48
+ i, em, strong, b { font-weight: normal; font-style: normal; }
49
+ i, em { font-family: 'UbuntuItalic'; }
50
+ strong, b { font-family: 'UbuntuBold'; }
51
+
52
+ ul li { list-style-position: inside; }
80
53
 
81
- .float-right { float:right; margin:15px 0px 5px 10px; }
54
+ hr { display: block; margin: 30px 0px; height: 1px; background-color: #3d3d3d; border:none; }
82
55
 
56
+ .float-right { float:right; margin: 15px 0 5px 10px; }
83
57
  .clearfix {
84
58
  zoom:1; /* For IE 6/7 (trigger hasLayout) */
85
59
  &:before, &:after { content: ""; display: table; }
@@ -87,27 +61,24 @@ hr {
87
61
  }
88
62
 
89
63
 
90
- /*-----------------------------------------------------------*/
91
64
  /*-----------------------------------------------------------*/
92
65
  /*------------------------ 2. HEADER ----------------------*/
93
66
  /*-----------------------------------------------------------*/
94
- /*-----------------------------------------------------------*/
95
67
 
96
68
  #topbar {
97
69
  color: #fff;
98
- width: 100%;
99
70
  font-size: 12px;
100
- padding: 2px 0px 2px 0px;
71
+ padding: 2px 0;
101
72
  background-color: #000;
102
- div { max-width: 960px; margin: 0 auto; }
73
+ div { max-width: $max-width; margin: 0 auto; }
103
74
  .right { float: right; }
104
75
  a { color: #aaa; }
105
76
  }
106
77
 
107
- #meta_content {
108
- margin: 0px auto;
109
- max-width: 920px;
110
- padding: 20px 20px;
78
+ header {
79
+ margin: 0 auto;
80
+ max-width: $max-width;
81
+ padding: 20px;
111
82
  font-family: 'Museo';
112
83
  font-size: 1.188em;
113
84
  border-bottom: 1px solid #e3e3e3;
@@ -131,256 +102,202 @@ hr {
131
102
  /*-----------------------------------------------------------*/
132
103
  /*-----------------------------------------------------------*/
133
104
 
134
- #pagewrap {
135
- width:auto;
136
- #content {
137
- #article_actions {
138
- div, form { display: inline-block; }
139
- }
140
- }
141
- }
142
-
143
- #content {
144
- max-width: 960px;
145
- margin: 0px auto;
146
- .two-cols {
147
- width: 42%;
148
- float: left;
149
- }
105
+ .container {
106
+ position: relative;
107
+ max-width: $max-width;
108
+ margin: 0 auto;
150
109
  }
151
110
 
152
- div.article_wrapper {
153
- border-top: 1px solid #ccc;
154
- border-bottom: none;
155
- padding: 30px 10px 0 10px;
156
- margin: 30px 10px 0 10px;
157
- }
111
+ .article {
112
+ max-width: $max-width;
113
+ padding: 10px 0 25px 0;
114
+ font-family: 'Ubuntu';
115
+ line-height: 1.5em;
116
+ font-size: 1.125em;
117
+ color: #555;
158
118
 
159
- div.article_header {
160
- text-align: center;
161
- padding: 0 15px;
162
119
 
163
- h1 {
164
- a {
165
- display:block;
166
- min-width:100%;
167
- }
120
+ .hero_image {
121
+ margin-top: 1.2em;
122
+ }
168
123
 
169
- &.title {
124
+ .article_header {
125
+ text-align: center;
126
+ padding: 0 15px;
127
+ h1 {
170
128
  font-family: 'Museo';
171
- font-weight:normal;
172
- color: $orange;
173
- font-size:1.8em;
174
- line-height:1.01em;
175
- margin:30px 0 10px 0;
176
- width:100%;
129
+ font-weight: normal;
130
+ font-size: 2.4em;
131
+ line-height: 1.01em;
177
132
  letter-spacing: -0.03em;
178
-
133
+ color: $orange;
134
+ margin: 30px 0 10px 0;
179
135
  a { color: $orange; }
180
- a:hover { color:$darkgrey; }
181
- }
182
- }
183
- }
184
-
185
- div.article {
186
- margin: 0 0 70px 0;
187
- max-width: 480px;
188
- float: left;
189
- .article_googleplus, div.article_footer, div.sub_title, .article_content { display:none; }
190
- .hero_image {
191
- margin: 20px 0 0 0;
192
- a {
193
- display: block;
194
- width: 480px;
195
- height: 270px;
196
- overflow: hidden;
197
- background-size: cover;
198
- background-position: center;
199
- img { width: 480px; opacity: 0; }
136
+ a:hover { color:$darkgrey; }
200
137
  }
201
- }
202
-
203
- .article_teaser {
204
- .more-link {
205
- margin:40px 20px 0px 20px;
138
+ h2 {
139
+ font-size: 1.333em;
140
+ color: #b4b4b4;
141
+ line-height: 1.1em;
142
+ letter-spacing: 0.05em;
143
+ margin: 0 0 25px 0;
144
+ }
145
+ .author_name {
146
+ font-size: 0.8em;
206
147
  text-transform: uppercase;
207
- letter-spacing: 0.06em;
208
- font-size:0.8em;
209
- a {
210
- background-color: #f4f4f4;
211
- padding:5px 10px;
212
- color: #4d4d4d;
213
- display:block;
214
- width:100%;
215
- text-align:center;
216
- &:hover { background-color: #e7e7e7; }
217
- }
218
148
  }
219
149
  }
220
150
 
221
-
222
- // FIRST AND SINGLE ARTICLE
223
-
224
- &.first {
225
- max-width: 960px;
226
- border-bottom: 1px solid #ccc;
227
- padding: 10px 0 25px 0;
228
-
229
- .article_googleplus, .article_footer, .article_content, div.article_teaser div.sub_title {
230
- display: block;
231
- }
232
-
151
+ .article_teaser {
152
+ padding: 0 10%;
153
+ margin: 30px auto;
233
154
  .more-link { display: none; }
234
-
235
- div.article_wrapper {
236
- border-bottom: 1px solid #ccc;
237
- padding: 30px 20px 30px 20px;
238
- margin: 30px 0px 25px 0px;
239
- }
240
-
241
- h1 { font-size: 2.4em; line-height: 1em; }
155
+ p { font-family: 'UbuntuBold'; }
156
+ }
242
157
 
243
- div.article_teaser p { font-family: 'UbuntuBold';}
158
+ .article_content {
159
+ line-height: 1.8em;
160
+ padding: 0 10%;
161
+ h1, h2, h3, h4, h5 { font-weight: normal; }
244
162
 
245
- div.article_content h1 {
163
+ h1 {
164
+ font-family: 'Museo';
246
165
  font-size: 1.3em;
247
- text-transform: uppercase;
248
- margin-bottom: 20px;
249
166
  color: $darkgrey;
167
+ text-transform: uppercase;
168
+ margin: 50px 0 10px 0;
250
169
  letter-spacing: 0.05em;
251
- font-family: 'Museo';
252
170
  }
253
171
 
254
- div.hero_image {
255
- a {
256
- width: 960px; height: auto;
257
- img { width: 960px; }
258
- }
172
+ h2 {
173
+ font-size: 1.333em;
174
+ margin: 40px 0 5px 0;
175
+ letter-spacing: 0.13em;
176
+ color: #b4b4b4;
177
+ text-transform: uppercase;
259
178
  }
260
- }
261
179
 
262
- }
180
+ h3 {
181
+ font-size: 1.111em;
182
+ font-family: 'UbuntuBold';
183
+ margin: 30px 0 0 0;
184
+ }
263
185
 
264
- div.sub_title {
265
- font-size: 1.333em;
266
- color: #b4b4b4;
267
- line-height: 1.1em;
268
- margin: 0 0 25px 0;
269
- letter-spacing: 0.05em;
270
- }
186
+ h4 {
187
+ font-size: 1em;
188
+ letter-spacing: 0.04em;
189
+ margin: 30px 0 5px 0;
190
+ text-transform: uppercase;
191
+ }
271
192
 
272
- div.author_name {
273
- font-size: 0.8em;
274
- text-transform: uppercase;
275
- }
193
+ h5 {
194
+ font-size: 1em;
195
+ font-family: 'UbuntuBold';
196
+ margin: 20px 0 0 0;
197
+ }
276
198
 
277
- div.article_content, div.article_teaser {
278
- line-height: 1.8em;
279
- padding: 0px 80px 0px 80px;
280
- h1, h2, h3, h4, h5 {
281
- font-weight: normal;
282
- }
283
- h1 {
284
- font-size: 1.556em;
285
- line-height: 1em;
286
- margin: 50px 0 10px 0;
287
- letter-spacing: 0.1em;
288
- }
289
- h2 {
290
- font-size: 1.333em;
291
- margin: 40px 0 5px 0;
292
- letter-spacing: 0.13em;
293
- color: #b4b4b4;
294
- text-transform: uppercase;
295
- }
296
- h3 {
297
- font-size: 1.111em;
298
- font-family: 'UbuntuBold';
299
- margin: 30px 0 0 0;
300
- }
301
- h4 {
302
- font-size: 1em;
303
- letter-spacing: 0.04em;
304
- margin: 30px 0 5px 0;
305
- text-transform: uppercase;
306
- }
307
- h5 {
308
- font-size: 1em;
309
- font-family: 'UbuntuBold';
310
- margin: 20px 0 0 0;
311
- }
312
- p {
313
- margin: 0 0 20px 0;
314
- width: 100%;
315
- min-width: 100%;
316
- display: block;
317
- }
318
- ul {
319
- margin-left: 10px;
320
- li { margin: 0 0 5px 0; }
321
- }
199
+ p {
200
+ margin: 0 0 20px 0;
201
+ display: block;
202
+ }
203
+
204
+ a { border-bottom: 1px solid #ccc; padding: 0 0 1px 0; }
322
205
 
323
- ol { margin-left: 30px; }
206
+ img { display: block; margin: 0 auto; }
207
+
208
+ ul, ol { margin-bottom: 20px; }
209
+ ul {
210
+ margin-left: 10px;
211
+ li { margin: 0 0 5px 0; }
212
+ }
324
213
 
325
- ul, ol { margin-bottom: 20px; }
214
+ blockquote {
215
+ font-family: 'BPmono';
216
+ font-size: 1.125em;
217
+ color:#999;
218
+ letter-spacing: -0.02em;
219
+ em { font-family: 'BPmonoItalic'; letter-spacing: -0.02em; }
220
+ strong { font-family: 'BPmonoBold'; }
221
+ }
222
+
223
+ pre {
224
+ font-size: 1.0em;
225
+ margin-bottom: 15px;
226
+ }
326
227
 
327
- pre {
328
- font-size: 1.0em;
329
- line-height: 1.5em;
330
- margin-bottom: 15px;
228
+ .highlight pre { margin: 0 0 30px 20px; padding: 10px; }
331
229
  }
332
230
 
333
- .highlight pre { margin: 0 0 30px 20px; padding: 10px; }
334
-
335
- blockquote {
336
- font-family: 'BPmono';
337
- font-size:18px;
338
- color:#999;
339
- padding-left:30px;
340
- line-height: 28px;
341
- letter-spacing: -0.02em;
342
- em { font-family: 'BPmonoItalic'; letter-spacing: -0.02em; }
343
- strong { font-family: 'BPmonoBold'; }
231
+ .article_footer {
232
+ border-top: 1px solid #ccc;
233
+ border-bottom: 1px solid #ccc;
234
+ text-align: center;
235
+ color: #808080;
236
+ font-size: 0.8em;
237
+ padding: 1.1em;
238
+ a { color: $orange; }
239
+ a:hover { color: $darkgrey; }
240
+ }
241
+
242
+ .article_googleplus {
243
+ border-top: 1px solid #ccc;
244
+ padding: 1.1em;
245
+ font-size: 1.5em;
246
+ min-height: 40px;
247
+ line-height: 40px;
248
+ text-align: center;
249
+ a {
250
+ margin: 0 auto;
251
+ display: inline-block;
252
+ color: $lightgrey;
253
+ &:hover { color: $darkgrey; }
254
+ }
255
+ span {
256
+ background: url('/assets/ic_googleplus.png') 0px 0px no-repeat;
257
+ height: 40px;
258
+ width: 40px;
259
+ line-height: 40px;
260
+ display: inline-block;
261
+ float: left;
262
+ margin: 0 15px 0 0;
263
+ }
344
264
  }
345
265
 
346
- a { border-bottom: 1px solid #ccc; padding: 0 0 1px 0; }
347
266
 
348
- img { display: block; margin: 0 auto; }
267
+ &.small {
268
+ max-width: 50%;
269
+ float: left;
270
+ .article_header {
271
+ h1 { font-size: 1.8em; }
272
+ h2 { display: none; }
273
+ }
274
+ .article_teaser {
275
+ p { font-family: 'Ubuntu'; }
276
+ .more-link {
277
+ display: block;
278
+ margin:40px auto 0 auto;
279
+ text-align: center;
280
+ a {
281
+ display: inline-block;
282
+ text-transform: uppercase;
283
+ letter-spacing: 0.06em;
284
+ font-size:0.8em;
285
+ background-color: #f4f4f4;
286
+ padding:5px 10px;
287
+ color: #4d4d4d;
288
+ display:block;
289
+ width:100%;
290
+ text-align:center;
291
+ &:hover { background-color: #e7e7e7; }
292
+ }
293
+ }
294
+ }
295
+ .article_googleplus, .article_footer, .article_content { display:none; }
296
+ }
349
297
 
350
298
  }
351
299
 
352
- div.article_footer {
353
- text-align: center;
354
- color: #808080;
355
- font-size: 0.8em;
356
- padding: 0px 80px;
357
- a { color: $orange; }
358
- a:hover { color: $darkgrey; }
359
- }
360
300
 
361
- div.article_googleplus {
362
- border-bottom: 1px solid #ccc;
363
- padding: 0px 20px 20px 20px;
364
- font-size: 1.500em;
365
- min-height: 40px;
366
- line-height: 40px;
367
- text-align: center;
368
- a {
369
- color: $lightgrey;
370
- margin: 0px auto 0px auto;
371
- display: inline-block;
372
- &:hover { color: $darkgrey; }
373
- }
374
- span {
375
- background: url('/assets/ic_googleplus.png') 0px 0px no-repeat;
376
- height: 40px;
377
- width: 40px;
378
- line-height: 40px;
379
- display: inline-block;
380
- float: left;
381
- margin: 0 15px 0 0;
382
- }
383
- }
384
301
 
385
302
  #pagination {
386
303
  display: block;
@@ -429,99 +346,53 @@ div.article_googleplus {
429
346
  /*-----------------------------------------------------------*/
430
347
  /*-----------------------------------------------------------*/
431
348
 
432
- #footer {
349
+ footer, #footer {
433
350
  background-color: #f4f4f4;
434
- margin:50px 0 0 0;
435
- padding:50px 0px;
436
-
437
- #footer_content {
438
- margin:0px auto;
439
- max-width:960px;
440
- color:#999;
441
- font-size:0.85em;
351
+ margin: 50px 0 0 0;
352
+ padding: 30px 0;
353
+
354
+ .container {
355
+ margin: 0 auto;
356
+ max-width: $max-width;
357
+ color: #999;
358
+ font-size: 0.85em;
442
359
  font-family: 'UbuntuLight';
443
- }
444
- .footer-headline {
445
- display: block;
446
- text-align: center;
447
- font-size:29px;
448
- text-transform: uppercase;
449
- font-family: 'MuseoLight';
450
- letter-spacing: 0.03em;
451
- margin:0 0 40px 0;
452
- }
453
-
454
- a {
455
- font-family: 'UbuntuItalic';
456
- &:hover { color: $darkgrey; }
360
+ .row {
361
+ text-align: left;
362
+ width: 100%;
363
+ .two-cols {
364
+ padding: 0 20px;
365
+ width: 50%;
366
+ line-height:24px;
367
+ float: left;
368
+ &:first-child {
369
+ margin-right: 0;
370
+ }
371
+ }
372
+ }
457
373
  }
458
374
 
459
375
  hr { background-color:#ccc; margin:40px 0px; }
460
376
 
461
- .row.about {
462
- text-align: left;
463
- .two-cols {
464
- padding:0px 20px;
465
- width:380px;
466
- line-height:24px;
467
- }
468
- }
469
-
470
377
  h2, h2 a {
471
- display:block;
378
+ margin-top: 20px;
472
379
  text-transform: uppercase;
473
380
  font-family: 'MuseoLight';
474
- font-size:22px;
475
- margin:0 0 10px 0px;
476
- letter-spacing: 0.03em;
381
+ font-size: 1.2em;
477
382
  font-weight: normal;
383
+ letter-spacing: 0.03em;
478
384
  }
479
385
 
480
- h5 {
481
- font-size:30px;
482
- color: $darkgrey;
483
- font-weight: normal;
484
- margin:0 0 10px 0;
485
- a { color: $darkgrey; }
486
- }
487
386
 
488
387
  span.label {
489
388
  text-transform: uppercase;
490
389
  font-size:13px;
491
390
  color:#c0bfbf;
492
391
  }
493
- .projects { color:#747474; }
494
- .project-title {
495
- font-family: 'Museo';
496
- color: $darkgrey;
497
- display:block;
498
- font-size:33px;
499
- margin:3px 0px 15px 0px;
500
- }
501
392
  .weekday {
502
- display: block;
503
393
  font-family: 'MuseoLight';
504
394
  color: $darkgrey;
505
395
  }
506
- a {
507
- color:#999;
508
- &:hover { color: $orange; }
509
- &.twitter:hover { color: #0dc0ed; }
510
- &.gplus:hover { color: #dd3b30; }
511
- }
512
- .float-left { float:left; display: table-cell; }
513
- div.project-img {
514
- float:left;
515
- width:140px;
516
- text-align: center;
517
- padding:25px 0 0 0;
518
- }
519
- div.project-text { float:left; width:290px; }
520
-
521
- .two-cols { max-width:430px; float:left; }
522
- .four-cols { max-width:230px; float:left; }
523
- .margin-2cols { margin-right: 8%; }
524
- .margin-4cols { margin-right:30px; }
525
396
 
526
397
  #copyright {
527
398
  text-align:center;
@@ -1,33 +1,34 @@
1
1
  <!doctype html>
2
2
  <html>
3
- <head>
4
- <meta charset="utf-8">
5
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
6
- <title><%= content_for?(:title) ? yield(:title) : "Lines" %></title>
7
- <meta name="description" content="">
8
- <meta name="author" content="">
9
- <%= stylesheet_link_tag "lines/admin", media: "all" %>
10
- <%= javascript_include_tag "lines/admin" %>
11
- <%= csrf_meta_tags %>
12
- <%= yield(:head) %>
13
- </head>
14
- <body>
15
- <%#= render 'shared/navigation' %>
3
+ <head>
4
+ <meta charset="utf-8">
5
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
6
+ <title><%= content_for?(:title) ? yield(:title) : "Lines" %></title>
7
+ <meta name="description" content="">
8
+ <meta name="author" content="">
9
+ <%= stylesheet_link_tag "lines/admin", media: "all" %>
10
+ <%= javascript_include_tag "lines/admin" %>
11
+ <%= csrf_meta_tags %>
12
+ <%= yield(:head) %>
13
+ </head>
14
+ <body>
15
+ <%#= render 'shared/navigation' %>
16
16
 
17
- <div id="main" role="main">
18
- <div class="container">
19
- <div class="content">
20
- <div class="row">
21
- <div class="span12">
22
- <div class="spacer"></div>
23
- <%= render 'layouts/lines/messages' %>
24
- <%= yield %>
25
- </div>
26
- </div>
27
- <footer>
28
- </footer>
17
+ <div id="main" role="main">
18
+ <div class="container">
19
+ <div class="content">
20
+ <div class="row">
21
+ <div class="span12">
22
+ <div class="spacer"></div>
23
+ <%= render 'layouts/lines/messages' %>
24
+ <%= yield %>
29
25
  </div>
30
- </div> <!--! end of .container -->
31
- </div> <!--! end of #main -->
32
- </body>
26
+ </div>
27
+ <footer>
28
+ </footer>
29
+ </div>
30
+ </div> <!--! end of .container -->
31
+ </div> <!--! end of #main -->
32
+
33
+ </body>
33
34
  </html>
@@ -21,25 +21,21 @@
21
21
  <%= render_navbar { "" } %>
22
22
  <div class="spacer"></div>
23
23
  <% end %>
24
- <div id="pagewrap">
25
- <a id="top"></a>
26
- <div id="meta">
27
- <div id="meta_content">
28
- <div id="logo">
29
- <a href="/"><img src="<%= CONFIG[:logo] %>" alt="Logo Lines" /></a>
30
- </div>
31
- <div id="lines">
32
- <%= CONFIG[:short_description] %>
33
- </div>
34
- </div>
35
- </div>
36
24
 
37
- <div id="content">
38
- <%= yield %>
25
+ <header>
26
+ <div id="logo">
27
+ <a href="/"><img src="<%= CONFIG[:logo] %>" alt="Logo Lines" /></a>
39
28
  </div>
29
+ <div id="lines">
30
+ <%= CONFIG[:short_description] %>
31
+ </div>
32
+ </header>
40
33
 
41
- <%= render 'lines/shared/footer' %>
42
-
34
+ <div class="container">
35
+ <%= yield %>
43
36
  </div>
37
+
38
+ <%= render 'lines/shared/footer' %>
39
+
44
40
  </body>
45
41
  </html>
@@ -7,10 +7,8 @@
7
7
  <%= javascript_include_tag "lines/application" %>
8
8
  </head>
9
9
  <body>
10
- <div id="pagewrap">
11
- <div id="content">
12
- <%= yield %>
13
- </div>
10
+ <div class="container">
11
+ <%= yield %>
14
12
  </div>
15
13
  </body>
16
14
  </html>
@@ -1,5 +1,5 @@
1
- <div class="article<%= (article_counter < 0) ? " first":"" %>">
2
- <%#= raise article.image_url.inspect %>
1
+ <div class="article <%= (article_counter < 0) ? 'first' : 'small' %>">
2
+
3
3
  <% cache article do %>
4
4
 
5
5
  <div class="hero_image">
@@ -9,36 +9,30 @@
9
9
  </div>
10
10
 
11
11
  <div class="article_header">
12
- <h1 class="title"><%= link_to article.title, article_path(article) %></h1>
13
- <div class="sub_title"><%= article.sub_title %></div>
12
+ <h1><%= link_to article.title, article_path(article) %></h1>
13
+ <h2><%= article.sub_title %></h2>
14
14
  <div class="author_name"><span>by</span> <%= display_article_authors(article) %></div>
15
15
  </div>
16
16
 
17
- <div class="article_wrapper">
18
-
19
- <div class="article_teaser">
20
- <% if article_counter == -1 %>
21
- <% teaser = article.teaser.present? ? markdown(article.teaser) : nil %>
22
- <% else %>
23
- <% teaser = article.teaser.present? ? format_code(article.teaser) : format_code(article.content) %>
24
- <% end %>
25
- <%= teaser %>
26
- <div class="more-link">
27
- <%= link_to "Read full article", article_path(article) %>
28
- </div>
17
+ <div class="article_teaser">
18
+ <% if article_counter == -1 %>
19
+ <% teaser = article.teaser.present? ? markdown(article.teaser) : nil %>
20
+ <% else %>
21
+ <% teaser = article.teaser.present? ? format_code(article.teaser) : format_code(article.content) %>
22
+ <% end %>
23
+ <%= teaser %>
24
+ <div class="more-link">
25
+ <%= link_to "Read full article", article_path(article) %>
29
26
  </div>
27
+ </div>
30
28
 
31
-
32
- <div class="article_content">
33
- <%= markdown article.content %>
34
- <% if article.document? %>
35
- <div class="article_document">
36
- <%= link_to "Download #{article.document.file.filename}", article.document_url %>
37
- </div>
38
- <% end %>
29
+ <div class="article_content">
30
+ <%= markdown article.content %>
31
+ <% if article.document? %>
32
+ <div class="article_document">
33
+ <%= link_to "Download #{article.document.file.filename}", article.document_url %>
39
34
  </div>
40
-
41
-
35
+ <% end %>
42
36
  </div>
43
37
 
44
38
  <% unless article.gplus_url.blank? %>
@@ -1,8 +1,8 @@
1
- <div id="footer">
2
- <div id="footer_content">
1
+ <footer id="footer">
2
+ <div class="container">
3
3
 
4
- <div class="row about">
5
- <div class="two-cols margin-2cols">
4
+ <div class="row">
5
+ <div class="two-cols">
6
6
  <h2><a href="http://lines.opoloo.com">Lines ...</a></h2>
7
7
  <p>offers a solid starting point for Rails- and web-developers that want to cut the crap and focus on their content, with the freedom of full OSS access. You could start here by telling your readers what your blog aims at doing.</p>
8
8
  </div>
@@ -29,4 +29,4 @@
29
29
  </div>
30
30
 
31
31
  </div>
32
- </div>
32
+ </footer>
@@ -14,10 +14,11 @@ module Lines
14
14
 
15
15
  def copy_stylesheets
16
16
  FileUtils.mkdir_p "app/assets/stylesheets/lines"
17
- copy_file "../../../app/assets/stylesheets/lines/style.css.scss", "app/assets/stylesheets/lines/style.css.scss"
18
- copy_file "../../../app/assets/stylesheets/lines/media_queries.css.scss", "app/assets/stylesheets/lines/media_queries.css.scss"
17
+ copy_file "../../../app/assets/stylesheets/lines/style.css.scss", "app/assets/stylesheets/lines/style.css.scss"
18
+ copy_file "../../../app/assets/stylesheets/lines/fonts.css.scss", "app/assets/stylesheets/lines/fonts.css.scss"
19
+ copy_file "../../../app/assets/stylesheets/lines/media_queries.css.scss", "app/assets/stylesheets/lines/media_queries.css.scss"
19
20
  copy_file "../../../app/assets/stylesheets/lines/navbar.css.scss", "app/assets/stylesheets/lines/navbar.css.scss"
20
- copy_file "../../../app/assets/stylesheets/lines/pygments.css.erb", "app/assets/stylesheets/lines/pygments.css.erb"
21
+ copy_file "../../../app/assets/stylesheets/lines/pygments.css.erb", "app/assets/stylesheets/lines/pygments.css.erb"
21
22
  end
22
23
 
23
24
  def copy_views
data/lib/lines/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Lines
2
- VERSION = "0.2"
2
+ VERSION = "0.3"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lines-engine
3
3
  version: !ruby/object:Gem::Version
4
- version: '0.2'
4
+ version: '0.3'
5
5
  platform: ruby
6
6
  authors:
7
7
  - Opoloo GbR
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-29 00:00:00.000000000 Z
11
+ date: 2014-11-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: orm_adapter