From 37bb0e6d20a41cf239958ce431ab9276e97c2127 Mon Sep 17 00:00:00 2001 From: Samantha Doherty Date: Fri, 26 Aug 2011 12:51:55 -0400 Subject: [PATCH] Style cleanup for ostatus forms. --- plugins/OStatus/theme/base/css/ostatus.css | 75 ++++++---------------- theme/base/css/display.css | 49 +------------- theme/neo/css/display.css | 36 +++++------ 3 files changed, 40 insertions(+), 120 deletions(-) diff --git a/plugins/OStatus/theme/base/css/ostatus.css b/plugins/OStatus/theme/base/css/ostatus.css index c2d724158f..f8d708d81f 100644 --- 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 - * @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; + display: none; } -#form_ostatus_connect.dialogbox .submit_dialogbox, -#form_ostatus_sub.dialogbox .submit_dialogbox { -min-width:96px; +#form_ostatus_connect.dialogbox input.submit_dialogbox, +#form_ostatus_sub.dialogbox input.submit_dialogbox { + padding: 4px; } -#entity_remote_subscribe { -padding:0; -float:right; -position:relative; +.entity_remote_tag { + background-position: 5px -257px; } -.section .entity_actions { -margin-bottom:0; -margin-right:7px; -} - -#entity_remote_subscribe .dialogbox { -width:405px; -} - -.aside #entity_subscriptions .more, -.aside #entity_groups .more { -float:left; -} - -.section #entity_remote_subscribe { -border:0; -} - -.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 149fb323b7..6b7629d4aa 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1517,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, @@ -1759,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; @@ -1772,6 +1725,8 @@ display:block; } .entity_actions a { +text-decoration:none; +display:block; padding: 3px 4px 4px 28px; } diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css index f472401007..9082687442 100644 --- 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_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 .dialogbox { - border: 1px solid #7B4E82; - border-radius: 8px; - -moz-border-radius: 8px; - -webkit-border-radius: 8px; -} - -#entity_remote_subscribe input { - padding-left: 4px; -} - -#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);