Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

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

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 61258bfab65407bf24e2e43d96341dd340429c44..528f8553deee81cd1be6f0c0a717eb672d422d64 100644 (file)
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -481,6 +481,18 @@ address {
     text-transform: uppercase;
 }
 
+.profile_block .entity_actions {
+    float: right;
+    width: 110px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+.profile_block .entity_moderation:hover ul,
+.profile_block .entity_role:hover ul {
+    right: 20px;
+}
+
 .profile_block_name {
     font-size: 14px;
     font-weight: bold;
@@ -494,18 +506,35 @@ address {
     line-height: 1.2em;
 }
 
-.profile_block .entity_actions {
-    float: left;
-    margin-left: 0px;
+#site_nav_object ul {
+    background: url('../images/brdr_black_dot.png') repeat-x top left;
 }
 
-.profile_block .entity_moderation:hover ul,
-.profile_block .entity_role:hover ul {
-    left: 20px;
+#site_nav_object li {
+    display: block;
+    margin: -8px 0px 8px 0px;
+    padding-top: 8px;
 }
 
-.profile_block a.profiledetail {
+#site_nav_object a {
+    font-size: 14px;
     display: block;
+    padding: 0px 0px 1px 10px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    text-transform: uppercase;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
+}
+
+#site_nav_object a:hover, #site_nav_object .current a {
+    color: #fff;
+    text-decoration: none;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+    background: #364a84;
+    background: -moz-linear-gradient(top, #7b8dbb , #364a84);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
 }
 
 .section ul.entities {
@@ -750,7 +779,7 @@ background-color:rgba(200, 200, 200, 0.300);
     margin-bottom: 10px;
 }
 
-.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input, .entity_actions .entity_moderation input, .entity_actions .entity_role input, .entity_actions .entity_nudge input, .entity_actions .entity_delete input {
+.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input, .entity_actions .entity_moderation input, .entity_actions .entity_role input, .entity_actions .entity_nudge input, .entity_actions .entity_delete input, .entity_actions input.submit {
        text-shadow:0 1px 0 rgba(255,255,255,0.4);
     border-radius: 4px;
     -moz-border-radius: 4px;
@@ -1315,6 +1344,25 @@ table.profile_list tr.alt {
     left: 0px;
 }
 
+.limited-scope li .entry-content .timestamp {
+    padding-left: 0px;
+}
+
+.limited-scope li .entry-content .timestamp:before {
+    content: none;
+}
+
+.limited-scope li.limited-scope .entry-content .timestamp {
+    padding-left: 20px;
+}
+
+.limited-scope li.limited-scope .entry-content .timestamp:before {
+    content: url(../images/lock.png);
+    position: absolute;
+    top: -2px;
+    left: 0px;
+}
+
 /* QnA specific styles */
 
 #content .question .entry-title, #content .qna-full-question .entry-title {
@@ -1349,7 +1397,7 @@ table.profile_list tr.alt {
     margin: 0px;
 }
 
-.question fieldset legend, .qna-full-question fieldset legend {
+.question fieldset legend, .qna-full-question fieldset legend, .answer fieldset legend {
     display: none;
 }
 
@@ -1408,4 +1456,9 @@ table.profile_list tr.alt {
     margin-top: 0px;
 }
 
+.question p.best, .answer p.best {
+    background: url(../images/rosette.png) no-repeat top left;
+    padding-left: 20px;
+}
+
 }/*end of @media screen, projection, tv*/