aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources/static
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2017-10-16 09:02:47 +0200
committerGitHub <noreply@github.com>2017-10-16 09:02:47 +0200
commit7f5d03a98d59afa171ccc003a48715f13fa3b116 (patch)
tree5ef7704ef5fa6f227b62bb4497a0931643a915e8 /app/Resources/static
parent393020100350140e421d991a3fc7d12eaf69a8b7 (diff)
parent3f29386cb797a8cc9b4eff8dc9b0a75f201366a5 (diff)
downloadwallabag-7f5d03a98d59afa171ccc003a48715f13fa3b116.tar.gz
wallabag-7f5d03a98d59afa171ccc003a48715f13fa3b116.tar.zst
wallabag-7f5d03a98d59afa171ccc003a48715f13fa3b116.zip
Merge pull request #3383 from Kdecherf/fix-webpack-and-login
Fix webpack and login screen
Diffstat (limited to 'app/Resources/static')
-rw-r--r--app/Resources/static/themes/_global/share.js3
-rw-r--r--app/Resources/static/themes/material/css/media_queries.scss2
2 files changed, 4 insertions, 1 deletions
diff --git a/app/Resources/static/themes/_global/share.js b/app/Resources/static/themes/_global/share.js
index d7078616..15206b37 100644
--- a/app/Resources/static/themes/_global/share.js
+++ b/app/Resources/static/themes/_global/share.js
@@ -1 +1,4 @@
1import './share.scss'; 1import './share.scss';
2
3function requireAll(r) { r.keys().forEach(r); }
4requireAll(require.context('./img/', true, /\.(jpg|png|gif|svg|ico)$/));
diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss
index 08c2d8ab..36d79a45 100644
--- a/app/Resources/static/themes/material/css/media_queries.scss
+++ b/app/Resources/static/themes/material/css/media_queries.scss
@@ -4,7 +4,7 @@
4 4
5@media only screen and (min-width: 992px) { 5@media only screen and (min-width: 992px) {
6 nav, 6 nav,
7 body:not(.entry) main, 7 body:not(.entry):not(.login) main,
8 footer { 8 footer {
9 padding-left: 240px; 9 padding-left: 240px;
10 } 10 }