Merge branch '0.8.x' into design_reset

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 379f2eeac495f740acbc5226c13268d8e5bbdcf7..d685230205dc17b7e3609878e37809c6ef0fab81 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -206,6 +206,10 @@ border-radius:4px;
 padding:0 7px;
 }
 
+.form_settings input.form_action-default {
+margin-right:11px;
+}
+.form_settings input.form_action-default,
 .form_settings input.form_action-primary {
 padding:0;
 }
@@ -1266,6 +1270,10 @@ clear:both;
 margin-bottom:0;
 }
 
+#form_settings_design #settings_design_background-image img {
+max-width:480px;
+}
+
 #form_settings_design #settings_design_color .form_data,
 #form_settings_design #color-picker {
 float:left;