Merge branch 'newacl' into newui

[friendica.git] / view / theme / dispy / style.css

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index c04a67ec9db019f09e4eb2333e4606acb9176764..e9d11d601f81c4f326cdb0280c718d3bdb09089d 100644 (file)
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -321,9 +321,10 @@ aside #viewcontacts { text-align: right;}
        padding: 5px;
 }
 #profile-jot-acl-wrapper {
-       margin: 0px 10%;
+       margin: 0px 10px;
        border: 1px solid #555753;
        border-top: 0px;
+        display:block!important;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
@@ -342,25 +343,6 @@ aside #viewcontacts { text-align: right;}
 
 
 
-
-#acl-permit-wrapper,
-#acl-deny-wrapper { padding: 5px; }
-
-#acl-allow-group-label,
-#acl-allow-contact-label,
-#acl-deny-group-label,
-#acl-deny-contact-label { display: block }
-
-#group_allow, #contact_allow,
-#group_deny, #contact_deny,
-#profile-jot-acl-wrapper select { width: 100%; }
-
-#acl-wrapper-end,
-#profile-jot-end { clear: both; height: 5px; }
-
-
-
-
 /**
  * section
  */
@@ -1130,3 +1112,107 @@ div[id$="wrapper"] br { clear: left; }
  .cc-license { margin-top: 100px; font-size: 0.7em; }                                  
 footer { display: block; margin: 50px 20%; clear: both; }
                                   
+#profile-jot-text {
+    height: 20px;
+    color:#cccccc;
+    border: 1px solid #cccccc;
+}
+/** acl **/
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper{
+       display:block!important;
+}
+
+#acl-wrapper {
+       width: 690px;
+       float:left;
+}
+#acl-search {
+       float:right;
+       background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+       padding-right:20px;
+}
+#acl-showall {
+       float: left;
+       display: block;
+       width: auto;
+       height: 18px;
+       background-color: #cccccc;
+       background-image: url("../../../images/show_all_off.png");
+       background-position: 7px 7px;
+       background-repeat: no-repeat;
+       padding: 7px 10px 7px 30px;
+       -webkit-border-radius: 5px ;
+       -moz-border-radius: 5px;
+       border-radius: 5px;
+       color: #999999;
+}
+#acl-showall.selected {
+       color: #000000;
+       background-color: #ff9900;
+       background-image: url("../../../images/show_all_on.png");
+}
+
+#acl-list {
+       height: 210px;
+       border: 1px solid #cccccc;
+       clear: both;
+       margin-top: 30px;
+       overflow: auto;
+}
+#acl-list-content {
+}
+.acl-list-item {
+       display: block;
+       width: 150px;
+       height: 30px;
+       border: 1px solid #cccccc;
+       margin: 5px;
+       float: left;
+}
+.acl-list-item img{
+       width:22px;
+       height: 22px;
+       float: left;
+       margin: 4px;
+}
+.acl-list-item p { font-size: 10px; margin: 0px; padding: 2px 0px 1px; }
+.acl-list-item a { 
+       font-size: 8px;
+       display: block;
+       width: 40px;
+       height: 10px;
+       float: left;
+       color: #999999;
+       background-color: #cccccc;
+       background-position: 3px 3px;
+       background-repeat: no-repeat;
+       margin-right: 5px;
+       -webkit-border-radius: 2px ;
+       -moz-border-radius: 2px;
+       border-radius: 2px;
+       padding-left: 15px;
+}
+#acl-wrapper a:hover {
+       text-decoration: none;
+       color:#000000;
+}
+.acl-button-show { background-image: url("../../../images/show_off.png"); }
+.acl-button-hide { background-image: url("../../../images/hide_off.png"); }
+
+.acl-button-show.selected {
+       color: #000000;
+       background-color: #9ade00;
+       background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+       color: #000000;
+       background-color: #ff4141;
+       background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow { border-color: #9ade00; }
+.acl-list-item.grouphide { border-color: #ff4141; }
+/** /acl **/
+
+