Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

3 files changed, 298 insertions, 39 deletions

diff --git a/theme/clean/css/display.css b/theme/clean/css/display.css
index 260ee5926..9cc8346fd 100644
--- a/theme/clean/css/display.css
+++ b/theme/clean/css/display.css
@@ -11,17 +11,16 @@
 @media screen, projection, tv {
 
 body {
-    background: #9a9aa4 url(../images/page_bg.png) no-repeat fixed 50% 100%;
+    background: url(../images/page_bg.png) no-repeat fixed 50% 100%;
     background-color: #6e6e8c;
     font-family: "Liberation Sans", "Nimbus Sans L", "FreeSans", "Helvetica Neue", Helvetica, Arial, sans-serif; 
     font-size: 86%;
 }
 
 #wrap {
-    width: 860px;
+    width: 867px;
     margin: 0px auto;
-    padding: 10px;
-    padding-top: 0px;
+    padding: 0px 8px 10px 8px;
     background-color: #fff;
     box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
     -moz-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
@@ -29,7 +28,10 @@ body {
 }
 
 #header {
+    width: 851px;
+    padding: 0px;
     padding-top: 70px;
+    margin-left: 8px;
 }
 
 address {
@@ -61,11 +63,11 @@ address {
     display: block;
     position: absolute;
     top: 0;
+    left: 0;
     z-index: 98;
     background-color: #829d25;
-    width: 880px;
-    left: 50%;
-    margin-left: -440px; 
+    width: 883px;
+    margin-left: -16px; 
     margin-top: 0px;
     height: 30px;
     line-height: 30px;
@@ -74,6 +76,10 @@ address {
     border-bottom: 1px solid #fff;
 }
 
+#site_nav_global_primary li:last-child {
+    margin-right: 16px;
+}
+
 #site_nav_global_primary a {
     color: #fff !important;
     text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
@@ -81,16 +87,11 @@ address {
 
 #site_notice {
     float: right;
-    width: 266px; 
+    width: 270px;
+    padding: 10px; 
     margin-left: 40px;
 }
 
-.form_notice {
-    float: right;
-    width: 500px;   
-    margin-top: 0px;
-}
-
 #anon_notice {
     clear: both;
     background: none;
@@ -98,36 +99,62 @@ address {
     margin-bottom: 0px;
 }
 
+.form_notice {
+    float: right;
+    width: 494px;
+    margin-top: 0px;
+}
+
 .form_notice fieldset {
     width: 100%;
 }
 
 .form_notice textarea {
-    width: 364px;
+    width: 362px;
     height: 54px;
 }
 
+.form_notice label[for=notice_data-attach],
+.form_notice #notice_data-attach {
+    top: 27px;
+}
+
 .form_notice #notice_data-geo_wrap label,
 .form_notice #notice_data-geo_wrap input {
-    top: 48px;
+    top: 52px;
 }
 
 .form_notice #notice_action-submit {
     font-size: 0.9em;
-    top: 74px;
+    top: 80px;
     right:0;
     height: 2.4em;
     width: 96px;
-    right: 10px;
+	right: 10px;
+}
+
+.form_notice .error,
+.form_notice .success {
+    width: 375px;
+}
+
+.form_notice .error {
+    width: 375px;
+    margin-left: 0px;
 }
 
 #core {
     clear: both;
+    margin: 0px;
+    width: 851px;
+    margin-left: 8px;
     margin-top: 14px;
 }
 
 #content {
     padding-top: 10px;
+    width: 545px;
+    margin-right: 0px;
 }
 
 #site_nav_local_views {
@@ -149,6 +176,27 @@ address {
     text-decoration: none;
 }
 
+#aside_primary {
+    width: 280px;
+    padding-left: 10px;
+}
+
+#aside_primary .section {
+    width: 270px;
+    margin-left: 0px;
+    margin-right: 10px;
+}
+
+.section ul.entities {
+    width: 290px;
+}
+
+.section .entities li {
+        margin-right: 17px;
+        margin-bottom: 10px;
+        width: 24px;
+}
+
 .notice {
     line-height: 1.35em;
 }
@@ -161,36 +209,48 @@ address {
     min-height: 26px;
 }
 
-#showstream .notice .entry-title {
-    min-height: 0px;
-}
-
 #shownotice .notice .entry-title {
     min-height:123px;
 }
 
-.user_in .notice div.entry-content {
-    max-width: 360px;
+.notice div.entry-content {
+    font-size: 0.9em;
+    line-height: 1.2em;
+    margin-top: 10px;
     opacity: 0.6;
 }
 
-.user_in .notice div.entry-content:hover {
+.notice:hover div.entry-content {
     opacity: 1;
 }
 
-.notice div.entry-content {
-    font-size: 0.9em;
-    line-height: 1.2em;
-    margin-top: 10px;
+.user_in .notice div.entry-content {
+    max-width: 360px;
+}
+
+div.entry-content a.response:before {
+	content: "(";
+}
+
+div.entry-content a.response:after {
+	content: ")";
 }
 
 .notice-options {
-    margin-top: 6px;
+    margin-top: 8px;
 }
 
 .pagination {
     height: 1.2em;
 }
 
-}/*end of @media screen, projection, tv*/
+#jOverlayContent button {
+    top: 20px;
+    right: 36px;
+}
 
+.entity_profile {
+    width: 365px;
+}
+
+}/*end of @media screen, projection, tv*/
diff --git a/theme/clean/css/ie.css b/theme/clean/css/ie.css
index ede8f078a..80c4dccba 100644
--- a/theme/clean/css/ie.css
+++ b/theme/clean/css/ie.css
@@ -1,13 +1,11 @@
-/* IE specific styles */
-
-/* base theme overrides */
+/* Temporary copy of base styles for overriding */
 
 input.checkbox,
 input.radio {
 top:0;
 }
 .form_notice textarea {
-    width: 364px;
+    width: 362px;
 }
 .form_notice .form_note + label {
 position:absolute;
@@ -17,8 +15,8 @@ text-indent:-9999px;
 height:16px;
 width:16px;
 display:block;
-        top: 31px;
-        right: 88px;
+    left: 390px;
+    top: 27px;
 }
 .form_notice #notice_action-submit {
     width: 96px;
