Big round of fixups for base and neo themes.

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index c9655d52c06c75b46e29fbb127d4e13063dadc35..20dd142d67763d4466e2dba3178efedb9e671422 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1,8 +1,8 @@
-/** theme: rebase
+/** theme: base
  *
  * @package   StatusNet
  * @author    Samantha Doherty <sammy@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
@@ -23,16 +23,14 @@ input, textarea, select, option {padding: 2px;}
 textarea {overflow:auto;}
 
 body {
-    background-color: #ffffff;
+    background-color: #f2f2f2;
     color: #000;
-    font-family: sans-serif;
-    font-size: 100%;
-    line-height: 1.4;
-    min-width: 700px;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: 14px;
+    line-height: 1.6;
 }
 
 a {
-    color: #00008c; 
     text-decoration: none; 
     outline: none;
 }
@@ -67,7 +65,7 @@ p {
 }
 
 input, textarea, select, option {
-    font-family: "DejaVu Sans", "Bitstream Vera Sans", Geneva, Verdana, sans-serif;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     font-size: 1em;
 }
 
@@ -82,63 +80,109 @@ option {
 }
 
 #wrap {
-    width: 92%;
-    margin-left: 4%;
-    margin-right: 4%;
     position: relative;
+    width: 960px;
+    margin: 0px auto;
+    background-color: #fff;
+    border-left: 10px solid #fff;
+    border-right: 10px solid #fff;
+    padding-top: 10px;
 }
 
-#header { 
-    padding: 1%;
+#header {
     position: relative;
+    width: 960px;
+    padding: 0px
 }
 
 #core {
-       display:inline;
-       float: left;
-       position: relative;
-       margin-left: 1%;
-       margin-right: 1%;
-    width: 98%;
+    position: relative;
+    float: left;
+    clear: both;
+    margin: 0px;
+    width: 958px;
+    border-top: 5px solid #ccc;
+    border-left: 1px solid #ccc;
+    border-right: 1px solid #ccc;
+}
+
+#aside_primary_wrapper {
+    width: 100%;
+    float: left;
+    overflow: hidden;
+    position: relative;
+    background-color: #f2f2f2;  
+}    
+
+#content_wrapper  {  
+    width: 100%;  
+    float: left;
+    position: relative;  
+    right: 239px; 
+    background-color: #fff;  
+    border-right: 1px solid #ccc;
+}  
+
+#site_nav_local_views_wrapper  {  
+    width: 100%;  
+    float: left;
+    position: relative;  
+    right: 561px;
+    background-color: #f2f2f2;  
+    border-right: 1px solid #ccc;
+} 
+
+#site_nav_local_views {
+    width: 138px;
+    float: left;
+    overflow: hidden;
+    position: relative;
+    left: 800px;
+    margin: 0px 0px 20px 0px;
+    padding: 22px 10px 40px 10px;
 }
 
 #content {
-    margin-bottom: 20px;
+    width: 520px;
+    float: left;
+    overflow: hidden;
+    position: relative;
+    left: 801px;
+    margin: 0px;
+    padding: 20px 20px 40px 20px;
     background-color: #fff;
-       display:inline;
-       float: left;
-       position: relative;
-    min-height: 300px;
-    width: 64.667%;
-    margin-right: 2%;
 }
 
 #aside_primary {
-       display: inline;
-       float: right;
-       position: relative;
-    width: 33.333%;
-    padding-top: 15px;
-    background: #f2f2f2;
-    margin-bottom: 20px;
-}
-
-#aside_primary .section {
-    margin: 0px 2% 20px 2%;
-    position: relative;
-    width: 96%;
+    width: 218px;
     float: left;
-    clear: both;
+    overflow: hidden;
+    position: relative;
+    left: 802px;
+    padding: 22px 10px 40px 10px;
+    margin: 0px 0px 20px 0px;
 }
 
-body[id$=adminpanel] #aside_primary {
-    display:none;
+#footer {
+    clear: both;
+    position: relative;
+    width: 940px;
+    background-color: #ccc;
+    padding: 10px;
 }
 
 /* header elements */
 
-address { 
-    margin-bottom: 10px;
+address {
+    float: left;
+    position: relative;
+    top: 1px;
+    left: 2px;
+    margin: 0px;
+    padding: 0px;
+    height: 24px;
+    width: 148px;
+    z-index: 99;
 }
 
 address img + .fn {
@@ -150,174 +194,216 @@ address .poweredby {
     width: auto;
 }
 
-#site_nav_global_primary { 
-    margin: 20px 0px 20px 0px;
+#site_nav_global_primary {
+    display: block;
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 800px;
+    margin: 0px;
+    height: 24px;
+    line-height: 20px;
 }
 
-#site_nav_global_primary dt {
-    display: none;
+#site_nav_global_primary ul {
+    float: right;
 }
 
 #site_nav_global_primary li {
     display: inline;
-    margin-right: 20px;
+    margin-right: 10px;
+}
+
+#site_nav_global_primary li:last-child {
+    margin-right: 0px;
 }
 
 #site_notice { 
-    padding: 1%;
+    float: right;
+    width: 300px;
+    margin: 26px 0px 4px 0px;
+    padding: 10px;
     background-color: #f2f2f2;
-    margin-bottom: 10px;    
 }
 
 #site_notice p {
     margin-bottom: 0px;
 }
 
-#site_notice ul {
-    margin-left: 15px;
+/* input forms */
+
+.input_forms {
+    float: left;
+    position: relative;
+    margin-bottom: 10px;
+    border-bottom: 1px dotted #ccc;
 }
 
-#anon_notice { 
-    padding: 1%;
-    background-color: #ccc;   
-    margin-bottom: 10px; 
+#input_form_nav {
+    float: left;
+    width: 100%;
+    margin-bottom: 10px;
+    list-style-type: none;
 }
 
