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 75e48c0958eeb2f8a71ca27fe2f4a44323c719e2..b73078295e757b6e5a9ea9bb2b3be9a874dde486 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -634,6 +634,10 @@ address .poweredby {
     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;
@@ -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 */
 
@@ -1959,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;
@@ -2526,6 +2553,11 @@ display:none;
     display:none;
 }
 
+.profile_block_otherprofile_list li {
+    display: inline;
+    list-style-type: none;
+}
+
 /*end of @media screen, projection, tv*/