Merge branch 'direct-feed-sub' 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 527a9a626f2aaff7f94b1e95427259f641eba69f..46d95a864dab74a5fa5d171b10739dda0764307c 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -20,7 +20,11 @@ ol, ul {list-style-position: inside;}
 fieldset {border: none;}
 legend {font-weight: bold; font-size: 1.2em;}
 input, textarea, select, option {padding: 2px;}
-textarea {overflow:auto;}
+
+textarea {
+    overflow:auto;
+    resize: vertical;
+}
 
 body {
     background-color: #f2f2f2;
@@ -79,6 +83,10 @@ option {
     padding-bottom: 0px;
 }
 
+.hidden {
+    display: none;
+}
+
 #wrap {
     position: relative;
     width: 960px;
@@ -448,14 +456,9 @@ address .poweredby {
 }
 
 .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 {
@@ -476,6 +479,10 @@ address .poweredby {
     font-size: 1em;
 }
 
+.input_form .form_data label {
+    display: none;
+}
+
 .input_form .form_settings .form_data p.form_guide {
     margin-left: 5px;
 }
@@ -627,19 +634,26 @@ address .poweredby {
     line-height: 1.36em;
 }
 
-.notice, .profile, .application, #content .peopletag {
+.profile, .application, #content .peopletag {
     position:relative;
     clear:both;
     float:left;
     width:100%;
 }
 
-.notice .p-author {
-    margin-right: 8px;
+.application, #content .peopletag {
+    position:relative;
+    clear:both;
+    float:left;
+    width:100%;
+}
+
+.notice .parents {
+    display: inline;
 }
 
-.notice .addressees::before {
-    content: '\25B8';
+.notice .parents::before {
+    content: '\25B8  ';
 }
 .notice .addressees, .notice .addressees li {
     display: inline;
@@ -679,10 +693,6 @@ address .poweredby {
 font-style:italic;
 }
 
-#showstream h1 { 
-    display:none;
-}
-
 #remoteprofile .notice .h-entry,
 #showstream .notice .h-entry,
 #remoteprofile .notice .entry-title,
@@ -719,11 +729,8 @@ font-style:italic;
 
 .notice-options {
     margin-bottom: 7px;
-    margin-top: 12px;
-}
-
-.notice-options {
     float: right;    
+    position: relative;
 }
 
 .notice-options fieldset {
@@ -793,7 +800,7 @@ position:static;
 .notice.h-entry .attachments {
     clear: both;
     position: relative;
-    top: 1em;
+    margin-bottom: 1em;
 }
 
 .notice.h-entry .attachments .inline-attachment * {
@@ -851,12 +858,10 @@ content: ":";
 
 .threaded-replies {
     clear: both;
-    float: left;
     width: 458px;
     margin-left: 55px;
     margin-bottom: 10px;
     padding-right: 2px;
-    padding-top: 5px;
     border-left: 3px solid #ECECF2;
     background: #fafafa;
     color: #222;
@@ -948,12 +953,13 @@ content: ":";
 }
 
 .threaded-replies .form_notice .count {
-    top: 60px;
+    bottom: 60px;
     right: 50px;
 }
 
 .threaded-replies .form_notice input.submit {
-    bottom: 0;
+    bottom: 1ex;
+    right: 1ex;
 }
 
 .threaded-replies .form_notice .error,
@@ -981,7 +987,6 @@ content: ":";
 /* old school conversation style */
 
 #conversation .notices .notices {
-    float: left;
     background-color:rgba(200, 200, 200, 0.050);
     margin-left: 15px;
     width: auto;
@@ -1169,6 +1174,7 @@ cursor:pointer;
 
 .dialogbox {
 position:absolute;
+    width: 200px;
     top: 0px;
     right: 0px;
 z-index:9;
@@ -1209,6 +1215,11 @@ padding-left:4px;
 margin-bottom:0;
 }
 
+.notice-options .form_repeat.dialogbox input.submit_dialogbox {
+    float: right;
+    min-width: 80px;
+}
+
 #pagination {
     background-color: #f2f2f2;
     clear: left;
@@ -1456,6 +1467,11 @@ margin-left:0;
     margin-left: 56px;
 }
 
+.notice > footer > h3 {
+    margin-bottom: 0;
+    margin-top: 1em;
+}
+
 .threaded-replies .notice > footer, .section .notice > footer {
     margin-left:33px;
 }
@@ -1602,6 +1618,11 @@ ul.profile_list li {
     display: block;
 }
 
+table.profile_list tbody tr:nth-child(2n+1) {
+    background-color: #fafafa !important;
+    border: none !important;
+}
+
 .entity_profile .entity_nickname,
 .entity_profile .entity_fn {
 margin-left:0;
@@ -2083,11 +2104,13 @@ width:14.5%;
 
 .mark-top {
     border-top: 1px solid #ccc;
+    padding-top: 5px;
 }
 
 #realtime_actions {
     position: relative !important;
     right: -4px !important;
+    top: -65px !important;
     float: right;
     padding-top: 15px;
     margin-bottom: -8px !important;