-#anon_notice p {
-    margin-bottom: 0px;
+#input_form_nav li { 
+    display: inline;
 }
 
-/* new notice & direct message forms */
+#input_form_nav li a {
+    margin-right: 10px;
+}
+
+.input_form_nav_tab.current a {
+    text-decoration: underline;
+}
+
+.input_form { 
+    position: relative;
+    float: left;
+    width: 520px;
+    padding-bottom: 20px;
+    display: none;
+}
+
+.input_form.current { 
+    display: block;
+}
+
+#input_form_status, #input_form_direct {
+    padding-bottom: 50px;
+}
 
 .form_notice { 
-    background: #ccc;
     margin-bottom: 10px;
-    padding: 1%;
 }
 
 .form_notice fieldset {
-    border: 0;
-       position: relative;
-    width: 620px;
+    width: auto;
 }
 
 .form_notice legend {
     display: none;
-}    
+}
+
+.form_notice #notice_data-text-label { /* XXX remove? */
+    display: none;
+}
+
+.form_notice_placeholder .placeholder {
+    width: 508px;
+    padding: 4px 4px 4px 6px;
+    border: 1px solid #a6a6a6;
+    z-index: 97;
+    font-size: 1em;
+    color: #888;
+}
 
 .form_notice textarea {
     clear: left;
     float: left;
-    padding: 10px;
-    border: none;
     position: relative;
-    width: 485px;
-    height: 60px;
-    padding-bottom: 18px;
-    z-index: 9;
+    width: 483px;
+    height: 42px;
+    padding: 6px 5px 18px 5px;
+    border: 1px solid #a6a6a6;
+    z-index: 97;
+    font-size: 1.2em;
 }
 
-.form_notice label[for=notice_data-text] {
-    float: left;
-    font-weight: normal;
-    font-size: 1.2em;
-    margin-bottom: 0.2em;
-    opacity: 1;
-    color: #333 !important;
+#form_notice-direct.form_notice textarea {
+    width: 508px;
 }
 
 .form_notice label.notice_data-attach,
 .form_notice input.notice_data-attach {
-    position:absolute;
-    cursor:pointer;
+    position: absolute;
+    cursor: pointer;
 }
 .form_notice label.notice_data-attach {
-    top: 31px;
-    right: 88px;
+    top: 0px;
+    right: 0px;
+    z-index: 96;
+    text-indent: -9999px;
+    width: 16px;
+    height: 16px;
 }
+
 .form_notice input.notice_data-attach {
-    /* Positioned inside the label */
     top: 0;
     right: 0;
+    padding:0;
+    height:16px;
 }
 
