aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2017-05-31 21:18:14 +0200
committerGitHub <noreply@github.com>2017-05-31 21:18:14 +0200
commit757ec837bea7f57dcefb71b3b90c66299ed6a922 (patch)
tree5300cd32c72dfde73fa128911e952374e8c2fc95 /app/Resources
parentec8e7ffad48c9920b4b63b8e278c8bec1fc6f480 (diff)
parent84b041e87f1e2642627bb4f86284ed538333eb1d (diff)
downloadwallabag-757ec837bea7f57dcefb71b3b90c66299ed6a922.tar.gz
wallabag-757ec837bea7f57dcefb71b3b90c66299ed6a922.tar.zst
wallabag-757ec837bea7f57dcefb71b3b90c66299ed6a922.zip
Merge pull request #3077 from wallabag/add-tags-list-view
Added tags on list view
Diffstat (limited to 'app/Resources')
-rw-r--r--app/Resources/static/themes/material/css/article.scss1
-rw-r--r--app/Resources/static/themes/material/css/cards.scss53
-rw-r--r--app/Resources/static/themes/material/css/entries.scss9
3 files changed, 62 insertions, 1 deletions
diff --git a/app/Resources/static/themes/material/css/article.scss b/app/Resources/static/themes/material/css/article.scss
index 8b67f6bd..27ff5221 100644
--- a/app/Resources/static/themes/material/css/article.scss
+++ b/app/Resources/static/themes/material/css/article.scss
@@ -132,6 +132,7 @@
132 background-color: $blueAccentColor; 132 background-color: $blueAccentColor;
133 padding: 0 15px 0 10px; 133 padding: 0 15px 0 10px;
134 margin: auto 2px; 134 margin: auto 2px;
135 border-radius: 6px;
135 136
136 a, 137 a,
137 i { 138 i {
diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss
index f5b79193..3edbe673 100644
--- a/app/Resources/static/themes/material/css/cards.scss
+++ b/app/Resources/static/themes/material/css/cards.scss
@@ -175,15 +175,66 @@ a.original:not(.waves-effect) {
175} 175}
176 176
177.card-stacked { 177.card-stacked {
178 display: flex;
179 flex-flow: row wrap;
180
178 &:hover ul.tools-list { 181 &:hover ul.tools-list {
179 display: block; 182 display: inline;
183 text-align: right;
184 }
185
186 .preview {
187 max-width: 100px;
188 height: auto;
189 margin-right: 10px;
190 flex: 1;
191
192 img {
193 max-width: 100%;
194 max-height: 100%;
195 }
196 }
197
198 div.metadata {
199 .chip {
200 background-color: $blueAccentColor;
201 padding: 0 15px 0 10px;
202 margin: auto 2px;
203 border-radius: 6px;
204
205 a,
206 i {
207 color: #fff;
208 }
209
210 i.material-icons {
211 float: right;
212 font-size: 20px;
213 line-height: 32px;
214 padding-left: 8px;
215 }
216 }
217 }
218
219 div.card-content {
220 flex: 4;
180 } 221 }
181 222
182 ul.tools-list { 223 ul.tools-list {
224 flex: 1;
183 display: none; 225 display: none;
226 flex-basis: 5em;
227 align-self: flex-end;
228 float: right;
229 max-width: 6em;
184 } 230 }
185} 231}
186 232
233#content .collection .collection-item {
234 min-height: 65px;
235 height: auto;
236}
237
187.quickstart .card .card-action a, 238.quickstart .card .card-action a,
188.quickstart .card .card-action a:hover { 239.quickstart .card .card-action a:hover {
189 color: #fff !important; 240 color: #fff !important;
diff --git a/app/Resources/static/themes/material/css/entries.scss b/app/Resources/static/themes/material/css/entries.scss
index b6a46a9e..c667be27 100644
--- a/app/Resources/static/themes/material/css/entries.scss
+++ b/app/Resources/static/themes/material/css/entries.scss
@@ -2,6 +2,15 @@
2 * Entries 2 * Entries
3 * ========================================================================== */ 3 * ========================================================================== */
4 4
5.collection {
6 margin: 15px 15px 0;
7
8 .collection-item {
9 padding: 7px;
10 height: 65px;
11 }
12}
13
5.results { 14.results {
6 height: 1em; 15 height: 1em;
7 16