summaryrefslogtreecommitdiff
path: root/ishtar_common/static
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-08 10:04:23 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-08 10:04:23 +0200
commit770a612b468eebbf85f88ef54d010a35801189b2 (patch)
treee375ec41c35c8a24b6883bb0f0b27ced03916f78 /ishtar_common/static
parent36d03c08136e6ff63812cbbc431d06304e7ba156 (diff)
parent031e806212ed489f81536103fb7c28e177fb7322 (diff)
downloadIshtar-770a612b468eebbf85f88ef54d010a35801189b2.tar.bz2
Ishtar-770a612b468eebbf85f88ef54d010a35801189b2.zip
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/static')
-rw-r--r--ishtar_common/static/media/style.css18
1 files changed, 17 insertions, 1 deletions
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index c6a151dc8..4de3cd315 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -163,6 +163,14 @@ h4{
margin:10px 0;
}
+pre {
+ padding: 0.5em 1em;
+ white-space: pre-wrap;
+ white-space: -moz-pre-wrap;
+ white-space: -pre-wrap;
+ white-space: -o-pre-wrap;
+}
+
select{
max-width:550px;
}
@@ -621,8 +629,8 @@ ul.form-flex li li label {
padding:0.2em;
margin-left:auto;
margin-right:auto;
- width:600px;
background-color:#F1F2F6;
+ min-width: 600px;
}
.form table th{
@@ -1090,13 +1098,21 @@ p.alert{
color:#D14;
}
+p.info-box{
+ color: #1c94c4;
+}
+
div.form p.alert{
background-color:#FFF;
}
+#window p.info-box,
#window p.alert{
background-color:#EEE;
+ padding: 6px 16px;
padding-left: 30px;
+ width: auto;
+ margin: 6px 10px;
}
#window p.alert label{