diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-11-28 16:47:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-28 16:47:41 +0100 |
commit | ad51d77146494f04466c288b05b57b0d96113fd5 (patch) | |
tree | 278c6a17d808bd3d9aa132d9ef93d7e54842de58 /app/Resources/static | |
parent | 34ea7be6228c633ef8da703994eed034026e9c18 (diff) | |
parent | 9aa991281ddd315f607cabcfc3b917401d3d2104 (diff) | |
download | wallabag-ad51d77146494f04466c288b05b57b0d96113fd5.tar.gz wallabag-ad51d77146494f04466c288b05b57b0d96113fd5.tar.zst wallabag-ad51d77146494f04466c288b05b57b0d96113fd5.zip |
Merge pull request #2662 from wallabag/add-list-view
Add list view
Diffstat (limited to 'app/Resources/static')
-rwxr-xr-x | app/Resources/static/themes/_global/img/list.png | bin | 0 -> 201 bytes | |||
-rwxr-xr-x | app/Resources/static/themes/_global/img/table.png | bin | 0 -> 229 bytes | |||
-rwxr-xr-x | app/Resources/static/themes/baggy/css/main.css | 19 | ||||
-rwxr-xr-x | app/Resources/static/themes/material/css/main.css | 17 |
4 files changed, 26 insertions, 10 deletions
diff --git a/app/Resources/static/themes/_global/img/list.png b/app/Resources/static/themes/_global/img/list.png new file mode 100755 index 00000000..bd5aff5a --- /dev/null +++ b/app/Resources/static/themes/_global/img/list.png | |||
Binary files differ | |||
diff --git a/app/Resources/static/themes/_global/img/table.png b/app/Resources/static/themes/_global/img/table.png new file mode 100755 index 00000000..859c4cd8 --- /dev/null +++ b/app/Resources/static/themes/_global/img/table.png | |||
Binary files differ | |||
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 4f48f8ca..e16846ea 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css | |||
@@ -297,18 +297,14 @@ h2::after { | |||
297 | text-decoration: none; | 297 | text-decoration: none; |
298 | } | 298 | } |
299 | 299 | ||
300 | #listmode a:hover { | ||
301 | opacity: 1; | ||
302 | } | ||
303 | |||
304 | #listmode.tablemode { | 300 | #listmode.tablemode { |
305 | background-image: url("../img/baggy/table.png"); | 301 | background-image: url("../../_global/img/table.png"); |
306 | background-repeat: no-repeat; | 302 | background-repeat: no-repeat; |
307 | background-position: bottom; | 303 | background-position: bottom; |
308 | } | 304 | } |
309 | 305 | ||
310 | #listmode.listmode { | 306 | #listmode.listmode { |
311 | background-image: url("../img/baggy/list.png"); | 307 | background-image: url("../../_global/img/list.png"); |
312 | background-repeat: no-repeat; | 308 | background-repeat: no-repeat; |
313 | background-position: bottom; | 309 | background-position: bottom; |
314 | } | 310 | } |
@@ -352,9 +348,9 @@ footer a { | |||
352 | letter-spacing: -5px; | 348 | letter-spacing: -5px; |
353 | } | 349 | } |
354 | 350 | ||
355 | .listmode .entry { | 351 | .listmode.entry { |
356 | width: 100% !important; | 352 | width: 100%; |
357 | margin-left: 0 !important; | 353 | height: inherit; |
358 | } | 354 | } |
359 | 355 | ||
360 | .card-entry-labels { | 356 | .card-entry-labels { |
@@ -588,6 +584,7 @@ div.pagination ul { | |||
588 | text-align: left; | 584 | text-align: left; |
589 | font-style: italic; | 585 | font-style: italic; |
590 | color: #999; | 586 | color: #999; |
587 | display: inline-flex; | ||
591 | } | 588 | } |
592 | 589 | ||
593 | div.pagination ul > * { | 590 | div.pagination ul > * { |
@@ -620,6 +617,10 @@ div.pagination ul .current { | |||
620 | background-color: #ccc; | 617 | background-color: #ccc; |
621 | } | 618 | } |
622 | 619 | ||
620 | .hide { | ||
621 | display: none; | ||
622 | } | ||
623 | |||
623 | /* ========================================================================== | 624 | /* ========================================================================== |
624 | 2.1 = "save a link" related styles | 625 | 2.1 = "save a link" related styles |
625 | ========================================================================== */ | 626 | ========================================================================== */ |
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 82a74c23..8f7b7a3d 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css | |||
@@ -194,7 +194,6 @@ main, | |||
194 | 194 | ||
195 | .results { | 195 | .results { |
196 | height: 1em; | 196 | height: 1em; |
197 | line-height: 30px; | ||
198 | } | 197 | } |
199 | 198 | ||
200 | .results .nb-results, | 199 | .results .nb-results, |
@@ -203,6 +202,14 @@ main, | |||
203 | margin-bottom: 0; | 202 | margin-bottom: 0; |
204 | } | 203 | } |
205 | 204 | ||
205 | .results .nb-results { | ||
206 | display: inline-flex; | ||
207 | } | ||
208 | |||
209 | .results a { | ||
210 | color: #444; | ||
211 | } | ||
212 | |||
206 | .pagination { | 213 | .pagination { |
207 | float: right; | 214 | float: right; |
208 | } | 215 | } |
@@ -548,6 +555,14 @@ a.original { | |||
548 | margin-right: 5px !important; | 555 | margin-right: 5px !important; |
549 | } | 556 | } |
550 | 557 | ||
558 | .card-stacked:hover ul.tools-list { | ||
559 | display: block; | ||
560 | } | ||
561 | |||
562 | .card-stacked ul.tools-list { | ||
563 | display: none; | ||
564 | } | ||
565 | |||
551 | .card .card-action a { | 566 | .card .card-action a { |
552 | color: #fff; | 567 | color: #fff; |
553 | margin: 0; | 568 | margin: 0; |