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

diff --git a/plugins/OStatus/theme/base/css/ostatus.css b/plugins/OStatus/theme/base/css/ostatus.css
index c2d724158fdcdfb9d9ee7edf5b965ee8e6a0b167..f8d708d81f2ecf27734b7e91543033b437e0b4ed 100644 (file)
--- a/plugins/OStatus/theme/base/css/ostatus.css
+++ b/plugins/OStatus/theme/base/css/ostatus.css
@@ -1,74 +1,39 @@
-/** theme: base for OStatus
- *
- * @package   StatusNet
- * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-#form_ostatus_connect.dialogbox,
-#form_ostatus_sub.dialogbox {
-width:70%;
-background-image:none;
-}
-#form_ostatus_sub.dialogbox {
-width:65%;
-}
 #form_ostatus_connect.dialogbox .form_data label,
 #form_ostatus_sub.dialogbox .form_data label {
-width:34%;
+    display: block;
+    width: 100%;
+    text-align: left;
 }
+
 #form_ostatus_connect.dialogbox .form_data input,
 #form_ostatus_sub.dialogbox .form_data input {
-width:57%;
+    width: 90%;
+    padding: 4px;
+    margin: 0;
+    background-color: #fff !important;
+    border: 1px solid #888;
 }
+
 #form_ostatus_connect.dialogbox .form_data .form_guide,
 #form_ostatus_sub.dialogbox .form_data .form_guide {
-margin-left:36%;
+    margin-left: 0;
+    background-color: #fff !important;
 }
 
 #form_ostatus_connect.dialogbox #ostatus_nickname,
 #form_ostatus_sub.dialogbox #ostatus_nickname {
-display:none;
-}
-
-#form_ostatus_connect.dialogbox .submit_dialogbox,
-#form_ostatus_sub.dialogbox .submit_dialogbox {
-min-width:96px;
-}
-
-#entity_remote_subscribe {
-padding:0;
-float:right;
-position:relative;
-}
-
-.section .entity_actions {
-margin-bottom:0;
-margin-right:7px;
-}
-
-#entity_remote_subscribe .dialogbox {
-width:405px;
+    display: none;
 }
 
-.aside #entity_subscriptions .more,
-.aside #entity_groups .more {
-float:left;
+#form_ostatus_connect.dialogbox input.submit_dialogbox,
+#form_ostatus_sub.dialogbox input.submit_dialogbox {
+    padding: 4px;
 }
 
-.section #entity_remote_subscribe {
-border:0;
+.entity_remote_tag {
+    background-position: 5px -257px;
 }
 
-.section .entity_remote_subscribe {
-color:#002FA7;
-box-shadow:none;
--moz-box-shadow:none;
--webkit-box-shadow:none;
-background-color:transparent;
-background-position:0 -1183px;
-padding:0 0 0 23px;
-border:0;
+.section .entity_remote_tag {
+    background-position: 5px -257px;
 }

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 52bf7f19edcf9a012d899b34a2ed255081a034fb..6b7629d4aad50fb62f3b9b19e85d9831d1b1e7c5 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1346,6 +1346,7 @@ margin-left:11px;
 .form_settings .form_data li {
 width:100%;
 float:left;
+    margin-bottom: 22px;
 }
 .form_settings .form_data label {
 float:left;
@@ -1356,6 +1357,12 @@ float:left;
 margin-left:1.795%;
 float:left;
 }
+
+.form_settings .form_data select {
+    margin-top: 0px;
+}
+
+
 .form_settings .form_data input {
 width:39%;
 }
@@ -1374,17 +1381,13 @@ margin-left:0;
 
 .form_settings label {
 margin-top:2px;
-width:24%;
+    width: 25%;
     text-align: right;
 }
 
-.form_settings label.checkbox {
-    text-align: left;
-}
-
 .form_settings input.checkbox, .form_settings input.radio {
-    margin-left: 24%;
-    margin-top: 2px;
+    margin-left: 25%;
+    margin-top: 3px;
     position: relative;
     left: -14px;
 }
@@ -1393,17 +1396,21 @@ width:24%;
     width: auto;
     max-width: 60%;
     position: relative;
-    left: -30px;
+    left: -25px;
 }
 
-.form_settings li input.radio {
-    clear: left;
+.form_settings label.checkbox {
+    text-align: left;
+    line-height: 1.2em;
 }
 
 .form_settings label.radio {
-    margin-left: 10px;
-    margin-right: 10px;
     text-align: left;
+    margin: 0px;
+}
+
+.form_settings li input.radio {
+    clear: left;
 }
 
 .form_actions label {
@@ -1457,43 +1464,16 @@ width:50px;
 
 .form_settings .form_data p.form_guide {
 clear:both;
-margin-left:26%;
+    margin-left: 27%;
 margin-bottom:0;
+    line-height: 1.2em;
+    padding-top: 4px;
 }
 
 .form_settings p {
 margin-bottom:11px;
 }
 
-.form_settings input.checkbox,
-.form_settings input.radio {
-margin-top:3px;
-margin-left:0;
-}
-.form_settings label.checkbox {
-font-weight:normal;
-margin-top:0;
-margin-right:0;
-margin-left:11px;
-float:left;
-width:90%;
-}
-.form_settings label.radio {
-margin-top:0;
-margin-right:47px;
-margin-left:11px;
-width:auto;
-}
-
-#form_login p.form_guide,
-#form_register #settings_rememberme p.form_guide,
-#form_openid_login #settings_rememberme p.form_guide,
-#settings_twitter_remove p.form_guide,
-#form_search ul.form_data #q,
-#design_background-image_onoff p.form_guide {
-margin-left:0;
-}
-
 .form_settings .form_note {
 border-radius:4px;
 -moz-border-radius:4px;
@@ -1537,48 +1517,6 @@ span.rtl {
     float: right;
 } 
 
-/* override OStatus plugin style */
-
-#form_ostatus_connect.form_settings.dialogbox, #form_ostatus_sub.dialogbox {
-    width: 76%;
-}
-
-#form_ostatus_connect.form_settings.dialogbox legend {
-    font-size: 1.4em;
-    font-weight: normal;
-    padding-bottom: 10px;    
-}
-
-#form_ostatus_connect.dialogbox .form_data label,
-#form_ostatus_sub.dialogbox .form_data label {
-    font-weight: normal;
-    font-size: 1.2em;
-    width:34%;
-}
-
-#form_ostatus_connect.dialogbox .form_data input,
-#form_ostatus_sub.dialogbox .form_data input {
-    float: right;
-    width: 52% !important;
-}
-
-#form_ostatus_connect.dialogbox .form_data .form_guide,
-#form_ostatus_sub.dialogbox .form_data .form_guide {
-    background: none !important;
-    text-align: right;
-    margin-right: 16px;
-}
-
-.section .entity_actions {
-    margin-right: 0px !important;
-}
-
-.section .entity_remote_subscribe {
-    color:#000 !important;
-    padding-left: 26px !important;
-    background-position: 4px -1183px !important;
-}
-
 #filter_tags ul li,
 .entity_send-a-message .form_notice,
 .form_settings fieldset fieldset,
