aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources/static
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-10-24 12:03:17 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-24 12:03:17 +0200
commit64a8781e453c40ff144d03405abe2dc1ccfacbe0 (patch)
tree311473a357e3dedd496e1417293eed9a2a116ad6 /app/Resources/static
parent9313ea9d440e3f93a6bb2d8c0fb6717364cd27f5 (diff)
parentc64b4941d5222586a82d2c8d6a61969bb9cfe96b (diff)
downloadwallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.gz
wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.zst
wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.zip
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'app/Resources/static')
-rwxr-xr-xapp/Resources/static/themes/baggy/css/main.css8
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css22
2 files changed, 29 insertions, 1 deletions
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css
index 61e7b22a..44db2070 100755
--- a/app/Resources/static/themes/baggy/css/main.css
+++ b/app/Resources/static/themes/baggy/css/main.css
@@ -1192,6 +1192,14 @@ pre code {
1192 } 1192 }
1193} 1193}
1194 1194
1195@media screen and (max-height: 770px) {
1196 .menu.users,
1197 .menu.internal,
1198 .menu.developer {
1199 display: none;
1200 }
1201}
1202
1195@media screen and (max-width: 500px) { 1203@media screen and (max-width: 500px) {
1196 .entry { 1204 .entry {
1197 width: 100%; 1205 width: 100%;
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index d91b469f..2cc2e8a0 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -360,6 +360,10 @@ span.numberItems {
360 float: right; 360 float: right;
361} 361}
362 362
363nav ul a:hover {
364 background-color: initial;
365}
366
363/* ========================================================================== 367/* ==========================================================================
364 * 3 = Filters slider 368 * 3 = Filters slider
365 * ========================================================================== */ 369 * ========================================================================== */
@@ -522,7 +526,7 @@ main ul.row {
522} 526}
523 527
524#article > header > h1 { 528#article > header > h1 {
525 font-size: 2em; 529 font-size: 1.6em;
526} 530}
527 531
528.reader-mode { 532.reader-mode {
@@ -603,6 +607,18 @@ main ul.row {
603 width: auto; 607 width: auto;
604 } 608 }
605 609
610 #article {
611 padding: 15px;
612 max-width: 35em;
613 margin-left: auto;
614 margin-right: auto;
615 font-size: 18px;
616 }
617
618 #article > header > h1 {
619 font-size: 1.33em;
620 }
621
606 .reader-mode { 622 .reader-mode {
607 width: 240px !important; 623 width: 240px !important;
608 } 624 }
@@ -760,3 +776,7 @@ div.settings div.file-field div {
760.input-field label.active { 776.input-field label.active {
761 font-size: 1rem; 777 font-size: 1rem;
762} 778}
779
780nav .input-field input {
781 margin: 0;
782}