diff options
| 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 |
| commit | fd21739351daf697188329948492c65b1a9bd7e6 (patch) | |
| tree | 7c0a2cb3713941ae7abb51e7591bd5398ac277ed /ishtar_common/static | |
| parent | 01d871a2cbf603690d9c558defac0801a7a41205 (diff) | |
| parent | d2bdd742b6b95ce29272503e777afae0bd319d37 (diff) | |
| download | Ishtar-fd21739351daf697188329948492c65b1a9bd7e6.tar.bz2 Ishtar-fd21739351daf697188329948492c65b1a9bd7e6.zip | |
Merge branch 'master' into develop
Conflicts:
version.py
Diffstat (limited to 'ishtar_common/static')
| -rw-r--r-- | ishtar_common/static/media/style.css | 6 |
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; } |