@@ -1593,7 +1531,7 @@ background:none;
 }
 
 .form_settings .form_note {
-background-color:#9BB43E;
+    background-color: #d1f7cb;
 }
 
 #form_settings_photo .form_data {
@@ -1779,11 +1717,6 @@ display:block;
 text-align:left;
 width:100%;
 }
-.entity_actions a {
-text-decoration:none;
-font-weight:bold;
-display:block;
-}
 
 .entity_actions a, .entity_actions input, .entity_actions p {
     color: #333 !important;
@@ -1792,6 +1725,8 @@ display:block;
 }
 
 .entity_actions a {
+text-decoration:none;
+display:block;
     padding: 3px 4px 4px 28px;
 }
 
@@ -2187,8 +2122,8 @@ width:68%;
 #showapplication .entity_profile .entity_fn {
 margin-left:0;
 }
-#showapplication .entity_profile .entity_fn .fn:before,
-#showapplication .entity_profile .entity_fn .fn:after {
+#showapplication .entity_profile .fn:before,
+#showapplication .entity_profile .fn:after {
 content:'';
 }
 #showapplication .entity_data {

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index e41cf9f87a3fd2d9bbf2ed54acb9b498fd4867a2..9082687442a1925dcb05ba9001964c8406c1b7c4 100644 (file)
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -519,24 +519,18 @@ div.entry-content a.response:after {
     top: 46px;
 }
 
-#aside_primary #entity_remote_subscribe a:hover {
-    background-color: #fff !important;
-}
-
-#entity_remote_subscribe .dialogbox {
-    border: 1px solid #7B4E82;
-    border-radius: 8px;
-       -moz-border-radius: 8px;
-       -webkit-border-radius: 8px;
-}
-
-#entity_remote_subscribe input {
-    padding-left: 4px;
+.entity_subscribe .dialogbox, .entity_tag .dialogbox {
+    border: 1px solid #aaa;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
+    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
+    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
 }
 
-#entity_remote_subscribe .submit_dialogbox {
-    margin-top: 10px;
-    float: right;
+.entity_subscribe .dialogbox input.submit_dialogbox, .entity_tag .dialogbox input.submit_dialogbox {
+    color: #fff !important;
 }
 
 #filter_tags_item .submit {
@@ -572,7 +566,10 @@ div.entry-content a.response:after {
 }
 
 
-.form_notice input.submit, .form_settings input.submit, .form_settings input.cancel, #form_invite input.submit {
+.form_notice input.submit, .form_settings input.submit, .form_settings input.cancel, #form_invite input.submit,
+.entity_subscribe .dialogbox input.submit_dialogbox,
+.entity_tag .dialogbox input.submit_dialogbox
+ {
     height: 1.9em;
     padding: 0px 10px;
     color:#fff;
@@ -590,7 +587,10 @@ div.entry-content a.response:after {
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 );
 }
 
-.form_notice input.submit:hover, .form_settings input.submit:hover, .form_settings input.cancel:hover, #form_invite input.submit:hover {
+.form_notice input.submit:hover, .form_settings input.submit:hover, .form_settings input.cancel:hover, #form_invite input.submit:hover,
+.entity_subscribe .dialogbox input.submit_dialogbox:hover,
+.entity_tag .dialogbox input.submit_dialogbox:hover
+ {
     text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
     background: #ff9d63;
     background: -moz-linear-gradient(top, #FB6104 , #fc8035);
@@ -598,20 +598,16 @@ div.entry-content a.response:after {
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
 }
 
-.form_settings input#settings_design_reset, .form_settings input.cancel {
-    background: #e2e2e2;
-    color: #8e181b;
-    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
-}
-
-.form_settings input#settings_design_reset:hover, .form_settings input.cancel:hover {
+.form_settings input#settings_design_reset, .form_settings input#cancel, #form_action-no {
     background: #f2f2f2;
-    color: #8e181b;
+    color: #d7621c;
     text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
 }
 
-#form_login p.form_guide, #form_register #settings_rememberme p.form_guide, #form_openid_login #settings_rememberme p.form_guide, #settings_twitter_remove p.form_guide, #design_background-image_onoff p.form_guide {
-    margin-left: 26%;
+.form_settings input#settings_design_reset:hover, .form_settings input#cancel:hover, #form_action-no:hover {
+    background: #fff;
+    color: #d7621c;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
 }
 
 .form_settings fieldset fieldset {