@@ -57,6 +55,23 @@ z-index:9999;
 line-height:auto;
 }
 
+/* IE specific styles */
+
+.notice-options input.submit {
+    color:#FFFFFF;
+}
+
 .form_notice #notice_data-attach {
-filter: alpha(opacity=0);
+    filter: alpha(opacity=0);
+}
+
+.form_notice .form_note + label {
+    background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -328px;
+}
+
+.form_notice #notice_data-geo_wrap label {
+   background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1780px;
+}
+.form_notice #notice_data-geo_wrap label.checked {
+   background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1846px;
 }
diff --git a/theme/clean/css/mp-screen.css b/theme/clean/css/mp-screen.css
index c9fb6dcc4..d544fcb76 100644
--- a/theme/clean/css/mp-screen.css
+++ b/theme/clean/css/mp-screen.css
@@ -1,7 +1,191 @@
-/* just a placeholder for now */
+/* mobile style */
+
+body {
+    background-image: none;
+    min-width: 0;
+}
+
+#wrap {
+    margin: 0;
+    padding: 0;
+    min-width:0;
+    max-width:100%;
+}
+
+#header {
+    width: 96%;
+    padding: 0 2%;
+    padding-top: 20px;
+}
+
+.user_in #header {
+    padding-top: 40px;
+}
+
+address {
+margin:1em 0 0 0;
+float:left;
+width:100%;
+}
 
 address img + .fn {
 display:block;
 margin-top:1em;
+    margin-right: 10px;
+clear: left;
 float:left;
 }
+
+#site_nav_global_primary {
+    margin:0;
+    width: 98%;
+    padding: 4px 0;
+    margin-left: -2%;
+    height: auto;
+    position:absolute;
+    top:0;
+    left:0;
+    font-size: 1em;
+	letter-spacing: 0em;
+}
+
+#site_nav_global_primary li {
+    margin-left:0;
+    margin-right:10px;
+    float:left;
+    font-size:0.9em;
+    padding: 2px 4px;
+    line-height: 1em;
+}
+
+.form_notice {
+    float: left;
+    margin-left: -10px;
+    width: 300px;
+    padding: 4px;
+}
+
+#form_notice-direct.form_notice {
+    padding-top: 10px;
+}
+
+.form_notice textarea {
+    width: 210px;
+    height: 50px;
+    padding: 4px;
+}
+
+#notice_text-count {
+position:absolute;
+bottom:2px;
+    left: 175px;
+    font-size: 0.8em;
+z-index:9;
+}
+
+#form_notice-direct.form_notice #notice_text-count {
+    left: 0px;
+}
+
+/*input type=file no good in
+iPhone/iPod Touch, Android, Opera Mini Simulator
+*/
+.form_notice #notice_text-count + label,
+.form_notice label[for="notice_data-attach"] {
+display:none;
+}
+.form_notice #notice_data-attach {
+position:static;
+clear:both;
+width:65%;
+height:auto;
+display:block;
+z-index:9;
+padding:0;
+margin:0;
+background:none;
+opacity:1;
+}
+
+.form_notice #notice_action-submit {
+    text-align: center;
+    left: 230px;
+    top: 32px;
+    width: 70px;
+    font-size: 0.8em;
+}
+
+#form_notice-direct.form_notice #notice_action-submit {
+    top: 62px;
+}
+
+#site_nav_local_views {
+    height: auto;
+    font-size: 0.9em;
+    line-height: 2em;
+    margin-bottom: 0px;
+    padding-left: 4px;
+}
+
+#site_nav_local_views li {
+    margin-right: 6px;
+}
+
+
+#core {
+    width: 100%;
+    margin: 0;
+}
+
+#content {
+    width: 96%;
+    padding: 10px 2%;
+    margin: 0;
+    min-height: auto;
+}
+
+#footer {
+    margin: 0;
+    padding: 10px 4px 4px 4px;
+}
+
+
+.form_settings fieldset {
+margin-bottom:7px;
+}
+
+.form_settings label {
+width:auto;
+display:block;
+float:none;
+    text-align: left;
+}
+
+.form_settings .form_data li {
+margin-bottom:7px;
+}
+
+.form_settings .form_data textarea,
+.form_settings .form_data select, 
+.form_settings .form_data input {
+margin-left:0;
+display:block;
+}
+.form_settings .form_data textarea {
+width:96.41%;
+}
+
+.form_settings .form_data label {
+float:none;
+}
+
+.form_settings .form_data p.form_guide {
+width:auto;
+margin-left:0;
+}
+
+
+#settings_design_color .form_data {
+ width: auto;
+ margin-right: 0;
+}