-.form_notice label.notice_data-attach {
+.form_notice .notice_data-geo_wrap label,
+.form_notice .notice_data-geo_wrap input {
+    position: absolute;
+    top: 26px;
+    right: 0px;
+    cursor: pointer;
+    width: 16px;
+    height: 16px;
+    display: block;
+    z-index: 99;
+}
+
+.form_notice .notice_data-geo_wrap input {
+    visibility:hidden;
+}
+
+.form_notice .notice_data-geo_wrap label {
+    font-weight:normal;
+    font-size:1em;
+    margin-bottom:0;
     text-indent:-9999px;
-    width:16px;
-    height:16px;
 }
 
-.form_notice input.notice_data-attach {
-    padding:0;
-    height:16px;
+.form_notice label {
+    opacity: 0.6;
 }
 
-.form_notice .count {
-    position: absolute;
-    bottom: 0px;
-    right: 125px;
-    z-index: 9;
-    font-size: 0.8em; 
+.form_notice label:hover {
+    opacity: 1;
 }
 
-.form_notice .count dt {
-    display:none;
+.form_notice input.notice_data-attach {
+    opacity: 0;
 }
 
 .form_notice .count {
+    position: absolute;
+    top: 50px;
+    right: 32px;
+    z-index: 99;
+    font-size: 0.8em;
+    height: 1em; 
     color: #777;
 }
 
 .form_notice.warning .count {
     color: #ff0000;
-}        
-
-.form_notice .submit {
-    padding:0;
-    position:absolute;
-    right:0;
-    top: 81px;
-    height: 2.4em;
-    width: 106px;
 }
 
-.form_notice label[for=to] {
-    margin-top: 0px;
-    float: left;
-    font-size: 1.2em;
-    font-weight: normal;
-    color: #333 !important;
+#form_notice-direct.form_notice .count {
+    top: 84px;
+    right: 7px;
 }
-
-.form_notice select[id=to] {
-    margin-bottom: 4px;
-    margin-top: -4px;
-    margin-left:18px;
-    float:left;
-    max-width:322px;
-}
-
+    
 .form_notice .error,
 .form_notice .success,
 .form_notice .notice-status {
-    clear: left;
-    float: left;
+    position: relative;
     overflow: auto;
     line-height: 1.2em;
-    padding: 2px 2px 2px 5px;
-    width: 498px;
-    border: 2px solid #ccc;
-    margin-left: -2px;
-}
-
-.form_notice .attach-status code {
-    font-size: 1.2em;
+    padding: 5px 5px 5px 10px;
+    margin: 10px 0px 0px 0px;
+    width: 478px;
+    border: 1px solid #ccc;
 }
 
 .form_notice .error {
-    border: none;
-    width: 502px;
-    padding: 6px 2px 6px 5px;
+    border: 1px solid #d05858;
 }
 
 .form_notice .attach-status button.close,
@@ -326,68 +412,191 @@ address .poweredby {
     font-size:0.8em;
 }
 
-.form_notice .notice_data-geo_wrap label,
-.form_notice .notice_data-geo_wrap input {
-    position:absolute;
-    top: 55px;
-    right: 88px;
-    left:auto;
-    cursor:pointer;
-    width:16px;
-    height:16px;
-    display:block;
+.input_form .form_settings fieldset {
+    margin: 0px;
+    padding: 0px;
 }
 
-.form_notice .notice_data-geo_wrap input {
-    visibility:hidden;
+.input_form .form_settings fieldset fieldset {
+    width: 400px;
+    float: left;
+    background: none;
+    border: none;
+    margin-bottom: 0px;
+    padding: 0px;
 }
 
-.form_notice .notice_data-geo_wrap label {
-    font-weight:normal;
-    font-size:1em;
-    margin-bottom:0;
-    text-indent:-9999px;
+.input_form .form_settings .form_data li {
+    position: relative;
+    margin-bottom: 12px;
 }
 
-.form_notice label {
-    opacity: 0.6;
+.input_form fieldset fieldset label {
+    position: absolute;
+    top: 0;
+    left: 6px;
+    float: none;
+    text-align: left;
+    color: #888;
+    cursor: text;
+    background: #fff;
 }
 
-.form_notice label:hover {
-    opacity: 1;
+.input_form .form_settings li input {
+    width: 388px;
+    margin-left: 0;
+    margin-right: 0;
+    padding: 4px 5px 4px 5px;
+    border: 1px solid #a6a6a6;
+    font-size: 1em;
 }
 
-.form_notice input.notice_data-attach {
-    opacity:0;
+.input_form .form_settings li textarea {
+    width: 388px;
+    margin-left: 0;
+    padding: 4px 5px 4px 5px;
+    border: 1px solid #a6a6a6;
+    z-index: 97;
+    font-size: 1em;
+}
+
+.input_form .form_settings .form_data p.form_guide {
+    margin-left: 5px;
+}
+
+.form_notice label[for=to] {
+    float: left;
+}
+
+.form_notice select[id=to] {
+    float:left;
+    margin: -4px 0px 10px 10px;
+    max-width: 450px;
 }
 
 .form_notice .to-selector { 
-    clear:left;
+    clear: left;
+    padding-top: 15px;
+    z-index: 99;
 }
 
-/* Local navigation */
+.form_settings label[for=notice_to] {
+    left: 5px;
+    margin-left: 0px;
+    margin-right: 10px;
+    position: relative;
+    clear: left;
+    background: none;
+}
 
-#site_nav_local_views { 
-    margin-bottom: 20px;
+.checkbox-wrapper {
+    padding: 2px;
+    margin-left: 10px;
 }
 
-#site_nav_local_views dt {
-    display: none;
+.form_notice .checkbox-wrapper {
+    display: inline;
+    margin-left: 10px;
+}
+
+.form_settings .checkbox-wrapper label.checkbox {
+    margin-left: 0px;
+    margin-top: 6px;
+    line-height: 1.2em;
+    left: -3px;
+    float: none;
+}
+
+.checkbox-wrapper #notice_private {
+    display:none;
+}
+
+.checkbox-wrapper.unchecked label.checkbox {
+    padding-left: 20px;
+    background: url(../images/lock_open.png) no-repeat 0px 0px;
+    opacity: 0.6;
+}
+
+.checkbox-wrapper.unchecked label.checkbox:hover {
+    opacity: 1;
+    cursor: pointer;
+}
+
+.checkbox-wrapper.checked label.checkbox {
+    padding-left: 20px;
+    background: url(../images/lock.png) no-repeat 0px 0px;
+    color: red;
+    opacity: 1;
 }
 
+.checkbox-wrapper.checked label.checkbox:hover {
+    cursor: pointer;
+}
+
+.form_notice input.submit {
+    position: absolute;
+    top: 100%;
+    left: 0px;
+    margin-top: -49px;
+    float: left;
+    width: 100px;
+    padding: 0px;
+    z-index: 99;
+}
+
+.input_form .form_settings .submit {
+    position: relative;
+    top: 0;
+    right: 0;
+    float: right;   
+    width: 100px;
+    height: 26px;
+    line-height: 26px;
+    padding: 0px 10px;
+    margin: 0px;
+    z-index: 1;
+}
+
+/* site nav local views */
+
+
 #site_nav_local_views li {
-    display: inline;
-    margin-right: 20px;
+    display: block;
+    margin: 0px 0px 8px 0px;
+}
+
+#site_nav_local_views li ul {
+    margin-bottom: 20px;
+}
+
+#site_nav_local_views a {
+    word-wrap: break-word;
 }
 
 #site_nav_local_views .current a {
     text-decoration: underline;
 }
 
+
+/* aside primary */
+
+#aside_primary .section {
+    position: relative;
+    float: left;
+    clear: both;
+    width: 100%;
+    margin-bottom: 20px;
+}
+
+body[id$=adminpanel] #aside_primary {
+    display:none;
+}
+
+
 /* notices */
 
 #notices_primary {
-    padding-top: 8px;
+    padding-top: 3px;
     clear: both;
 }
 
@@ -397,10 +606,10 @@ address .poweredby {
 
 .notice {
     list-style-type: none;
-    margin-bottom: 25px;
+    margin-bottom: 10px;
     clear: left;
-    min-height: 54px;
     padding-bottom: 2px;
+    line-height: 1.36em;
 }
 
 .notice, .profile, .application, #content .peopletag {
@@ -434,13 +643,14 @@ address .poweredby {
 
 #content .notice .author .photo {
     position: absolute;
-    top: 4px;
-    left: 4px;
+    top: 7px;
+    left: 0px;
     float: none;
 }
 
 #content .notice .entry-title {
     margin: 2px 7px 0px 59px;
+    min-height: 35px;
 }
 
 .vcard .url {
@@ -471,6 +681,10 @@ font-style:italic;
     margin-left: 0;
 }
 
+#showstream .notice .entry-title {
+    min-height: 1px;
+}
+
 #showstream #content .notice .author {
     display: none;
 }
@@ -609,7 +823,7 @@ clear:both;
 
 #jOverlayContent,
 #jOverlayContent #content,
-#jOverlayContent #content_inner {
+#jOverlayContent #content_inner { /* XXX still needed? */
 width: auto !important;
 margin-bottom:0;
 }
