Merge 1.1.x into master

[quix0rs-gnu-social.git] / theme / base / css / display.css

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 9ad1b4ec1551ba2871024c8cd693089f64baa8f8..b73078295e757b6e5a9ea9bb2b3be9a874dde486 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -176,15 +176,19 @@ option {
 address {
     float: left;
     position: relative;
-    top: 1px;
-    left: 2px;
-    margin: 0px;
+    margin: -2px 0 3px 0;
     padding: 0px;
-    height: 24px;
-    width: 148px;
     z-index: 99;
 }
 
+address a, address img {
+    display: block;
+}
+
+address img {
+    max-width: 158px;
+}
+
 address img + .fn {
     display: none;
 }
@@ -218,6 +222,13 @@ address .poweredby {
     margin-right: 0px;
 }
 
+#header-search {
+    float: right;
+    position: relative;
+    top: -8px;
+    margin-left: 10px;
+}
+
 #site_notice { 
     float: right;
     width: 300px;
@@ -286,7 +297,7 @@ address .poweredby {
     display: none;
 }
 
-.form_notice #notice_data-text-label { /* XXX remove? */
+.form_notice #notice_data-text-label { /* TODO can remove this now? */
     display: none;
 }
 
@@ -513,7 +524,7 @@ address .poweredby {
 
 .checkbox-wrapper.unchecked label.checkbox {
     padding-left: 20px;
-    background: url(../images/lock_open.png) no-repeat 0px 0px;
+    background: url(../images/icons/lock_open.png) no-repeat 0px 0px;
     opacity: 0.6;
 }
 
@@ -524,7 +535,7 @@ address .poweredby {
 
 .checkbox-wrapper.checked label.checkbox {
     padding-left: 20px;
-    background: url(../images/lock.png) no-repeat 0px 0px;
+    background: url(../images/icons/lock.png) no-repeat 0px 0px;
     color: red;
     opacity: 1;
 }
@@ -588,10 +599,6 @@ address .poweredby {
     margin-bottom: 20px;
 }
 
-body[id$=adminpanel] #aside_primary {
-    display:none;
-}
-
 
 /* notices */
 
@@ -627,6 +634,10 @@ body[id$=adminpanel] #aside_primary {
     content: '\25B8';
 }
 
+.notice .addressees .group {
+    font-style: italic;
+}
+
 .fn {
     overflow: hidden;
 }
@@ -677,26 +688,26 @@ font-style:italic;
     display:none;
 }
 
+#remoteprofile .notice .entry-title, #remoteprofile .notice div.entry-content,
 #showstream .notice .entry-title, #showstream .notice div.entry-content {
     margin-left: 0;
 }
 
+#remoteprofile .notice .entry-title,
 #showstream .notice .entry-title {
     min-height: 1px;
 }
 
+#remoteprofile #content .notice .author,
 #showstream #content .notice .author {
     display: none;
 }
 
+#remoteprofile .notice,
 #showstream .notice {
     min-height: 1em; 
 }
 
-#shownotice .vcard .photo {
-    margin-bottom: 4px;
-}
-
 #shownotice .notice .entry-title {
     font-size:2.2em;
     min-height:123px;
@@ -823,7 +834,7 @@ clear:both;
 
 #jOverlayContent,
 #jOverlayContent #content,
-#jOverlayContent #content_inner { /* XXX still needed? */
+#jOverlayContent #content_inner { /* TODO can remove this now? */
 width: auto !important;
 margin-bottom:0;
 }
@@ -993,7 +1004,24 @@ content: ":";
     display: none;
 }
 
+/* old school conversation style */
+
+#conversation .notices .notices {
+    float: left;
+    background-color:rgba(200, 200, 200, 0.050);
+    margin-left: 15px;
+    width: auto;
+}
 
+#conversation .notices .threaded-replies {
+    margin-left: 59px;
+    background: #fafafa;
+}
+
+#conversation .notices .notices .notices .notices .notices .notices .notices .notices .notices .notices .notices .notices .notices  {
+    background: none;
+    margin-left: 0px;
+}
 
 /* aside primary specific styles */
 
@@ -1339,6 +1367,7 @@ margin-left:11px;
 .form_settings .form_data li {
 width:100%;
 float:left;
+    margin-bottom: 22px;
 }
 .form_settings .form_data label {
 float:left;
@@ -1349,6 +1378,12 @@ float:left;
 margin-left:1.795%;
 float:left;
 }
+
+.form_settings .form_data select {
+    margin-top: 0px;
+}
+
+
 .form_settings .form_data input {
 width:39%;
 }
@@ -1367,17 +1402,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;
 }
@@ -1386,17 +1417,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 {
@@ -1450,50 +1485,24 @@ 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;
--webkit-border-radius:4px;
 padding:0 7px;
 }
 
+.form_settings .form_response {
+    margin-top: 10px;
+}
+
 .form_settings input {
     margin-right: 20px;
 }
@@ -1514,47 +1523,25 @@ content:'☠';
 font-size:150%;
 }
 
-/* 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;    
-}
+#content .notice-source-activity div.entry-title, .notice-source-activity div.entry-content {
+    margin-left: 0;
+} 
 
-#form_ostatus_connect.dialogbox .form_data label,
-#form_ostatus_sub.dialogbox .form_data label {
-    font-weight: normal;
-    font-size: 1.2em;
-    width:34%;
+#content .notice-source-activity div.entry-title {
+    font-style: italic;
+    min-height: 0;
 }
 
-#form_ostatus_connect.dialogbox .form_data input,
-#form_ostatus_sub.dialogbox .form_data input {
-    float: right;
-    width: 52% !important;
+#content .notice-source-activity .notice div.entry-title {
+    font-style: normal;
 }
 
-#form_ostatus_connect.dialogbox .form_data .form_guide,
-#form_ostatus_sub.dialogbox .form_data .form_guide {
-    background: none !important;
+span.rtl {
+    display: block;
+    direction: rtl;
     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;
-}
+    float: right;
+} 
 
 #filter_tags ul li,
 .entity_send-a-message .form_notice,
@@ -1570,7 +1557,7 @@ background:none;
 }
 
 .form_settings .form_note {
-background-color:#9BB43E;
+    background-color: #d1f7cb;
 }
 
 #form_settings_photo .form_data {
@@ -1756,11 +1743,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;
@@ -1769,6 +1751,8 @@ display:block;
 }
 
 .entity_actions a {
+text-decoration:none;
+display:block;
     padding: 3px 4px 4px 28px;
 }
 
@@ -1996,6 +1980,12 @@ display:block;
 width:auto;
 }
 
+.profile_block .group_aliases .group_alias {
+    display:inline;
+    list-style-type: none;
+    font-style: italic;
+}
+
 .profile_block .entity_tags dt {
 display: inline;
 margin-right: 3px;
@@ -2164,8 +2154,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 {
@@ -2563,6 +2553,11 @@ display:none;
     display:none;
 }
 
+.profile_block_otherprofile_list li {
+    display: inline;
+    list-style-type: none;
+}
+
 /*end of @media screen, projection, tv*/