diff options
author | Thomas Citharel <tcit@tcit.fr> | 2017-05-31 14:34:46 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2017-05-31 14:34:46 +0200 |
commit | 91775f36fee13c5e1fd77abf27555e6c77fa93da (patch) | |
tree | 0ed3959b844fc627a86c5d14514d0eaf64a2e205 /app/Resources/static | |
parent | 812c980fa5ea03b9282e32a93723e459eee763a3 (diff) | |
download | wallabag-91775f36fee13c5e1fd77abf27555e6c77fa93da.tar.gz wallabag-91775f36fee13c5e1fd77abf27555e6c77fa93da.tar.zst wallabag-91775f36fee13c5e1fd77abf27555e6c77fa93da.zip |
Add some flex magic
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Diffstat (limited to 'app/Resources/static')
-rw-r--r-- | app/Resources/static/themes/material/css/cards.scss | 61 | ||||
-rw-r--r-- | app/Resources/static/themes/material/css/various.scss | 20 |
2 files changed, 47 insertions, 34 deletions
diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 1e0155c3..596d0a59 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss | |||
@@ -175,30 +175,63 @@ a.original:not(.waves-effect) { | |||
175 | } | 175 | } |
176 | 176 | ||
177 | .card-stacked { | 177 | .card-stacked { |
178 | &:hover ul.tools-list { | 178 | display: flex; |
179 | display: block; | 179 | flex-flow: row wrap; |
180 | } | ||
181 | 180 | ||
182 | ul.tools-list { | 181 | &:hover ul.tools-list { |
183 | display: none; | 182 | display: inline; |
183 | text-align: right; | ||
184 | } | 184 | } |
185 | 185 | ||
186 | .preview { | 186 | .preview { |
187 | float: left; | 187 | max-width: 100px; |
188 | width: 90px; | 188 | height: auto; |
189 | height: 50px; | 189 | margin-right: 10px; |
190 | flex: 1; | ||
190 | 191 | ||
191 | img { | 192 | img { |
192 | max-height: 50px; | 193 | max-width: 100%; |
193 | padding-right: 10px; | 194 | max-height: 100%; |
194 | width: 80px; | 195 | } |
196 | } | ||
197 | |||
198 | div.metadata { | ||
199 | .chip { | ||
200 | background-color: $blueAccentColor; | ||
201 | padding: 0 15px 0 10px; | ||
202 | margin: auto 2px; | ||
203 | |||
204 | a, | ||
205 | i { | ||
206 | color: #fff; | ||
207 | } | ||
208 | |||
209 | i.material-icons { | ||
210 | float: right; | ||
211 | font-size: 20px; | ||
212 | line-height: 32px; | ||
213 | padding-left: 8px; | ||
214 | } | ||
195 | } | 215 | } |
196 | } | 216 | } |
197 | 217 | ||
198 | .domain, | 218 | div.card-content { |
199 | .footer { | 219 | flex: 4; |
200 | font-size: 12px; | ||
201 | } | 220 | } |
221 | |||
222 | ul.tools-list { | ||
223 | flex: 1; | ||
224 | display: none; | ||
225 | flex-basis: 5em; | ||
226 | align-self: flex-end; | ||
227 | float: right; | ||
228 | max-width: 6em; | ||
229 | } | ||
230 | } | ||
231 | |||
232 | #content .collection .collection-item { | ||
233 | min-height: 65px; | ||
234 | height: auto; | ||
202 | } | 235 | } |
203 | 236 | ||
204 | .quickstart .card .card-action a, | 237 | .quickstart .card .card-action a, |
diff --git a/app/Resources/static/themes/material/css/various.scss b/app/Resources/static/themes/material/css/various.scss index 512ed8cd..7daf40ec 100644 --- a/app/Resources/static/themes/material/css/various.scss +++ b/app/Resources/static/themes/material/css/various.scss | |||
@@ -30,23 +30,3 @@ nav .input-field input { | |||
30 | .tab { | 30 | .tab { |
31 | flex: 1; | 31 | flex: 1; |
32 | } | 32 | } |
33 | |||
34 | .chip { | ||
35 | margin: auto 0; | ||
36 | border-radius: 4px; | ||
37 | background-color: #eee; | ||
38 | font-weight: normal; | ||
39 | height: 20px; | ||
40 | line-height: normal; | ||
41 | |||
42 | a { | ||
43 | color: #9e9e9e; | ||
44 | } | ||
45 | |||
46 | i.material-icons { | ||
47 | float: right; | ||
48 | font-size: 16px; | ||
49 | line-height: 32px; | ||
50 | padding-left: 8px; | ||
51 | } | ||
52 | } | ||