@@ -654,26 +868,133 @@ font-weight:bold;
 content: ":";
 }
 
-#content .notice .notice {
-    width: 98%;
-    margin-left: 2%;
-    margin-top: 16px;
+/* threaded replies */
+
+.threaded-replies {
+    clear: both;
+    float: left;
+    width: 458px;
+    margin-left: 59px;
+    margin-top: 10px;
     margin-bottom: 10px;
+    padding-right: 2px;
+    border-left: 3px solid #ECECF2;
+    background: #fafafa;
+    color: #222;
+    font-size: 1em;
+}
+
+.threaded-replies:empty {
+    display: none;
+}
+
+.user_in .threaded-replies {
+    margin-top: 0px;
+}
+
+#content .notice .threaded-replies .notice,
+#content .notice .threaded-replies .notice-data { 
+    width: 440px;
+    padding-bottom: 14px;
+    padding-top: 5px;
+    border-bottom: 2px dotted #eee;
+    line-height: 1.36em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    margin-left: 10px;
+    background: none;
 }
 
-.notice .notice {
-background-color:rgba(200, 200, 200, 0.050);
+#content .notice .threaded-replies .entry-title {
+    min-height: 1px;
 }
-.notice .notice .notice {
-background-color:rgba(200, 200, 200, 0.100);
+
+#content .threaded-replies .notice .author .photo {
+    height: 24px;
+    width: 24px;
+    top: 12px;
+}
+
+#content .notice .threaded-replies .notice .entry-title {
+    margin: 2px 7px 0px 35px;
+}
+
+#content .notice .threaded-replies .notice div.entry-content {
+    clear:left;
+    float:left;
+    margin-left: 35px;
+    margin-top: 6px !important;
 }
-.notice .notice .notice .notice {
-background-color:rgba(200, 200, 200, 0.150);
+
+#content .notice .threaded-replies .notice div.entry-content.notice-faves {
+    margin-top: 2px !important;
 }
-.notice .notice .notice .notice .notice {
-background-color:rgba(200, 200, 200, 0.300);
+
+#content .notice .threaded-replies .notice .notice-options {
+    margin-top: 5px;
+    margin-bottom: 0px;
 }
 
+.threaded-replies li {
+    list-style-type: none;
+}
+
+.threaded-replies .notice-reply-comments {
+    margin: 2px 0px 4px 10px;
+}
+
+.threaded-replies .placeholder {
+    margin: 10px;
+    width: 426px;
+    padding: 4px 4px 4px 6px;
+    border: 1px solid #a6a6a6;
+    color: #888;
+}
+
+.threaded-replies .notice-reply {
+    clear: left;
+    position: relative;
+    padding: 10px;
+    padding-bottom: 44px;
+}
+
+.threaded-replies .form_notice textarea {
+    width: 395px;
+}
+
+.threaded-replies .form_notice label.notice_data-attach {
+    top: 10px;
+    right: 10px;
+}
+
+.threaded-replies .form_notice .notice_data-geo_wrap label,
+.threaded-replies .form_notice .notice_data-geo_wrap input {
+    top: 36px;
+    right: 10px;
+}
+
+.threaded-replies .form_notice .count {
+    top: 60px;
+    right: 50px;
+}
+
+.threaded-replies .form_notice #notice_action-submit {
+    left: 10px;
+    margin-top: -44px;
+}
+
+.threaded-replies .form_notice .error,
+.threaded-replies .form_notice .success,
+.threaded-replies .form_notice .notice-status {
+    width: 390px; 
+}
+
+.threaded-replies .to-selector {
+    display: none;
+}
+
+
+
 /* aside primary specific styles */
 
 .aside .section p,
@@ -825,23 +1146,20 @@ display:none;
 
 /* secondary elements */
 
-.processing { 
-background-image:url(../../base/images/icons/icon_processing.gif);
+.processing { /* XXX ? */
+background-image:url(../images/icons/icon_processing.gif);
 background-repeat:no-repeat;
 background-position:47% 47%;
 }
 
-.error {
+.error, .success, .notice-status {
     background-color: #F7E8E8;
+    padding: 4px 10px;
 }
-.success {
+.success, .notice-status {
     background-color: #f2f2f2;
 }
 
-.system_notice dt {
-    display:none;
-}
-
 #page_notice {
 clear:both;
 margin-bottom:18px;
@@ -958,13 +1276,7 @@ text-indent:-9999px;
     float: right;
 }
 
-#footer {
-    clear: both;
-    background-color: #ccc;
-    margin-left: 1%;
-    margin-right: 1%;
-    padding: 1%;
-}
+/* footer elements */
 
 #site_nav_global_secondary dt {
     display: none;
@@ -1068,6 +1380,30 @@ width:24%;
     text-align: left;
 }
 
+.form_settings input.checkbox, .form_settings input.radio {
+    margin-left: 24%;
+    margin-top: 2px;
+    position: relative;
+    left: -14px;
+}
+
+.form_settings label.checkbox, .form_settings label.radio {
+    width: auto;
+    max-width: 60%;
+    position: relative;
+    left: -30px;
+}
+
+.form_settings li input.radio {
+    clear: left;
+}
+
+.form_settings label.radio {
+    margin-left: 10px;
+    margin-right: 10px;
+    text-align: left;
+}
+
 .form_actions label {
 display:none;
 }
@@ -2176,25 +2512,7 @@ margin-bottom:18px;
 padding-left:20px;
 }
 
-#input_form_nav { 
-    list-style-type: none;
-}
 
