diff options
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/main/comments.coffee | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/main/entries.scss | 71 | ||||
-rw-r--r-- | app/assets/stylesheets/main/layout.scss | 51 |
3 files changed, 100 insertions, 23 deletions
diff --git a/app/assets/javascripts/main/comments.coffee b/app/assets/javascripts/main/comments.coffee index d33e200..08aa794 100644 --- a/app/assets/javascripts/main/comments.coffee +++ b/app/assets/javascripts/main/comments.coffee | |||
@@ -10,5 +10,4 @@ comments_ready = -> | |||
10 | $("#comment-reply-msg").hide() | 10 | $("#comment-reply-msg").hide() |
11 | return false | 11 | return false |
12 | 12 | ||
13 | $(document).ready(comments_ready) | ||
14 | $(document).on('turbolinks:load', comments_ready) | 13 | $(document).on('turbolinks:load', comments_ready) |
diff --git a/app/assets/stylesheets/main/entries.scss b/app/assets/stylesheets/main/entries.scss index 37b0a49..d67ae67 100644 --- a/app/assets/stylesheets/main/entries.scss +++ b/app/assets/stylesheets/main/entries.scss | |||
@@ -3,9 +3,9 @@ | |||
3 | // You can use Sass (SCSS) here: http://sass-lang.com/ | 3 | // You can use Sass (SCSS) here: http://sass-lang.com/ |
4 | 4 | ||
5 | .blog-post { | 5 | .blog-post { |
6 | font-size: 16px; | 6 | line-height: 1.5em; |
7 | line-height: 24px; | ||
8 | margin: 0 1em 1em; | 7 | margin: 0 1em 1em; |
8 | clear: both; | ||
9 | 9 | ||
10 | .blog-title { | 10 | .blog-title { |
11 | flex-grow: 1; | 11 | flex-grow: 1; |
@@ -41,6 +41,7 @@ | |||
41 | .post-calendar { | 41 | .post-calendar { |
42 | width: 45px; | 42 | width: 45px; |
43 | height: 49px; | 43 | height: 49px; |
44 | flex-shrink: 0; | ||
44 | 45 | ||
45 | &.post-date-1 { | 46 | &.post-date-1 { |
46 | background: image-url("date-bg-1.gif") no-repeat; | 47 | background: image-url("date-bg-1.gif") no-repeat; |
@@ -152,7 +153,6 @@ | |||
152 | 153 | ||
153 | .update-posted { | 154 | .update-posted { |
154 | display: block; | 155 | display: block; |
155 | font-style: italic; | ||
156 | background-color: #EAADEA; | 156 | background-color: #EAADEA; |
157 | font-size: 16px; | 157 | font-size: 16px; |
158 | margin: .5em -20px; | 158 | margin: .5em -20px; |
@@ -160,6 +160,16 @@ | |||
160 | border-width: 1px 0 1px 0; | 160 | border-width: 1px 0 1px 0; |
161 | border-style: solid; | 161 | border-style: solid; |
162 | border-color: #DB70DB; | 162 | border-color: #DB70DB; |
163 | |||
164 | time { | ||
165 | font-style: italic; | ||
166 | } | ||
167 | |||
168 | .update-edit-link { | ||
169 | float: right; | ||
170 | color: blue; | ||
171 | font-weight: normal; | ||
172 | } | ||
163 | } | 173 | } |
164 | } | 174 | } |
165 | } | 175 | } |
@@ -194,6 +204,14 @@ | |||
194 | box-sizing: border-box; | 204 | box-sizing: border-box; |
195 | } | 205 | } |
196 | 206 | ||
207 | video { | ||
208 | max-width: 100%; | ||
209 | } | ||
210 | |||
211 | iframe { | ||
212 | max-width: 100%; | ||
213 | } | ||
214 | |||
197 | figure { | 215 | figure { |
198 | background-color: #eee; | 216 | background-color: #eee; |
199 | border: 1px solid #bbb; | 217 | border: 1px solid #bbb; |
@@ -201,6 +219,10 @@ | |||
201 | font-size: 0.75em; | 219 | font-size: 0.75em; |
202 | line-height: 24px; | 220 | line-height: 24px; |
203 | 221 | ||
222 | @media only screen and (max-width: 767px) { | ||
223 | margin: 0; | ||
224 | } | ||
225 | |||
204 | img { | 226 | img { |
205 | display: block; | 227 | display: block; |
206 | border: 1px solid #bbb; | 228 | border: 1px solid #bbb; |
@@ -450,3 +472,46 @@ | |||
450 | .next-post { | 472 | .next-post { |
451 | float: right; | 473 | float: right; |
452 | } | 474 | } |
475 | |||
476 | #streams-index { | ||
477 | width: 100%; | ||
478 | border-collapse: collapse; | ||
479 | |||
480 | #streams-index-header-row { | ||
481 | th { | ||
482 | background-color: #bdbdbd; | ||
483 | padding-left: 0.5em; | ||
484 | border-top: 1px solid #848484; | ||
485 | border-bottom: 1px solid #848484; | ||
486 | } | ||
487 | } | ||
488 | |||
489 | th { | ||
490 | padding-bottom: 0.5em; | ||
491 | padding-top: 0.5em; | ||
492 | text-align: left; | ||
493 | } | ||
494 | |||
495 | td { | ||
496 | padding-top: 1em; | ||
497 | padding-left: 0.5em; | ||
498 | |||
499 | time { | ||
500 | font-size: .75em; | ||
501 | } | ||
502 | |||
503 | .stream-link { | ||
504 | font-weight: bold; | ||
505 | text-decoration: none; | ||
506 | |||
507 | &, &:visited { | ||
508 | color: #ee2c2c; | ||
509 | } | ||
510 | |||
511 | &:hover { | ||
512 | text-decoration: underline; | ||
513 | color: #9ea1ad; | ||
514 | } | ||
515 | } | ||
516 | } | ||
517 | } | ||
diff --git a/app/assets/stylesheets/main/layout.scss b/app/assets/stylesheets/main/layout.scss index 5f5d0e6..ef31ada 100644 --- a/app/assets/stylesheets/main/layout.scss +++ b/app/assets/stylesheets/main/layout.scss | |||
@@ -1,42 +1,47 @@ | |||
1 | body#main-body { | 1 | body#main-body { |
2 | height: 100%; | 2 | height: 100%; |
3 | font-family: sans-serif; | 3 | font-family: sans-serif; |
4 | font-size: 16px; | ||
4 | } | 5 | } |
5 | 6 | ||
6 | #container { | 7 | #container { |
7 | height: 100%; | 8 | height: 100%; |
8 | margin: 10px auto; | ||
9 | width: 75%; /* 66% */ | ||
10 | box-sizing: border-box; | 9 | box-sizing: border-box; |
11 | min-width: 910px; | 10 | |
11 | @media only screen and (min-width: 768px) { | ||
12 | margin: 10px auto; | ||
13 | width: 75%; /* 66% */ | ||
14 | min-width: 910px; | ||
15 | } | ||
12 | } | 16 | } |
13 | 17 | ||
14 | #banner { | 18 | #banner { |
15 | background-image: image-url("fourisland_header.png"); | ||
16 | width: 900px; | ||
17 | height: 200px; | ||
18 | margin: 0 auto; | 19 | margin: 0 auto; |
19 | 20 | ||
20 | h1 { | 21 | h1 { |
21 | margin: 0; | 22 | display: none; |
23 | } | ||
22 | 24 | ||
23 | a { | 25 | img { |
24 | display: block; | 26 | width: 100%; |
25 | width: 900px; | 27 | max-width: 900px; |
26 | height: 200px; | 28 | display: block; |
27 | text-indent: -5000px; | 29 | margin: 0 auto; |
28 | text-decoration: none; | ||
29 | margin: 0; | ||
30 | } | ||
31 | } | 30 | } |
32 | } | 31 | } |
33 | 32 | ||
34 | #page-body { | 33 | #page-body { |
35 | display: flex; | 34 | display: flex; |
35 | |||
36 | @media only screen and (max-width: 767px) { | ||
37 | flex-direction: column-reverse; | ||
38 | } | ||
36 | } | 39 | } |
37 | 40 | ||
38 | #main { | 41 | #main { |
39 | width: 70%; | 42 | @media only screen and (min-width: 768px) { |
43 | width: 70%; | ||
44 | } | ||
40 | } | 45 | } |
41 | 46 | ||
42 | #content { | 47 | #content { |
@@ -48,7 +53,8 @@ body#main-body { | |||
48 | width: 100%; | 53 | width: 100%; |
49 | text-align: center; | 54 | text-align: center; |
50 | padding: .25em; | 55 | padding: .25em; |
51 | font-weight: bold | 56 | font-weight: bold; |
57 | box-sizing: border-box; | ||
52 | } | 58 | } |
53 | 59 | ||
54 | .flash-notice { | 60 | .flash-notice { |
@@ -61,15 +67,22 @@ body#main-body { | |||
61 | 67 | ||
62 | #sidebar { | 68 | #sidebar { |
63 | box-sizing: border-box; | 69 | box-sizing: border-box; |
64 | width: 30%; | ||
65 | font-size: .75em; | 70 | font-size: .75em; |
66 | color: black; | 71 | color: black; |
67 | margin-top: 1em; | 72 | margin-top: 1em; |
68 | margin-bottom: 2em; | 73 | margin-bottom: 2em; |
69 | font-family: sans-serif; | 74 | font-family: sans-serif; |
75 | |||
76 | @media only screen and (max-width: 767px) { | ||
77 | width: 100%; | ||
78 | } | ||
79 | |||
80 | @media only screen and (min-width: 768px) { | ||
81 | width: 30%; | ||
82 | } | ||
70 | } | 83 | } |
71 | 84 | ||
72 | #sidebar h2 { | 85 | #sidebar h2, #mobile-header h2 { |
73 | font-size: 1em; | 86 | font-size: 1em; |
74 | } | 87 | } |
75 | 88 | ||