Merge branch '1.0.x' into testing

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d35a8a706ed9d030041b91e0cca2be20133d80d9..780b8dfab81c3b9a963953405b3443daeb20d4eb 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;
 }
@@ -169,7 +218,7 @@ font-weight:bold;
 #form_settings_avatar legend,
 #newgroup legend,
 #editgroup legend,
-#form_tag_user legend,
+.form_tag_user legend,
 #form_remote_subscribe legend,
 #form_openid_login legend,
 #form_search legend,
@@ -179,10 +228,22 @@ font-weight:bold;
 #form_password_change legend,
 .form_entity_block legend,
 #form_filter_bytag legend,
-#apioauthauthorize_allowdeny {
+#apioauthauthorize_allowdeny,
+.form_tag_user_wrap form,
+.form_tag_user_wrap label,
+.form_tag_user_wrap legend {
 display:none;
 }
-
+.form_tag_user_wrap {
+clear:both;
+}
+.form_tag_user {
+float:left;
+width:auto;
+}
+.form_tag_user input.submit {
+width:50px;
+}
 .form_settings .form_data p.form_guide {
 clear:both;
 margin-left:26%;
@@ -346,14 +407,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;
@@ -381,13 +440,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;
 }
@@ -398,13 +457,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;
 }
@@ -488,6 +544,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;
@@ -518,8 +575,10 @@ border-width:1px;
 border-style:solid;
 }
 
-.form_notice {
+#header .form_notice {
 width:45%;
+}
+.form_notice {
 float:left;
 position:relative;
 line-height:1;
@@ -550,38 +609,38 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
 position:absolute;
 top:25px;
 right:10.5%;
 cursor:pointer;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 text-indent:-9999px;
 width:16px;
 height:16px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 padding:0;
 height:16px;
 }
