Merge branch 'testing'

1 files changed, 14 insertions, 12 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f2b200376..3426e71c0 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -275,7 +275,7 @@ margin-bottom:18px;
 
 #anon_notice {
 float:left;
-width:43.2%;
+width:42.4%;
 padding:1.1%;
 border-radius:7px;
 -moz-border-radius:7px;
@@ -396,7 +396,7 @@ margin-bottom:1em;
 }
 
 #content {
-width:64.009%;
+width:63.311%;
 min-height:259px;
 padding:1.795%;
 float:left;
@@ -422,7 +422,7 @@ float:left;
 width:27.917%;
 min-height:259px;
 float:left;
-margin-left:0.5%;
+margin-left:0.699%;
 padding:1.795%;
 border-radius:7px;
 -moz-border-radius:7px;
@@ -432,7 +432,7 @@ border-style:solid;
 }
 
 #form_notice {
-width:45.664%;
+width:45%;
 float:left;
 position:relative;
 line-height:1;
@@ -471,12 +471,12 @@ cursor:pointer;
 }
 #form_notice label[for=notice_data-attach] {
 text-indent:-9999px;
-left:394px;
+left:86%;
 width:16px;
 height:16px;
 }
 #form_notice #notice_data-attach {
-left:183px;
+left:40.6%;
 padding:0;
 height:16px;
 }
@@ -783,8 +783,8 @@ list-style-type:none;
 }
 .notices .notices {
 margin-top:7px;
-margin-left:5%;
-width:95%;
+margin-left:2%;
+width:98%;
 float:left;
 }
 
@@ -1020,20 +1020,21 @@ font-weight:bold;
 padding:0;
 }
 #jOverlayContent h1 {
-max-width:475px;
+max-width:425px;
 }
 #jOverlayContent #content {
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
 }
-#jOverlayContent #content img {
-max-width:480px;
-}
 #jOverlayLoading {
 top:22.5%;
 left:40%;
 }
+#attachment_view img {
+max-width:480px;
+max-height:480px;
+}
 #attachment_view #oembed_info {
 margin-top:11px;
 }
@@ -1278,6 +1279,7 @@ margin-bottom:0;
 
 #form_settings_design #settings_design_background-image img {
 max-width:480px;
+max-height:480px;
 }
 
 #form_settings_design #settings_design_color .form_data,