Merge pull request #3229 from wallabag/fix-mobile-view

Fix mobile view and update asset deps

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(() => {
    ========================================================================== */
 
   $('article a[href^="http"]').after(
-      () => `<a href="${$(this).attr('href')}" class="add-to-wallabag-link-after" ` +
-      'title="add to wallabag"></a>',
+    () => `<a href="${$(this).attr('href')}" class="add-to-wallabag-link-after" title="add to wallabag"></a>`,
   );
 
   $('.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 {
   border-bottom: 1px solid #ddd;
 }
 
-nav,
-body:not(.entry) main,
-footer {
-  padding-left: 240px;
-}
-
 main,
 #content,
 .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 @@
    Media queries
    ========================================================================== */
 
-@media only screen and (max-width: 992px) {
-  header,
-  main,
+@media only screen and (min-width: 992px) {
+  nav,
+  body:not(.entry) main,
   footer {
-    padding-left: 0;
+    padding-left: 240px;
   }
+}
 
-  nav,
+@media only screen and (max-width: 992px) {
+  header,
   main,
-  footer {
+  footer,
+  nav {
     padding-left: 0;
   }