diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-07-03 13:58:57 -0400 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-07-03 14:01:41 -0400 |
commit | 8e15dbd73035c2a2198a2828a20ddcebe0739823 (patch) | |
tree | f93ada8d2c3c06e8cf1908bf5b0e22b1b54dd956 /app/assets/stylesheets | |
parent | 49b11f2864f75bcfb8d0d01439939ed68aa90b8f (diff) | |
download | thoughts-8e15dbd73035c2a2198a2828a20ddcebe0739823.tar.gz thoughts-8e15dbd73035c2a2198a2828a20ddcebe0739823.tar.bz2 thoughts-8e15dbd73035c2a2198a2828a20ddcebe0739823.zip |
Implemented streams
Currently there are no links to the pages for editing stream updates, and the admin panel for managing streams could probably have a better look & feel, but here's some basic working functionality. refs #8
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/admin/layout.scss | 14 | ||||
-rw-r--r-- | app/assets/stylesheets/main/entries.scss | 105 | ||||
-rw-r--r-- | app/assets/stylesheets/main/records.scss | 4 |
3 files changed, 86 insertions, 37 deletions
diff --git a/app/assets/stylesheets/admin/layout.scss b/app/assets/stylesheets/admin/layout.scss index bbe5383..6645709 100644 --- a/app/assets/stylesheets/admin/layout.scss +++ b/app/assets/stylesheets/admin/layout.scss | |||
@@ -80,7 +80,7 @@ body { | |||
80 | background-color: #eee; | 80 | background-color: #eee; |
81 | } | 81 | } |
82 | 82 | ||
83 | #blog-form { | 83 | #entry-form { |
84 | display: flex; | 84 | display: flex; |
85 | 85 | ||
86 | fieldset { | 86 | fieldset { |
@@ -163,6 +163,18 @@ body { | |||
163 | td { | 163 | td { |
164 | padding: .25em; | 164 | padding: .25em; |
165 | } | 165 | } |
166 | |||
167 | .admin-actions { | ||
168 | margin: 0; | ||
169 | |||
170 | li { | ||
171 | display: inline; | ||
172 | |||
173 | &+li:before { | ||
174 | content: " - "; | ||
175 | } | ||
176 | } | ||
177 | } | ||
166 | } | 178 | } |
167 | 179 | ||
168 | .details-module { | 180 | .details-module { |
diff --git a/app/assets/stylesheets/main/entries.scss b/app/assets/stylesheets/main/entries.scss index bd0b5ba..b2a07c5 100644 --- a/app/assets/stylesheets/main/entries.scss +++ b/app/assets/stylesheets/main/entries.scss | |||
@@ -26,54 +26,87 @@ | |||
26 | margin-bottom: 0; | 26 | margin-bottom: 0; |
27 | font-weight: normal; | 27 | font-weight: normal; |
28 | } | 28 | } |
29 | } | ||
29 | 30 | ||
30 | #blog-content { | 31 | #stream-post { |
31 | hyphens: auto; | 32 | h2 { |
32 | word-wrap: break-word; | 33 | background-color: #98FB98; |
34 | display: block; | ||
35 | font-size: 20px; | ||
33 | font-family: 'Roboto', sans-serif; | 36 | font-family: 'Roboto', sans-serif; |
34 | text-align: justify; | 37 | padding: 0.5em 20px; |
38 | border-top: 1px solid #7BCC70; | ||
39 | border-bottom: 1px solid #7BCC70; | ||
40 | } | ||
35 | 41 | ||
36 | a { | 42 | #stream-intro { |
37 | text-decoration: none; | 43 | font-size: 16px; |
38 | font-weight: bold; | 44 | margin: 0 20px; |
45 | } | ||
39 | 46 | ||
40 | &, &:visited { | 47 | .stream-update { |
41 | color: #ee2c2c; | 48 | font-size: 16px; |
42 | } | 49 | padding: 0 20px; |
50 | border-top: 1px solid #DEDEDE; | ||
43 | 51 | ||
44 | &:hover { | 52 | .update-posted { |
45 | text-decoration: underline; | 53 | display: block; |
46 | color: #9ea1ad; | 54 | font-style: italic; |
47 | } | 55 | text-align: right; |
56 | color: #989898; | ||
57 | font-size: 14px; | ||
58 | margin-top: .5em; | ||
48 | } | 59 | } |
60 | } | ||
61 | } | ||
62 | |||
63 | .entry-content { | ||
64 | hyphens: auto; | ||
65 | word-wrap: break-word; | ||
66 | text-align: justify; | ||
67 | font-family: 'Roboto', sans-serif; | ||
68 | |||
69 | a { | ||
70 | text-decoration: none; | ||
71 | font-weight: bold; | ||
49 | 72 | ||
50 | li { | 73 | &, &:visited { |
51 | & + li { | 74 | color: #ee2c2c; |
52 | margin-top: 1em; | ||
53 | } | ||
54 | } | 75 | } |
55 | 76 | ||
56 | img { | 77 | &:hover { |
57 | max-width: 100%; | 78 | text-decoration: underline; |
58 | box-sizing: border-box; | 79 | color: #9ea1ad; |
59 | } | 80 | } |
81 | } | ||
60 | 82 | ||
61 | figure { | 83 | li { |
62 | background-color: #eee; | 84 | & + li { |
85 | margin-top: 1em; | ||
86 | } | ||
87 | } | ||
88 | |||
89 | img { | ||
90 | max-width: 100%; | ||
91 | box-sizing: border-box; | ||
92 | } | ||
93 | |||
94 | figure { | ||
95 | background-color: #eee; | ||
96 | border: 1px solid #bbb; | ||
97 | padding: 0.25em 0.25em 0 0.25em; | ||
98 | font-size: 0.75em; | ||
99 | line-height: 24px; | ||
100 | |||
101 | img { | ||
102 | display: block; | ||
63 | border: 1px solid #bbb; | 103 | border: 1px solid #bbb; |
64 | padding: 0.25em 0.25em 0 0.25em; | 104 | } |
65 | font-size: 0.75em; | 105 | |
66 | 106 | figcaption { | |
67 | img { | 107 | font-style: italic; |
68 | display: block; | 108 | text-align: center; |
69 | border: 1px solid #bbb; | 109 | margin: 0.25em; |
70 | } | ||
71 | |||
72 | figcaption { | ||
73 | font-style: italic; | ||
74 | text-align: center; | ||
75 | margin: 0.25em; | ||
76 | } | ||
77 | } | 110 | } |
78 | } | 111 | } |
79 | } | 112 | } |
diff --git a/app/assets/stylesheets/main/records.scss b/app/assets/stylesheets/main/records.scss index dd4eac1..f57dded 100644 --- a/app/assets/stylesheets/main/records.scss +++ b/app/assets/stylesheets/main/records.scss | |||
@@ -52,6 +52,10 @@ | |||
52 | &.entry-type-blog { | 52 | &.entry-type-blog { |
53 | background-color: #90fefb; | 53 | background-color: #90fefb; |
54 | } | 54 | } |
55 | |||
56 | &.entry-type-stream, &.entry-type-update { | ||
57 | background-color: #98FB98; | ||
58 | } | ||
55 | } | 59 | } |
56 | 60 | ||
57 | & + li { | 61 | & + li { |