From 9948d899d3671809e1608788beee9834acbf870e Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Tue, 4 Aug 2015 19:39:26 +0300 Subject: [PATCH] Fixes and improve css @media --- app/config/config.yml | 1 + .../themes/material/Config/index.html.twig | 11 +--- .../themes/material/Entry/entry.html.twig | 11 +--- .../Resources/views/themes/material/README.md | 6 +- .../views/themes/material/base.html.twig | 31 ++------- .../material/public/css/_materialize.min.css | 16 ----- .../views/themes/material/public/css/main.css | 59 ++++++++++++++++-- .../views/themes/material/public/js/init.js | 28 ++++++++- .../views/themes/material/screenshot.jpg | Bin 256315 -> 355607 bytes 9 files changed, 92 insertions(+), 71 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/_materialize.min.css diff --git a/app/config/config.yml b/app/config/config.yml index 0807b06a..75e09039 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -136,6 +136,7 @@ liip_theme: load_controllers: false themes: - baggy + - material autodetect_theme: wallabag_core.helper.detect_active_theme path_patterns: diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 099bd949..6d5b5394 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -6,10 +6,10 @@
-
+
- - - {% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index bbff8c47..3e161745 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -3,7 +3,7 @@ {% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %} {% block menu %} -