Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

2 files changed, 35 insertions, 12 deletions

diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index 9866e2d2c..5d5eb9896 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -383,7 +383,7 @@ margin-bottom:1em;
 }
 
 #content {
-width:49.009%;
+width:50%;
 min-height:259px;
 float:left;
 padding:0 18px;
@@ -402,7 +402,7 @@ float:left;
 width:45.917%;
 min-height:259px;
 float:left;
-margin-left:1.385%;
+margin-left:0.25%;
 padding-bottom:47px;
 }
 
@@ -736,11 +736,10 @@ margin-right:11px;
 .notice,
 .profile {
 position:relative;
-padding-top:11px;
-padding-bottom:11px;
+padding:11px 2%;
 clear:both;
 float:left;
-width:96.41%;
+width:95.7%;
 border-width:1px;
 border-style:solid;
 margin-bottom:11px;
@@ -993,13 +992,36 @@ 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;
 }
+#jOverlayLoading {
+top:5%;
+left:40%;
+}
+#attachment_view img {
+max-width:480px;
+max-height:480px;
+}
+#attachment_view #oembed_info {
+margin-top:11px;
+}
+#attachment_view #oembed_info dt,
+#attachment_view #oembed_info dd {
+float:left;
+}
+#attachment_view #oembed_info dt {
+clear:left;
+margin-right:11px;
+font-weight:bold;
+}
+#attachment_view #oembed_info dt:after {
+content: ":";
+}
 
 #usergroups #new_group {
 float: left;
@@ -1058,8 +1080,6 @@ top:3px;
 left:3px;
 }
 
-
-
 .pagination {
 float:left;
 clear:both;
@@ -1105,7 +1125,6 @@ padding-right:30px;
 }
 /* END: NOTICE */
 
-
 .hentry .entry-content p {
 margin-bottom:18px;
 }
@@ -1122,7 +1141,6 @@ margin-bottom:18px;
 margin-left:18px;
 }
 
-
 /* TOP_POSTERS */
 .section tbody td {
 padding-right:11px;
@@ -1150,7 +1168,6 @@ margin-right:0;
 display:none;
 }
 
-
 /* tagcloud */
 .tag-cloud {
 list-style-type:none;
@@ -1233,6 +1250,11 @@ clear:both;
 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,
 #form_settings_design #color-picker {
 float:left;
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index 01af500bf..f113225fb 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -14,7 +14,8 @@ background:url(../images/illustrations/illu_pigeons-01.png) no-repeat 0 100%;
 }
 
 body,
-a:active {
+a:active,
+#content {
 background-color:#AEA187;
 }
 body {