diff options
author | Thomas Citharel <tcit@tcit.fr> | 2017-06-15 07:58:12 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2017-06-15 07:58:12 +0200 |
commit | f99ebec0f2f39105147e3bdae790311db38c5ef9 (patch) | |
tree | b6c27602129793d7b8a6e4017b9218f408ea0b75 /app/Resources/static | |
parent | f93a3109a5f0999dbbd69131c9e5041c390120c9 (diff) | |
download | wallabag-f99ebec0f2f39105147e3bdae790311db38c5ef9.tar.gz wallabag-f99ebec0f2f39105147e3bdae790311db38c5ef9.tar.zst wallabag-f99ebec0f2f39105147e3bdae790311db38c5ef9.zip |
Fix mobile view and update asset deps
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Diffstat (limited to 'app/Resources/static')
-rwxr-xr-x | app/Resources/static/themes/baggy/index.js | 3 | ||||
-rwxr-xr-x | app/Resources/static/themes/material/css/layout.scss | 6 | ||||
-rw-r--r-- | app/Resources/static/themes/material/css/media_queries.scss | 15 |
3 files changed, 10 insertions, 14 deletions
diff --git a/app/Resources/static/themes/baggy/index.js b/app/Resources/static/themes/baggy/index.js index 5d448018..39ad49aa 100755 --- a/app/Resources/static/themes/baggy/index.js +++ b/app/Resources/static/themes/baggy/index.js | |||
@@ -256,8 +256,7 @@ $(document).ready(() => { | |||
256 | ========================================================================== */ | 256 | ========================================================================== */ |
257 | 257 | ||
258 | $('article a[href^="http"]').after( | 258 | $('article a[href^="http"]').after( |
259 | () => `<a href="${$(this).attr('href')}" class="add-to-wallabag-link-after" ` + | 259 | () => `<a href="${$(this).attr('href')}" class="add-to-wallabag-link-after" title="add to wallabag"></a>`, |
260 | 'title="add to wallabag"></a>', | ||
261 | ); | 260 | ); |
262 | 261 | ||
263 | $('.add-to-wallabag-link-after').click((event) => { | 262 | $('.add-to-wallabag-link-after').click((event) => { |
diff --git a/app/Resources/static/themes/material/css/layout.scss b/app/Resources/static/themes/material/css/layout.scss index ed32f125..cfdbf2b3 100755 --- a/app/Resources/static/themes/material/css/layout.scss +++ b/app/Resources/static/themes/material/css/layout.scss | |||
@@ -18,12 +18,6 @@ body { | |||
18 | border-bottom: 1px solid #ddd; | 18 | border-bottom: 1px solid #ddd; |
19 | } | 19 | } |
20 | 20 | ||
21 | nav, | ||
22 | body:not(.entry) main, | ||
23 | footer { | ||
24 | padding-left: 240px; | ||
25 | } | ||
26 | |||
27 | main, | 21 | main, |
28 | #content, | 22 | #content, |
29 | .valign-wrapper { | 23 | .valign-wrapper { |
diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss index 96f34494..08c2d8ab 100644 --- a/app/Resources/static/themes/material/css/media_queries.scss +++ b/app/Resources/static/themes/material/css/media_queries.scss | |||
@@ -2,16 +2,19 @@ | |||
2 | Media queries | 2 | Media queries |
3 | ========================================================================== */ | 3 | ========================================================================== */ |
4 | 4 | ||
5 | @media only screen and (max-width: 992px) { | 5 | @media only screen and (min-width: 992px) { |
6 | header, | 6 | nav, |
7 | main, | 7 | body:not(.entry) main, |
8 | footer { | 8 | footer { |
9 | padding-left: 0; | 9 | padding-left: 240px; |
10 | } | 10 | } |
11 | } | ||
11 | 12 | ||
12 | nav, | 13 | @media only screen and (max-width: 992px) { |
14 | header, | ||
13 | main, | 15 | main, |
14 | footer { | 16 | footer, |
17 | nav { | ||
15 | padding-left: 0; | 18 | padding-left: 0; |
16 | } | 19 | } |
17 | 20 | ||