Merge branch '0.7.x' into 0.8.x

[quix0rs-gnu-social.git] / theme / base / css / display.css

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index dc6b4bc29a52f1a190c26ca78316d22ffc4d2de6..efa5f4ac6969cc462b01969dc5758c12ffedd29b 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -727,7 +727,7 @@ clear:both;
 float:left;
 width:100%;
 border-top-width:1px;
-border-top-style:dashed;
+border-top-style:dotted;
 }
 .notices li {
 list-style-type:none;
@@ -1145,6 +1145,18 @@ clear:both;
 margin-bottom:0;
 }
 
+#form_settings_design #settings_design_color .form_data,
+#form_settings_design #color-picker {
+float:left;
+}
+#form_settings_design #settings_design_color .form_data {
+width:400px;
+margin-right:28px;
+}
+
+.instructions ul {
+list-style-position:inside;
+}
 .instructions p,
 .instructions ul {
 margin-bottom:18px;