diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-08-19 21:27:49 +0200 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-08-19 21:27:49 +0200 |
commit | 34437f408c5b7b590aded6795d7ce01bfbfc7711 (patch) | |
tree | 1fbcff3f6f74c4aef331b8bbd00476850d179329 /src/Wallabag | |
parent | ab4aeb8bd83d0dff91f42543adec5245db6809a8 (diff) | |
parent | fdab81e910f65babd1945e67c74b8bb541bcbfb3 (diff) | |
download | wallabag-34437f408c5b7b590aded6795d7ce01bfbfc7711.tar.gz wallabag-34437f408c5b7b590aded6795d7ce01bfbfc7711.tar.zst wallabag-34437f408c5b7b590aded6795d7ce01bfbfc7711.zip |
Merge pull request #1369 from wallabag/v2-bottombar
fix #1332: bottom bar to display message
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/base.html.twig | 5 | ||||
-rwxr-xr-x | src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css | 14 |
2 files changed, 19 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index c381a08c..e27aceae 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
@@ -113,5 +113,10 @@ | |||
113 | <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p> | 113 | <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p> |
114 | </footer> | 114 | </footer> |
115 | {% endblock %} | 115 | {% endblock %} |
116 | {% if warning_message %} | ||
117 | <div id="warning_message"> | ||
118 | {{ warning_message | raw }} | ||
119 | </div> | ||
120 | {% endif %} | ||
116 | </body> | 121 | </body> |
117 | </html> | 122 | </html> |
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 81ea598c..52a2be80 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 | |||
@@ -26,6 +26,20 @@ body { | |||
26 | background: #f0f0f0; | 26 | background: #f0f0f0; |
27 | } | 27 | } |
28 | 28 | ||
29 | #warning_message { | ||
30 | position: fixed; | ||
31 | background-color: #ff6347; | ||
32 | z-index: 1000; | ||
33 | bottom: 0; | ||
34 | left: 0; | ||
35 | width: 100%; | ||
36 | color: #000; | ||
37 | } | ||
38 | |||
39 | #warning_message a { | ||
40 | color: #555; | ||
41 | } | ||
42 | |||
29 | .border-bottom { | 43 | .border-bottom { |
30 | border-bottom: 1px solid #DDD; | 44 | border-bottom: 1px solid #DDD; |
31 | } | 45 | } |