-#input_form_nav li { 
-    display:inline;
-}
-
-.input_form_nav_tab.current {
-    text-decoration: underline;
-}
-
-.input_form { 
-    display: none;
-}
-
-.input_form.current { 
-    display: block;
-}
 
 .entity_tags li.mode-private {
 color: #829D25;

diff --git a/theme/base/default-avatar-mini.png b/theme/base/default-avatar-mini.png
index 7c9fc0348b7c9e8080a9b3a6e1a30542bfb378ef..3f3f026ab7056c2abb76a6bbc14c3b6e3d1c4c77 100644 (file)
Binary files a/theme/base/default-avatar-mini.png and b/theme/base/default-avatar-mini.png differ

diff --git a/theme/base/default-avatar-profile.png b/theme/base/default-avatar-profile.png
index e8f87006a0d082626a3dadc70ef990fc66c20551..f9addc06b4416eee5d372ac5fff9b6105d3b4255 100644 (file)
Binary files a/theme/base/default-avatar-profile.png and b/theme/base/default-avatar-profile.png differ

diff --git a/theme/base/default-avatar-stream.png b/theme/base/default-avatar-stream.png
index c8148e42ef627fcc7f02bdb8a6bdf4f943cf3f78..e542854e77d8a7655356b430c7ff96dad270cedb 100644 (file)
Binary files a/theme/base/default-avatar-stream.png and b/theme/base/default-avatar-stream.png differ

diff --git a/theme/base/images/lock.png b/theme/base/images/lock.png
new file mode 100644 (file)
index 0000000..2ebc4f6
Binary files /dev/null and b/theme/base/images/lock.png differ

diff --git a/theme/base/images/lock_open.png b/theme/base/images/lock_open.png
new file mode 100644 (file)
index 0000000..a471765
Binary files /dev/null and b/theme/base/images/lock_open.png differ

diff --git a/theme/base/logo.png b/theme/base/logo.png
index b078601019959e5efa1803f29246447d1f1d89a5..389197953086b2d6b50dddd4bc6d7e7dddea6e6c 100644 (file)
Binary files a/theme/base/logo.png and b/theme/base/logo.png differ

diff --git a/theme/base/mobilelogo.png b/theme/base/mobilelogo.png
index 66bb5f67871596723fcd928c80ed5ebc18899a32..cd2e0e7f16d24e832186cf3310dc77c774b29b87 100644 (file)
Binary files a/theme/base/mobilelogo.png and b/theme/base/mobilelogo.png differ

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index ed7c22b1e6cd53103da37bf21e26078f8c099b2d..9c33fe65fb769f1d0e814544b60e32925baa9110 100644 (file)
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -30,18 +30,17 @@
 
 @media screen, projection, tv {
 
+/* general styles and layout */
+
 body {
     background-color: #C6C8CC;
     background-image: url(../images/bg.png);
     font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; 
-    font-size: 14px;
-    line-height: 1.6;
     color: #222;
 }
 
 input, textarea, select, option {
     font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; 
-    font-size: 1em;
 }
 
 a {color: #3e3e8c;}
@@ -57,41 +56,46 @@ h5 {font-size: 1.2em;}
 h6 {font-size: 1em;}
 
 #wrap {
-    width: 960px;
-    margin: 0px auto;
     background: #fff url('../images/brdr_black_dot.png') repeat-x 0px 10px;
-    border-left: 10px solid #fff;
-    border-right: 10px solid #fff;
-    padding-top: 10px;
 }
 
 #header {
-    width: 960px;
-    padding: 0px;
     padding-top: 12px;
 }
 
-address {
-    float: left;
-    position: relative;
-    top: 1px;
-    left: 2px;
-    margin: 0px;
-    padding: 0px;
-    height: 24px;
-    width: 148px;
-    z-index: 99;
+#core {
+    border-top: 5px solid #FB6104;
+    border-left: 1px solid #d8dae6;
+    border-right: 1px solid #d8dae6;
 }
 
+#aside_primary_wrapper {
+    background-color: #ececf2;  
+}    
+
+#content_wrapper  {  
+    border-right: 1px solid #d8dae6;
+}  
+
+#site_nav_local_views_wrapper  {  
+    background-color: #ececf2;  
+    border-right: 1px solid #d8dae6;
+}  
+
+#footer {
+    top: -6px;
+    -webkit-border-top-left-radius: 6px;
+    -webkit-border-top-right-radius: 6px;
+    -moz-border-radius-topleft: 6px;
+    -moz-border-radius-topright: 6px;
+    border-top-left-radius: 6px;
+    border-top-right-radius: 6px;
+}
+
+/* header elements */
+
 #site_nav_global_primary {
-    display: block;
-    position: absolute;
     top: 10px;
-    right: 0;
-    width: 800px;
-    margin: 0px;
-    height: 24px;
-    line-height: 20px;
     -webkit-border-top-right-radius: 6px;
     -moz-border-radius-topright: 6px;
     border-top-right-radius: 6px;
@@ -101,10 +105,6 @@ address {
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 ); /* XXX move all to ie.css */ 
 }
 
-#site_nav_global_primary ul {
-    float: right;
-}
-
 #site_nav_global_primary li {
     margin-right: 0px;
 }
@@ -114,12 +114,12 @@ address {
 }
 
 #site_nav_global_primary a {
-    color: #fff !important;
-    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
     padding: 2px 10px 2px 10px;
     height: 20px;
     display: block;
     float: left;
+    color: #fff;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
 #site_nav_global_primary a:hover {
@@ -130,150 +130,27 @@ address {
 }
 
 #site_notice {
-    color: #000;
-    float: right;
-    width: 280px;
-    padding: 10px; 
-    margin-left: 40px;
     -webkit-border-radius: 6px;
     -moz-border-radius: 6px;
     border-radius: 6px;
 }
 
