diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-12-08 10:27:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-08 10:27:43 +0100 |
commit | e99be2c134d836a26faa1defb3b1b473834df58b (patch) | |
tree | 6803d90fea577e1457818673d0d1790ccf412029 /app/Resources | |
parent | 77a53ea7244a5483e57f657e8f53bf45f226c581 (diff) | |
parent | 7475924eac4ac825a19a4cc992545fa7dd93332b (diff) | |
download | wallabag-e99be2c134d836a26faa1defb3b1b473834df58b.tar.gz wallabag-e99be2c134d836a26faa1defb3b1b473834df58b.tar.zst wallabag-e99be2c134d836a26faa1defb3b1b473834df58b.zip |
Merge pull request #3461 from Simounet/fix/rss-on-tag-list
Tag's list improved
Diffstat (limited to 'app/Resources')
-rw-r--r-- | app/Resources/static/themes/material/css/cards.scss | 61 |
1 files changed, 44 insertions, 17 deletions
diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 0819f0dc..8ef864d6 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss | |||
@@ -73,20 +73,6 @@ main { | |||
73 | white-space: nowrap; | 73 | white-space: nowrap; |
74 | } | 74 | } |
75 | 75 | ||
76 | .card-entry-labels-hidden li { | ||
77 | display: inline-block; | ||
78 | background-color: $blueAccentColor; | ||
79 | margin: 0 5px; | ||
80 | padding: 5px 12px; | ||
81 | border-radius: 3px; | ||
82 | color: #fff; | ||
83 | max-height: 2em; | ||
84 | max-width: calc(100% - 15px); | ||
85 | overflow: hidden; | ||
86 | text-overflow: ellipsis; | ||
87 | white-space: nowrap; | ||
88 | } | ||
89 | |||
90 | .card-content .estimatedTime { | 76 | .card-content .estimatedTime { |
91 | margin-bottom: 10px; | 77 | margin-bottom: 10px; |
92 | } | 78 | } |
@@ -157,13 +143,21 @@ a.original:not(.waves-effect) { | |||
157 | margin: 10px 10px 10px auto; | 143 | margin: 10px 10px 10px auto; |
158 | padding: 5px 12px 5px 16px !important; | 144 | padding: 5px 12px 5px 16px !important; |
159 | background-color: $blueAccentColor; | 145 | background-color: $blueAccentColor; |
160 | border-radius: 0 3px 3px 0; | 146 | border-radius: 3px; |
161 | color: #fff; | 147 | color: #fff; |
162 | cursor: default; | 148 | cursor: default; |
163 | max-height: 2em; | 149 | } |
164 | overflow: hidden; | 150 | |
151 | .card-entry-labels li { | ||
165 | text-overflow: ellipsis; | 152 | text-overflow: ellipsis; |
166 | white-space: nowrap; | 153 | white-space: nowrap; |
154 | border-radius: 0 3px 3px 0; | ||
155 | overflow: hidden; | ||
156 | } | ||
157 | |||
158 | .card-tag-labels li { | ||
159 | display: flex; | ||
160 | justify-content: space-between; | ||
167 | } | 161 | } |
168 | 162 | ||
169 | .card-entry-tags a, | 163 | .card-entry-tags a, |
@@ -176,6 +170,33 @@ a.original:not(.waves-effect) { | |||
176 | color: #fff; | 170 | color: #fff; |
177 | } | 171 | } |
178 | 172 | ||
173 | .card-tag-labels a { | ||
174 | height: 100%; | ||
175 | align-items: center; | ||
176 | } | ||
177 | |||
178 | .card-tag-link { | ||
179 | display: flex; | ||
180 | min-width: 100px; | ||
181 | flex-grow: 1; | ||
182 | } | ||
183 | |||
184 | .card-tag-rss { | ||
185 | display: flex; | ||
186 | } | ||
187 | |||
188 | .card-tag-labels { | ||
189 | display: flex; | ||
190 | flex-wrap: wrap; | ||
191 | } | ||
192 | |||
193 | .card-tag-labels li { | ||
194 | margin: 10px; | ||
195 | flex-basis: 19%; | ||
196 | flex-grow: 1; | ||
197 | align-items: center; | ||
198 | } | ||
199 | |||
179 | .card-stacked { | 200 | .card-stacked { |
180 | display: flex; | 201 | display: flex; |
181 | flex-flow: row wrap; | 202 | flex-flow: row wrap; |
@@ -245,3 +266,9 @@ a.original:not(.waves-effect) { | |||
245 | .settings .div_tabs { | 266 | .settings .div_tabs { |
246 | padding-bottom: 15px; | 267 | padding-bottom: 15px; |
247 | } | 268 | } |
269 | |||
270 | @media only screen and (min-width: 992px) { | ||
271 | .card-tag-labels li { | ||
272 | max-width: 50%; | ||
273 | } | ||
274 | } | ||