aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-08-28 16:15:27 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-08-28 16:15:27 +0200
commitcdd3010b478c9ca818dd6d22d03c81ef4a5ab208 (patch)
treeffc9957fc228625501214bbb2e9f4bebe7936982 /app/Resources
parent13d44ca766b1020327f0b9b005dc2e95deb156a1 (diff)
parent985f5f9d05f7ff7e443442b1775923b379c141d6 (diff)
downloadwallabag-cdd3010b478c9ca818dd6d22d03c81ef4a5ab208.tar.gz
wallabag-cdd3010b478c9ca818dd6d22d03c81ef4a5ab208.tar.zst
wallabag-cdd3010b478c9ca818dd6d22d03c81ef4a5ab208.zip
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'app/Resources')
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css11
1 files changed, 11 insertions, 0 deletions
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index b81335eb..d3cd1244 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -91,6 +91,7 @@ body {
91 91
92body.login main { 92body.login main {
93 padding: 0; 93 padding: 0;
94 min-height: 100vh;
94} 95}
95 96
96.border-bottom { 97.border-bottom {
@@ -256,6 +257,10 @@ nav input {
256 display: none; 257 display: none;
257} 258}
258 259
260input-field.nav-panel-add, .input-field.nav-panel-add form {
261 height: 100%;
262}
263
259/* ========================================================================== 264/* ==========================================================================
260 2 = Side-nav 265 2 = Side-nav
261 ========================================================================== */ 266 ========================================================================== */
@@ -342,6 +347,12 @@ main ul.row {
342 347
343.card .card-content .card-title { 348.card .card-content .card-title {
344 line-height: 32px; 349 line-height: 32px;
350 max-height: 64px;
351 display: block;
352}
353
354.card .card-content i.right, .card .card-reveal i.right {
355 margin-left: 0;
345} 356}
346 357
347.card .card-entry-labels { 358.card .card-entry-labels {