-#site_notice a {
-    color: #3e3e8c;
-}
-
-#anon_notice {
-    color: #000;
-    clear: both;
-    background: none;
-    padding: 0px;
-    margin-bottom: 10px;
-}
-
-#anon_notice a {
-    color: #3e3e8c;
-}
-
-#core {
-    clear: both;
-    margin: 0px;
-    width: 958px;
-    border-top: 5px solid #FB6104;
-    border-left: 1px solid #d8dae6;
-    border-right: 1px solid #d8dae6;
-}
-
-#aside_primary_wrapper {
-    width: 100%;
-    float: left;
-    overflow: hidden;
-    position: relative;
-    background-color: #ececf2;  
-}    
-
-#content_wrapper  {  
-    width: 100%;  
-    float: left;
-    position: relative;  
-    right: 239px; 
-    background-color: #fff;  
-    border-right: 1px solid #d8dae6;
-}  
-
-#site_nav_local_views_wrapper  {  
-    width: 100%;  
-    float: left;
-    position: relative;  
-    right: 561px;
-    background-color: #ececf2;  
-    border-right: 1px solid #d8dae6;
-}  
-
-#site_nav_local_views {
-    width: 138px;
-    float: left;
-    overflow: hidden;
-    position: relative;
-    left: 800px;
-    margin-top: 0px;
-    padding: 22px 10px 40px 10px;
-}
-
-#site_nav_local_views H3 {
-    margin-bottom: 10px;
-    padding-bottom: 6px;
-    background: url('../images/brdr_black_dot.png') repeat-x bottom left;
-    color: #7a7c87;
-    font-size: 1.1em;
-    letter-spacing: 2px;
-    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
-    text-transform: uppercase;
-}
-
-#site_nav_local_views li {
-    display: block;
-    margin: 0px 0px 8px 0px;
-}
-
-#site_nav_local_views li ul {
-    margin-bottom: 20px;
-}
-
-#site_nav_local_views a {
-    display: block;
-    width: 118px;
-    padding: 0px 10px 1px 10px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    text-transform: uppercase;
-    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
-    word-wrap: break-word;
-}
-
-#site_nav_local_views a:hover, #site_nav_local_views .current a {
-    color: #fff;
-    text-decoration: none;
-    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
-    background: #364a84;
-    background: -moz-linear-gradient(top, #7b8dbb , #364a84);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
-}
-
-#content {
-    width: 520px;
-    float: left;
-    overflow: hidden;
-    position: relative;
-    left: 801px;
-    margin: 0px;
-    padding: 20px 20px 40px 20px;
-}
-
-/* Input forms */
+/* input forms */
 
 .input_forms {
     float: left;
-    position: relative;
     top: -20px;
     left: -20px;
     padding: 18px 20px 0px 20px;
+    border-bottom: none;
+    margin-bottom: 0px;
     background: #fafafa url('../images/brdr_black_dot.png') repeat-x bottom left;
 }
 
-#input_form_nav {
-    float: left;
-    margin-bottom: 10px;
-}
-
 #input_form_nav li a {
     display: block;
     float: left;
     padding: 0px 10px 1px 10px;
-    margin-right: 10px;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
@@ -298,285 +175,73 @@ address {
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
 }
 
-.input_form_nav_tab a, .input_form_nav_tab.current {
-    text-decoration: none !important; /* XXX cf rebase */
-}
-
-.input_form {
-    position: relative;
-    float: left;
-    width: 520px;
-    padding-bottom: 20px;
-}
-
-#input_form_status, #input_form_direct {
-    padding-bottom: 50px;
-}
-
-.form_notice {
-    padding: 0px;
-    background: none;
-}
-
-.form_notice fieldset {
-    width: auto;
-    position: static;
-}
-
-.form_notice #notice_data-text-label {
-    display: none; /* XXX move into input with js */
-}
-
-.form_notice_placeholder .placeholder {
-    width: 508px;
-    padding: 4px 4px 4px 6px;
-    border: 1px solid #a6a6a6;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    z-index: 97;
-    font-size: 1em;
-    color: #888;
-}
-
-.form_notice textarea {
-    width: 483px;
-    height: 42px;
-    padding: 6px 5px 18px 5px;
-    border: 1px solid #a6a6a6;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    z-index: 97;
-    font-size: 1.2em;
-}
-
-#form_notice-direct.form_notice textarea {
-    width: 508px;
-}
-
-.form_notice label.notice_data-attach {
-    top: 0px;
-    right: 0px;
-    z-index: 96;
-}
-
-.form_notice .notice_data-geo_wrap label,
-.form_notice .notice_data-geo_wrap input {
-    top: 26px;
-    right: 0px;
-    z-index: 99;
-}
-
-.form_notice .count {
-    position: absolute;
-    top: 50px;
-    right: 32px;
-    font-size: 0.8em; 
-    height: 1em;
-    z-index: 99;
-}
-
-#form_notice-direct.form_notice .count {
-    top: 78px;
-    right: 7px;
-}
-
-.form_notice #notice_action-submit {
-    position: absolute;
-    top: 100%;
-    left: 0px;
-    margin-top: -49px;
-    float: left;
-    width: 100px;
-    padding: 0px;
-    z-index: 99;
+.input_form_nav_tab a, .input_form_nav_tab.current a {
+    text-decoration: none;
 }
 
 .form_notice .error,
 .form_notice .success,
 .form_notice .notice-status {
-    width: 478px; 
-    position: relative;
-    top: 0px;
-    float: none;
-    clear: none;
-    margin-left: 0px;
-    margin-top: 10px;
-    padding: 5px 5px 5px 10px;
-    border: 1px solid #ccc;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
 }
 
