aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources/static/themes/material
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2018-07-03 13:55:25 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2018-07-03 13:55:25 +0200
commit44043ebe82a22470e2514d05efac324035ee809a (patch)
tree5ea40b62ce665a8bab6a3e280a47f3be11838e27 /app/Resources/static/themes/material
parent11f15430ffc67e30f084cffc8e909ace87ce19e1 (diff)
parente586d65b64089fc1cc230a18c470aae3f45f91a6 (diff)
downloadwallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.gz
wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.zst
wallabag-44043ebe82a22470e2514d05efac324035ee809a.zip
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'app/Resources/static/themes/material')
-rw-r--r--app/Resources/static/themes/material/css/article.scss1
-rw-r--r--app/Resources/static/themes/material/css/media_queries.scss10
2 files changed, 11 insertions, 0 deletions
diff --git a/app/Resources/static/themes/material/css/article.scss b/app/Resources/static/themes/material/css/article.scss
index 2d4ef4b4..75658a58 100644
--- a/app/Resources/static/themes/material/css/article.scss
+++ b/app/Resources/static/themes/material/css/article.scss
@@ -11,6 +11,7 @@
11 color: #424242; 11 color: #424242;
12 font-size: 18px; 12 font-size: 18px;
13 line-height: 1.7em; 13 line-height: 1.7em;
14 overflow-wrap: break-word;
14 15
15 h1, 16 h1,
16 h2, 17 h2,
diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss
index 69e3d47d..72584426 100644
--- a/app/Resources/static/themes/material/css/media_queries.scss
+++ b/app/Resources/static/themes/material/css/media_queries.scss
@@ -22,6 +22,16 @@
22 padding-left: 0; 22 padding-left: 0;
23 } 23 }
24 24
25 table {
26 display: block;
27 overflow: auto;
28 }
29
30 iframe {
31 max-width: 100%;
32 height: auto;
33 }
34
25 .nav-panels .action { 35 .nav-panels .action {
26 padding-right: 0.75rem; 36 padding-right: 0.75rem;
27 } 37 }