-.form_notice .form_note {
+.form_notice .count {
 position:absolute;
 bottom:2px;
 right:21.715%;
 z-index:9;
 }
-.form_notice .form_note dt {
+.form_notice .count dt {
 font-weight:bold;
 display:none;
 }
-.form_notice #notice_text-count {
+.form_notice .count {
 font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
 }
-.form_notice #notice_action-submit {
+.form_notice .submit {
 width:14%;
 height:47px;
 padding:0;
@@ -599,14 +658,15 @@ float:left;
 max-width:322px;
 }
 .form_notice .error,
-.form_notice .success {
+.form_notice .success,
+.form_notice .notice-status {
 float:left;
 clear:both;
 width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
-.form_notice #notice_data-attach_selected code {
+.form_notice .attach-status code {
 float:left;
 width:80%;
 display:block;
@@ -614,13 +674,14 @@ overflow:auto;
 margin-right:2.5%;
 font-size:1.1em;
 }
-.form_notice #notice_data-attach_selected button.close {
+.form_notice .attach-status button.close,
+.form_notice .notice-status button.close,{
 float:right;
 font-size:0.8em;
 }
 
-.form_notice #notice_data-geo_wrap label,
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap label,
+.form_notice .notice_data-geo_wrap input {
 position:absolute;
 top:25px;
 right:4px;
@@ -630,10 +691,10 @@ width:16px;
 height:16px;
 display:block;
 }
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap input {
 visibility:hidden;
 }
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
 font-weight:normal;
 font-size:1em;
 margin-bottom:0;
@@ -660,7 +721,7 @@ min-height:123px;
 float:left;
 margin-bottom:18px;
 margin-left:0;
-overflow:hidden;
+overflow:visible;
 }
 .entity_profile dt,
 #entity_statistics dt {
@@ -688,6 +749,17 @@ margin-bottom:18px;
 margin-left:113px;
 margin-bottom:4px;
 }
+.entity_tags p.error {
+clear:both;
+}
+
+.peopletags_edit_button {
+cursor:pointer;
+border:0;
+padding:0;
+width:16px;
+height:16px;
+}
 
 .entity_profile .entity_fn,
 .entity_profile .entity_nickname {
@@ -728,7 +800,6 @@ font-style:italic;
 .entity_actions {
 float:right;
 margin-left:2%;
-margin-bottom:18px;
 min-width:21%;
 }
 .entity_actions h2 {
@@ -917,13 +988,89 @@ min-height:60px;
 .profile .form_group_join legend,
 .profile .form_group_leave legend,
 .profile .form_user_subscribe legend,
-.profile .form_user_unsubscribe legend {
+.profile .form_user_unsubscribe legend,
+.form_user_add_peopletag legend,
+.form_user_remove_peopletag legend {
 display:none;
 }
-
+.profile_search_wrap h3 {
+float:left;
+font-weight:normal;
+margin-right:10px;
+}
 .profiles {
 list-style-type:none;
 }
+.peopletag .entry-content {
+width:auto;
+}
+.peopletag .tagged-count a:after,
+.peopletag .subscriber-count a:after {
+content: ':';
+}
+.peopletag .updated {
+display:none;
+}
+.peopletag .tag a{
+font-weight: bold;
+text-decoration: none;
+}
+.peopletag .tag:before {
+/* raquo */
+content: "\00BB";
+}
+.peopletag .entity_statistics {
+font-size:80%;
+}
+.peopletag .entity_statistics a {
+text-decoration:none;
+}
+
+.profile-lister {
+list-style-type:none;
+}
+.profile-lister li {
+min-height:30px;
+padding:5px;
+clear:both;
+}
+.profile-lister li a {
+text-decoration:none;
+}
+.profile-lister li .photo {
+display:inline;
+margin-right:7px;
+margin-bottom:-5px;
+}
+.profile-lister li .fn {
+font-weight:bold;
+}
+#profile_search_results {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
+.form_peopletag_edit_user_search legend,
+.form_peopletag_edit_user_search label,
+.form_peopletag_edit_user_search .form_guide {
+display:none;
+}
+.form_peopletag_edit_user_search #field {
+height:30px;
+}
+.form_peopletag_edit_user_search .submit {
+width:60px;
+}
+.form_user_remove_peopletag,
+.form_user_add_peopletag {
+float:right;
+}
+.form_user_add_peopletag input.submit,
+.form_user_remove_peopletag input.submit {
+width:100px;
+padding-left:25px;
+text-align:left;
+}
 .profile .entity_profile .fn.nickname,
 .profile .entity_profile .url[rel~=contact] {
 margin-left:0;
@@ -943,15 +1090,19 @@ clear:none;
 .profile .entity_profile .entity_tags,
 .profile .entity_profile .form_subscription_edit {
 margin-left:59px;
+margin-bottom:7px;
 clear:none;
 display:block;
 width:auto;
 }
-.profile .entity_profile .entity_tags dt {
+.entity_profile .entity_tags dt {
 display:inline;
+float:left;
 margin-right:11px;
 }
-
+.profile .entity_profile .form_subscription_edit {
+clear:left;
+}
 .profile .entity_profile .form_subscription_edit label {
 font-weight:normal;
 margin-right:11px;
@@ -1036,7 +1187,8 @@ width:14.5%;
 /* NOTICE */
 .notice,
 .profile,
-.application {
+.application,
+#content .peopletag {
 position:relative;
 padding-top:11px;
 padding-bottom:11px;
@@ -1060,6 +1212,41 @@ border-top-width:1px;
 border-top-style:solid;
 }
 
+/* Threaded notices sublist */
+#content .notices .threaded-replies {
+    margin-left: 10%;
+    width: 90%;
+
+    background: #e4e8f1;
+}
+#content .threaded-replies .notice .author .photo {
+    left: 8px;
+    width: 32px;
+    height: 32px;
+}
+.threaded-replies .notice-reply {
+    margin: 8px;
+}
+.threaded-replies .notice-reply-placeholder input.placeholder {
+    margin-left: 0;
+    width: 95%;
+}
+.threaded-replies .notice-reply-placeholder input.placeholder {
+    color: gray;
+    margin-left: 8px; /* ?? */
+    margin-bottom: 8px;
+}
+.threaded-replies .notice-reply .controls {
+    text-align: right;
+}
+.threaded-replies .notice-reply-comments {
+    margin: 8px;
+}
+.threaded-replies .response,
+.threaded-replies .source {
+    /* Hide these for ajax/realtime sourced notices */
+    display: none;
+}
 /* NOTICES */
 #notices_primary {
 float:left;
@@ -1269,7 +1456,8 @@ margin-left:0;
 }
 .notice-options input,
 .notice-options a,
-.notice-options .repeated {
+.notice-options .repeated,
+.peopletags_edit_button {
 text-indent:-9999px;
 outline:none;
 }
@@ -1313,7 +1501,8 @@ height:16px;
 position:relative;
 padding-left:16px;
 }
-.notice .attachment.more {
+.notice .attachment.more,
+.mode-private .privacy_mode {
 text-indent:-9999px;
 width:16px;
 height:16px;
@@ -1426,16 +1615,22 @@ padding-left:7px;
 border-left-width:1px;
 border-left-style:solid;
 }
-#filter_tags #filter_tags_all {
+#filter_tags #filter_tags_all,
+#filter_tags #filter_tags_for {
 margin-left:0;
 border-left:0;
 padding-left:0;
 }
-#filter_tags_all a {
+#filter_tags_all a,
+#filter_tags_for a  {
+text-decoration:none;
 font-weight:bold;
 margin-top:7px;
 float:left;
 }
+#filter_tags_for a {
+margin:0;
+}
 
 #filter_tags_item label {
 margin-right:7px;
@@ -1454,6 +1649,15 @@ position:relative;
 top:3px;
 left:3px;
 }
+#filter_tags #form_filter_bymode .form_guide {
+display:none;
+}
+#filter_tags #form_filter_bymode .checkbox {
+float:none;
+}
+#filter_tags #form_filter_bymode legend {
+display:none;
+}
 
 .pagination {
 float:left;
@@ -1709,6 +1913,31 @@ width:auto;
 min-width:0;
 }
 
+/* tag autocomplete */
+
+.ptag-ac-line {
+font-weight: normal;
+background-color: white;
+}
+.ptag-ac-line:nth-child(odd) {
+background-color: #f1f1f1;
+}
+
+.ptag-ac-line-tag {
+min-width: 150px;
+display: inline-block;
+}
+
+.ptag-ac-line .freq {
+min-width: 50px;
+text-align: right;
+float:right;
+}
+
+.ptag-ac-line.mode-public .privacy_mode {
+display:none;
+}
+
 .inline-attachment img {
     /* Why on earth is this changed to block at the top? */
     display: inline;