-.form_notice .error {
-    border: 1px solid #d05858;
-}
-
-.form_notice .attach-status code {
-    font-size: 1em;
-}
-
-.input_form fieldset {
-    margin: 0px;
-    padding: 0px;
-}
-
-.input_form fieldset fieldset {
-    width: 400px;
-    float: left;
-    background: none;
-    border: none;
-    margin-bottom: 0px !important;
-    padding: 0px !important;
-}
-
-.input_form .form_settings .form_data li {
-    position: relative;
-    margin-bottom: 12px;
-}
-
-.input_form fieldset fieldset label {
-    position: absolute;
-    top: 0;
-    left: 6px;
-    float: none;
-    text-align: left;
-    color: #888;
-    cursor: text;
-    background: #fff;
-}
-
-.input_form .form_settings li input {
-    width: 388px;
-    margin-left: 0;
-    margin-right: 0;
-    padding: 4px 5px 4px 5px;
-    border: 1px solid #a6a6a6;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    font-size: 1em;
-}
-
-.input_form .form_settings li textarea {
-    width: 388px;
-    margin-left: 0;
-    padding: 4px 5px 4px 5px;
-    border: 1px solid #a6a6a6;
+.form_notice_placeholder .placeholder,
+.form_notice textarea ,
+.input_form .form_settings li input,
+.input_form .form_settings li textarea,
+.threaded-replies .placeholder {
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
     -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
     -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    z-index: 97;
-    font-size: 1em;
-}
-
-.input_form .form_settings p.form_guide {
-    margin-left: 5px;
 }
 
 .input_form .form_settings .submit {
-    position: relative;
-    top: 0;
-    right: 0;
-    float: right;   
-    width: 100px;
-    height: 26px;
-    line-height: 26px;
-    padding: 0px 10px;
-    margin: 0px;
-    color:#fff;
-    font-weight: bold;
-    text-transform: uppercase;
     font-size: 1.1em;
-    z-index: 1;
 }
 
-.to-selector { 
-    padding-top: 15px;
-    z-index: 99;
-}
+/* site nav local views */
 
-.form_settings label[for=notice_to] {
-    left: 5px;
-    margin-left: 0px;
-    margin-right: 10px;
-    position: relative;
-    clear: left;
-}
-
-.checkbox-wrapper {
-    padding: 2px;
-    margin-left: 10px;
-}
-
-.form_notice .checkbox-wrapper {
-    display: inline;
-    margin-left: 10px;
-}
-
-.form_settings .checkbox-wrapper label.checkbox {
-    margin-left: 0px;
-    margin-top: 6px;
-    line-height: 1.2em;
-    left: -3px;
-    float: none;
-}
-
-.checkbox-wrapper #notice_private {
-    display:none;
-}
-
-.checkbox-wrapper.unchecked label.checkbox {
-    padding-left: 20px;
-    background: url(../images/lock_open.png) no-repeat 0px 0px;
-    opacity: 0.6;
-}
-
-.checkbox-wrapper.unchecked label.checkbox:hover {
-    opacity: 1;
-    cursor: pointer;
+#site_nav_local_views H3 {
+    margin-bottom: 10px;
+    padding-bottom: 6px;
+    background: url('../images/brdr_black_dot.png') repeat-x bottom left;
+    color: #7a7c87;
+    font-size: 1.1em;
+    letter-spacing: 2px;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
+    text-transform: uppercase;
 }
 
-.checkbox-wrapper.checked label.checkbox {
-    padding-left: 20px;
-    background: url(../images/lock.png) no-repeat 0px 0px;
-    color: red;
-    opacity: 1;
+#site_nav_local_views a {
+    display: block;
+    width: 118px;
+    padding: 0px 10px 1px 10px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    text-transform: uppercase;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
+    word-wrap: break-word;
 }
 
-.checkbox-wrapper.checked label.checkbox:hover {
-    cursor: pointer;
+#site_nav_local_views a:hover, #site_nav_local_views .current a {
+    color: #fff;
+    text-decoration: none;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+    background: #364a84;
+    background: -moz-linear-gradient(top, #7b8dbb , #364a84);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
 }
 
-#aside_primary {
-    width: 218px;
-    float: left;
-    overflow: hidden;
-    position: relative;
-    left: 802px;
-    padding: 22px 10px 40px 10px;
-    margin-top: 0px;
-    background: none;
-}
+/* aside primary */
 
 #aside_primary .section {
-    width: 100%;
-    margin-left: 0px;
-    margin-right: 0px;
     font-size: 0.88em;
 }
 
@@ -708,6 +373,8 @@ address {
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
 }
 
+/* notices etc */
+
 #content h1 {
     border-bottom: 3px solid #A6ADBF;
     color: #A6ADBF;
@@ -716,37 +383,11 @@ address {
     text-transform: none;
 }
 
-#notices_primary {
-    margin-top: -5px;
-}
-
 #content .notice {
     padding-bottom: 4px;
     border-bottom: 2px dotted #eee;
 }
 
-.notice {
-    line-height: 1.36em;
-    margin-bottom: 10px;
-}
-
-#content .notice .author .photo {
-    left: 0px;
-    top: 7px;
-}
-
-#content .notice .entry-title {
-    min-height: 35px;
-}
-
-#showstream .notice .entry-title {
-    min-height: 1px;
-}
-
-#shownotice .notice .entry-title {
-    min-height:123px;
-}
-
 .notice div.entry-content {
     font-size: 0.88em;
     line-height: 1.2em;
@@ -775,147 +416,17 @@ div.entry-content a.response:after {
     margin-bottom: 10px;
 }
 
-.threaded-replies {
-    clear: both;
-    float: left;
-    width: 458px;
-    margin-left: 59px;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    padding-right: 2px;
-    border-left: 3px solid #ECECF2;
-    background: #fafafa;
-    color: #222;
-    font-size: 1em;
-}
-
-.threaded-replies:empty {
-    display: none;
-}
-
-.user_in .threaded-replies {
-    margin-top: 0px;
-}
-
-.threaded-replies a {
-    color: #3e3e8c;
-}
-
-#content .notice .threaded-replies .notice,
-#content .notice .threaded-replies .notice-data {
-    width: 440px;
-    min-height: 1px;
-    padding-bottom: 14px;
-    padding-top: 5px;
-    border-bottom: 2px dotted #eee;
-    line-height: 1.36em;
-    margin-top: 0px;
-    margin-bottom: 0px;
-    margin-left: 10px;
-    background: none;
-}
-
-#content .notice .threaded-replies .entry-title {
-    min-height: 1px;
-}
-
 #content .threaded-replies .notice .author .photo {
