Merge branch '1.0.x' into inline-comments

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 383b9c6ec261adf536864733e7125fa7ccf26d9f..dabf929a72d3f633781ef49aadf5dd6578d90967 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -395,14 +395,12 @@ list-style-type:none;
 float:left;
 text-decoration:none;
 padding:4px 11px;
-border-radius-topleft:4px;
-border-radius-topright:4px;
+border-top-left-radius:4px;
+border-top-right-radius:4px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-left-radius:4px;
 -webkit-border-top-right-radius:4px;
-border-radius-topleft:0;
-border-radius-topright:0;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
@@ -430,13 +428,13 @@ display:block;
 width:80%;
 padding-right:10%;
 padding-left:10%;
-border-radius-toprleft:0;
+border-top-left-radius:0;
 -moz-border-radius-topleft:0;
 -webkit-border-top-left-radius:0;
-border-radius-topright:4px;
+border-top-right-radius:4px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-right-radius:4px;
-border-radius-bottomright:4px;
+border-bottom-right-radius:4px;
 -moz-border-radius-bottomright:4px;
 -webkit-border-bottom-right-radius:4px;
 }
@@ -447,13 +445,10 @@ box-shadow:none;
 }
 
 body[id$=adminpanel] #content {
-border-radius-topleft:7px;
-border-radius-topright:7px;
+border-top-left-radius:7px;
 -moz-border-radius-topleft:7px;
--moz-border-radius-topright:7px;
 -webkit-border-top-left-radius:7px;
--webkit-border-top-right-radius:7px;
-border-radius-topright:0;
+border-top-right-radius:0;
 -moz-border-radius-topright:0;
 -webkit-border-top-right-radius:0;
 }
@@ -537,6 +532,7 @@ min-height:259px;
 padding:1.795%;
 float:left;
 border-radius:7px;
+border-top-left-radius:0;
 -moz-border-radius:7px;
 -moz-border-radius-topleft:0;
 -webkit-border-radius:7px;
@@ -1109,6 +1105,35 @@ border-top-width:1px;
 border-top-style:solid;
 }
 
+/* Threaded notices sublist */
+#content .notices .threaded-notices {
+    margin-left: 10%;
+    width: 90%;
+
+    background: #e4e8f1;
+}
+#content .threaded-notices .notice .author .photo {
+    left: 8px;
+    width: 32px;
+    height: 32px;
+}
+.threaded-notices .notice-reply {
+    margin: 8px;
+}
+.threaded-notices .notice-reply textarea,
+.threaded-notices .notice-reply-placeholder input.placeholder {
+    margin-left: 0;
+    width: 95%;
+}
+.threaded-notices .notice-reply-placeholder input.placeholder {
+    color: gray;
+    margin-left: 8px; /* ?? */
+    margin-bottom: 8px;
+}
+.threaded-notices .notice-reply .controls {
+    text-align: right;
+}
+
 /* NOTICES */
 #notices_primary {
 float:left;