Merge branch '1.0.x' into people_tags_rebase

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

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 3e3bfdfa86a0c60cc4456cd2e08fa51407df8126..8f92c2d82028c4ba8240bf5142d4b353d5d5ca03 100644 (file)
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -136,6 +136,7 @@ color:#002FA7;
 .notice,
 .profile,
 .application,
+.peopletag,
 #content tbody tr {
 border-top-color:#C8D1D5;
 }
@@ -186,8 +187,13 @@ button.close,
 .form_user_unsubscribe input.submit,
 .form_group_join input.submit,
 .form_user_subscribe input.submit,
+.form_user_remove_peopletag input.submit,
+.form_user_add_peopletag input.submit,
+.form_peopletag_subscribe input.submit,
+.form_peopletag_unsubscribe input.submit,
 .form_remote_authorize input.submit,
 .entity_subscribe a,
+.entity_tag a,
 .entity_moderation p,
 .entity_sandbox input.submit,
 .entity_silence input.submit,
@@ -205,7 +211,9 @@ button.minimize,
 .entity_subscribe input.submit,
 #realtime_play,
 #realtime_pause,
-#realtime_popup {
+#realtime_popup,
+.peopletags_edit_button,
+.mode-private .privacy_mode {
 background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -300,33 +308,66 @@ background-position:0 1px;
 .form_group_join input.submit,
 .form_group_leave input.submit,
 .form_user_subscribe input.submit,
+.form_peopletag_subscribe input.submit,
+.form_peopletag_unsubscribe input.submit,
 .form_user_unsubscribe input.submit,
 .form_remote_authorize input.submit,
+.form_user_add_peopletag input.submit,
+.form_user_remove_peopletag input.submit,
 .entity_subscribe a {
 background-color:#AAAAAA;
 color:#FFFFFF;
 }
 .form_group_leave input.submit,
-.form_user_unsubscribe input.submit {
+.form_user_unsubscribe input.submit,
+.form_user_remove_peopletag input.submit,
+.form_peopletag_unsubscribe input.submit {
 background-position:5px -1246px;
 }
 .form_group_join input.submit,
 .form_user_subscribe input.submit,
+.form_peopletag_subscribe input.submit,
 .form_remote_authorize input.submit,
-.entity_subscribe a {
+.form_user_add_peopletag input.submit,
+.entity_subscribe a,
+.entity_tag a {
 background-position:5px -1181px;
 }
 
-.entity_edit a {
+.profile-lister li {
+border-top: 1px #eee solid;
+}
+.profile-lister li:first-child {
+border:0;
+}
+#profile_search_results.profile-lister {
+max-height:800px;
+margin:10px 0;
+border:1px #ddd solid;
+}
+
+.entity_edit a, .peopletags_edit_button {
 background-position: 5px -719px;
 }
+
+.peopletags_edit_button {
+background-position: 0px -724px;
+}
+.entity_tags li.mode-private {
+color: #829D25;
+}
+.mode-private .privacy_mode {
+background-position: 0px -1978px;
+}
+
 .entity_send-a-message a {
 background-position: 5px -852px;
 }
 .entity_send-a-message .form_notice,
 .entity_moderation:hover ul,
 .entity_role:hover ul,
-.dialogbox {
+.dialogbox,
+#profile_search_results {
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 -webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -515,4 +556,18 @@ background-position:90% 47%;
 background-position:10% 47%;
 }
 
+.tagInputDiv {
+background-color: white;
+border: 1px solid lightgray;
+}
+
+.tagInputDiv .mode-public .privacy_mode {
+display:none;
+}
+
+.tagInputSel {
+background-color: gray;
+color:white;
+}
+
 }/*end of @media screen, projection, tv*/