aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2017-06-15 09:56:39 +0200
committerGitHub <noreply@github.com>2017-06-15 09:56:39 +0200
commit7e271553fe287f046a9a7c2143e44364365fa403 (patch)
treeb6c27602129793d7b8a6e4017b9218f408ea0b75 /app/Resources
parentf93a3109a5f0999dbbd69131c9e5041c390120c9 (diff)
parentf99ebec0f2f39105147e3bdae790311db38c5ef9 (diff)
downloadwallabag-7e271553fe287f046a9a7c2143e44364365fa403.tar.gz
wallabag-7e271553fe287f046a9a7c2143e44364365fa403.tar.zst
wallabag-7e271553fe287f046a9a7c2143e44364365fa403.zip
Merge pull request #3229 from wallabag/fix-mobile-view
Fix mobile view and update asset deps
Diffstat (limited to 'app/Resources')
-rwxr-xr-xapp/Resources/static/themes/baggy/index.js3
-rwxr-xr-xapp/Resources/static/themes/material/css/layout.scss6
-rw-r--r--app/Resources/static/themes/material/css/media_queries.scss15
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
21nav,
22body:not(.entry) main,
23footer {
24 padding-left: 240px;
25}
26
27main, 21main,
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