diff options
Diffstat (limited to 'app')
4 files changed, 16 insertions, 3 deletions
diff --git a/app/Resources/static/themes/_global/index.js b/app/Resources/static/themes/_global/index.js index fddb476d..b810e5d7 100644 --- a/app/Resources/static/themes/_global/index.js +++ b/app/Resources/static/themes/_global/index.js | |||
@@ -65,7 +65,7 @@ $(document).ready(() => { | |||
65 | retrievePercent(x.entryId); | 65 | retrievePercent(x.entryId); |
66 | 66 | ||
67 | $(window).resize(() => { | 67 | $(window).resize(() => { |
68 | retrievePercent(x.entryId); | 68 | retrievePercent(x.entryId, true); |
69 | }); | 69 | }); |
70 | } | 70 | } |
71 | }); | 71 | }); |
diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 774f4539..7e5a2b27 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js | |||
@@ -19,14 +19,16 @@ function savePercent(id, percent) { | |||
19 | return true; | 19 | return true; |
20 | } | 20 | } |
21 | 21 | ||
22 | function retrievePercent(id) { | 22 | function retrievePercent(id, resized) { |
23 | if (!supportsLocalStorage()) { return false; } | 23 | if (!supportsLocalStorage()) { return false; } |
24 | 24 | ||
25 | const bheight = $(document).height(); | 25 | const bheight = $(document).height(); |
26 | const percent = localStorage[`wallabag.article.${id}.percent`]; | 26 | const percent = localStorage[`wallabag.article.${id}.percent`]; |
27 | const scroll = bheight * percent; | 27 | const scroll = bheight * percent; |
28 | 28 | ||
29 | $('html,body').animate({ scrollTop: scroll }, 'fast'); | 29 | if (!resized) { |
30 | $('html,body').animate({ scrollTop: scroll }, 'fast'); | ||
31 | } | ||
30 | 32 | ||
31 | return true; | 33 | return true; |
32 | } | 34 | } |
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 | } |