aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-03-28 10:52:41 +0200
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-03-28 10:52:41 +0200
commit0dd043c19b08ca46ee03989186df0de01e60f798 (patch)
tree554bbead1b3b92066c03a9924b8b69a59b4c771a
parentf744ca27993d1eecb11c66c9b902110fcf4471a4 (diff)
parent4ea9cf5c60f869bd628a82a7b9dd6ecd293d963a (diff)
downloadwallabag-0dd043c19b08ca46ee03989186df0de01e60f798.tar.gz
wallabag-0dd043c19b08ca46ee03989186df0de01e60f798.tar.zst
wallabag-0dd043c19b08ca46ee03989186df0de01e60f798.zip
Merge pull request #1815 from wallabag/v1-prepare-v2
Add message on unread page about v2
-rwxr-xr-xthemes/baggy/css/messages.css23
-rw-r--r--themes/default/_messages.twig7
2 files changed, 29 insertions, 1 deletions
diff --git a/themes/baggy/css/messages.css b/themes/baggy/css/messages.css
index 42da70b3..5854e731 100755
--- a/themes/baggy/css/messages.css
+++ b/themes/baggy/css/messages.css
@@ -1,3 +1,20 @@
1.messages {
2 display: block;
3 clear: both;
4 width: 400px;
5 margin: 10px auto 10px;
6 padding: 10px 0;
7 -moz-border-radius: 4px;
8 border-radius: 4px;
9}
10
11.messages p {
12 margin: 3px 0 3px 10px !important;
13 padding: 0 10px 0 23px !important;
14 font-size: 14px;
15 line-height: 16px;
16}
17
1.messages.error.install { 18.messages.error.install {
2 border: 1px solid #c42608; 19 border: 1px solid #c42608;
3 color: #c00 !important; 20 color: #c00 !important;
@@ -16,4 +33,10 @@
16 border: 1px solid #6dc70c; 33 border: 1px solid #6dc70c;
17 background: #e0fbcc !important; 34 background: #e0fbcc !important;
18 text-align: left; 35 text-align: left;
36}
37
38.messages.information,
39.messages.info {
40 border: 1px solid #82aee7;
41 background: #dfebfb;
19} \ No newline at end of file 42} \ No newline at end of file
diff --git a/themes/default/_messages.twig b/themes/default/_messages.twig
index 679aa098..80ae456d 100644
--- a/themes/default/_messages.twig
+++ b/themes/default/_messages.twig
@@ -1 +1,6 @@
1 {{ messages | raw }} \ No newline at end of file 1 {{ messages | raw }}
2 {% if view == 'home' %}
3 <div class="messages information">
4 <p><a href="http://doc.wallabag.org">wallabag v2 is out, please read the documentation to upgrade.</a></p>
5 </div>
6 {% endif %} \ No newline at end of file