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 6b7629d4aad50fb62f3b9b19e85d9831d1b1e7c5..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;
 }
@@ -293,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;
 }
 
@@ -520,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;
 }
 
@@ -531,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;
 }
@@ -595,10 +599,6 @@ address .poweredby {
     margin-bottom: 20px;
 }
 
-body[id$=adminpanel] #aside_primary {
-    display:none;
-}
-
 
 /* notices */
 
@@ -634,6 +634,10 @@ body[id$=adminpanel] #aside_primary {
     content: '\25B8';
 }
 
+.notice .addressees .group {
+    font-style: italic;
+}
+
 .fn {
     overflow: hidden;
 }
@@ -684,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;
@@ -830,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;
 }
@@ -1000,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 */
 
@@ -1475,12 +1496,13 @@ margin-bottom:11px;
 }
 
 .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;
 }
@@ -1501,15 +1523,19 @@ content:'☠';
 font-size:150%;
 }
 
-#content .notice-source-system div.entry-title, .notice-source-system div.entry-content {
+#content .notice-source-activity div.entry-title, .notice-source-activity div.entry-content {
     margin-left: 0;
 } 
 
-#content .notice-source-system div.entry-title {
+#content .notice-source-activity div.entry-title {
     font-style: italic;
     min-height: 0;
 }
 
+#content .notice-source-activity .notice div.entry-title {
+    font-style: normal;
+}
+
 span.rtl {
     display: block;
     direction: rtl;
@@ -1954,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;
@@ -2521,6 +2553,11 @@ display:none;
     display:none;
 }
 
+.profile_block_otherprofile_list li {
+    display: inline;
+    list-style-type: none;
+}
+
 /*end of @media screen, projection, tv*/