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 3268aea39be0bffa884774f39dd764d584abcf7b..dabf929a72d3f633781ef49aadf5dd6578d90967 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -94,6 +94,55 @@ list-style-type:none;
 form label.submit {
 display:none;
 }
+
+body[id$=settings] #site_nav_local_views {
+position:relative;
+z-index:9;
+float:right;
+margin-right:10.65%;
+width:22.25%;
+}
+body[id$=settings] #site_nav_local_views li {
+width:100%;
+margin-right:0;
+margin-bottom:7px;
+}
+body[id$=settings] #site_nav_local_views a {
+display:block;
+width:80%;
+padding-right:10%;
+padding-left:10%;
+border-radius-toprleft:0;
+-moz-border-radius-topleft:0;
+-webkit-border-top-left-radius:0;
+border-radius-topright:4px;
+-moz-border-radius-topright:4px;
+-webkit-border-top-right-radius:4px;
+border-radius-bottomright:4px;
+-moz-border-radius-bottomright:4px;
+-webkit-border-bottom-right-radius:4px;
+}
+body[id$=settings] #site_nav_local_views li.current {
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+}
+
+body[id$=settings] #content {
+border-radius-topleft:7px;
+border-radius-topright: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;
+-moz-border-radius-topright:0;
+-webkit-border-top-right-radius:0;
+}
+body[id$=settings] #aside_primary {
+display:none;
+}
+
 .form_settings {
 clear:both;
 }
@@ -416,7 +465,7 @@ display:none;
 margin-bottom:11px;
 }
 
-#site_nav_global_secondary ul li {
+#site_nav_global_secondary li {
 display:inline;
 margin-right:18px;
 }
@@ -870,7 +919,9 @@ text-transform:uppercase;
 font-size:1em;
 }
 
-#entity_statistics dt,
+#entity_statistics dt {
+margin-right:11px;
+}
 #entity_statistics dd {
 display:inline;
 margin-right:11px;
@@ -1054,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;