diff options
author | Alexandr Danilov <bitbucket@modos189.ru> | 2015-10-09 13:00:15 +0300 |
---|---|---|
committer | Alexandr Danilov <bitbucket@modos189.ru> | 2015-10-09 13:00:15 +0300 |
commit | c26a3edc0aa7d17a0ea95092447f16471fda8718 (patch) | |
tree | c14eb6a81daa785f0e6b5bf626690d76693ad1b3 | |
parent | ba873ae6678bd4362b2c5bd063f738206c549f22 (diff) | |
download | wallabag-c26a3edc0aa7d17a0ea95092447f16471fda8718.tar.gz wallabag-c26a3edc0aa7d17a0ea95092447f16471fda8718.tar.zst wallabag-c26a3edc0aa7d17a0ea95092447f16471fda8718.zip |
Other improvements
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | 2 | ||||
-rwxr-xr-x | src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 2e88c1ad..95b3977c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -31,7 +31,7 @@ | |||
31 | <ul id="slide-out" class="side-nav fixed"> | 31 | <ul id="slide-out" class="side-nav fixed"> |
32 | {% block logo %} | 32 | {% block logo %} |
33 | <li class="logo border-bottom"> | 33 | <li class="logo border-bottom"> |
34 | <a class="waves-effect" title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}"> | 34 | <a title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}"> |
35 | <img src="{{ asset('themes/material/img/logo-square.png') }}" alt="wallabag logo" /> | 35 | <img src="{{ asset('themes/material/img/logo-square.png') }}" alt="wallabag logo" /> |
36 | </a> | 36 | </a> |
37 | </li> | 37 | </li> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css index b3bd07e7..d6031530 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css | |||
@@ -76,6 +76,10 @@ nav, main, footer { | |||
76 | padding-left: 240px; | 76 | padding-left: 240px; |
77 | } | 77 | } |
78 | 78 | ||
79 | main, #content, .valign-wrapper { | ||
80 | height: 100%; | ||
81 | } | ||
82 | |||
79 | #main { | 83 | #main { |
80 | flex: 1 0 auto; | 84 | flex: 1 0 auto; |
81 | } | 85 | } |
@@ -225,6 +229,10 @@ nav input { | |||
225 | width: 100pt; | 229 | width: 100pt; |
226 | } | 230 | } |
227 | 231 | ||
232 | #main .logo:hover { | ||
233 | background: transparent; | ||
234 | } | ||
235 | |||
228 | .side-nav li { | 236 | .side-nav li { |
229 | padding: 0px; | 237 | padding: 0px; |
230 | } | 238 | } |