-    height: 24px;
-    width: 24px;
-    top: 12px;
     box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
     -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
-#content .notice .threaded-replies .notice .entry-title {
-    margin: 2px 7px 0px 35px;
-}
-
-#content .notice .threaded-replies .notice div.entry-content {
-    clear:left;
-    float:left;
-    margin-left: 35px;
-    margin-top: 6px !important;
-}
-
-#content .notice .threaded-replies .notice div.entry-content.notice-faves {
-    margin-top: 2px !important;
-}
-
-#content .notice .threaded-replies .notice .notice-options {
-    margin-top: 5px;
-    margin-bottom: 0px;
-}
-
-.threaded-replies li {
-    list-style-type: none;
-}
-
-.threaded-replies .notice-reply-comments {
-    margin: 2px 0px 4px 10px;
-}
-
-.threaded-replies .placeholder {
-    margin: 10px;
-    width: 426px;
-    padding: 4px 4px 4px 6px;
-    border: 1px solid #a6a6a6;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    color: #888;
-}
-
-.threaded-replies .notice-reply {
-    clear: left;
-    position: relative;
-    padding: 10px;
-    padding-bottom: 44px;
-}
-
-.threaded-replies .form_notice textarea {
-    width: 395px;
-}
-
-.threaded-replies .form_notice label.notice_data-attach {
-    top: 10px;
-    right: 10px;
-}
-
-.threaded-replies .form_notice .notice_data-geo_wrap label,
-.threaded-replies .form_notice .notice_data-geo_wrap input {
-    top: 36px;
-    right: 10px;
-}
-
-.threaded-replies .form_notice .count {
-    top: 60px;
-    right: 50px;
-}
-
-.threaded-replies .form_notice #notice_action-submit {
-    left: 10px;
-    margin-top: -44px;
-}
-
-.threaded-replies .form_notice .error,
-.threaded-replies .form_notice .success,
-.threaded-replies .form_notice .notice-status {
-    width: 390px; 
-}
-
-.threaded-replies .to-selector {
-    display: none;
-}
-
 .user_in.realtime-popup .notice div.entry-content {
     max-width: 320px;
 }
 
+
 .realtime-popup .threaded-replies {
     margin-left: 15px;
 }
@@ -929,35 +440,11 @@ div.entry-content a.response:after {
     right: 10px !important;
 }
 
-#content .notice .notice {
-    width: 100%;
-    margin-left: 0;
-    margin-top: 16px;
-    margin-bottom: 10px;
-}
-
-.notice .notice {
-background-color:rgba(200, 200, 200, 0.050);
-}
-.notice .notice .notice {
-background-color:rgba(200, 200, 200, 0.100);
-}
-.notice .notice .notice .notice {
-background-color:rgba(200, 200, 200, 0.150);
-}
-.notice .notice .notice .notice .notice {
-background-color:rgba(200, 200, 200, 0.300);
-}
 
 .pagination {
     height: 1.2em;
 }
 
-#jOverlayContent button {
-    top: 20px;
-    right: 36px;
-}
-
 .entity_profile {
     float: left;
     width: 360px;
@@ -1039,19 +526,6 @@ background-color:rgba(200, 200, 200, 0.300);
     color: #3e3e8c;
 }
 
-#footer {
-    position: relative;
-    top: -6px;
-    color: #000;
-    margin-left: 0px;
-    margin-right: 0px;
-    -webkit-border-top-left-radius: 6px;
-    -webkit-border-top-right-radius: 6px;
-    -moz-border-radius-topleft: 6px;
-    -moz-border-radius-topright: 6px;
-    border-top-left-radius: 6px;
-    border-top-right-radius: 6px;
-}
 
 #footer a {
     color: #3e3e8c;
@@ -1062,15 +536,11 @@ background-color:rgba(200, 200, 200, 0.300);
 }
 
 .error, .success, .notice-status {
-    background-color: #F7E8E8;
-    padding: 4px 10px;
     -webkit-border-radius: 6px;
     -moz-border-radius: 6px;
     border-radius: 6px;
 }
-.success, .notice-status {
-    background-color: #f2f2f2;
-}
+
 
 .form_notice input.submit, .form_settings input.submit, .form_settings input.cancel, #form_invite input.submit {
     height: 1.9em;
@@ -1110,29 +580,6 @@ background-color:rgba(200, 200, 200, 0.300);
     text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
 }
 
-.form_settings input.checkbox, .form_settings input.radio {
-    margin-left: 24%;
-    margin-top: 2px;
-    position: relative;
-    left: -14px;
-}
-
-.form_settings label.checkbox, .form_settings label.radio {
-    width: auto;
-    max-width: 60%;
-    position: relative;
-    left: -30px;
-}
-
-.form_settings li input.radio {
-    clear: left;
-}
-
-.form_settings label.radio {
-    margin-left: 10px;
-    margin-right: 10px;
-    text-align: left;
-}
 
 #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%;
@@ -1911,7 +1358,9 @@ li.notice-answer + li.notice {
     font-weight: bold;
     text-transform: none;
     line-height: 1em;
-    margin-bottom: 30px;
+    margin-bottom: 20px;
+    position: relative;
+    top: -4px;
 }
 
 #site_nav_local_views a.company_logo:hover {
@@ -1921,8 +1370,8 @@ li.notice-answer + li.notice {
 }
 
 .company_logo img {
-    max-width: 96px;
-    margin-bottom: 10px;
+    max-width: 138px;
+    margin-bottom: 4px;
 }
 
 .company_logo span {
@@ -1933,5 +1382,4 @@ a.company_logo:hover span {
     text-decoration: underline;
 }
 
-
 }/*end of @media screen, projection, tv*/