summaryrefslogtreecommitdiff
path: root/ishtar_common/static
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-05-29 11:37:22 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-05-29 11:37:22 +0200
commit2a0842c8ffb0e7eec6b350f9d170670c8376cce8 (patch)
tree7c0a2cb3713941ae7abb51e7591bd5398ac277ed /ishtar_common/static
parent97545b37f75b5a7297b5788cef32edd08b295f9d (diff)
parent9b773927aaf6549ff52c697cce8009f55b042be8 (diff)
downloadIshtar-2a0842c8ffb0e7eec6b350f9d170670c8376cce8.tar.bz2
Ishtar-2a0842c8ffb0e7eec6b350f9d170670c8376cce8.zip
Merge branch 'master' into develop
Conflicts: version.py
Diffstat (limited to 'ishtar_common/static')
-rw-r--r--ishtar_common/static/media/style.css6
1 files changed, 6 insertions, 0 deletions
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 0016ca0e5..468b6557e 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -1323,6 +1323,12 @@ p.alert{
color:#D14;
}
+ul.alert{
+ background-color: #FF9999;
+ padding: 0.5em 2em;
+ text-align: left;
+}
+
p.info-box{
color: #1c94c4;
}