Merge branch 'master' of https://github.com/friendica/friendica

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

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 7a57628b94f7b8c797c6f75d58f78a5eb6fdf65b..c590042f11d87cddfdc09a96dcede78e7e4399ab 100644 (file)
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -520,11 +520,13 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
        position: fixed;
        left: 28px;
        bottom: 6px;
+       z-index: 10;
 }
 #language-selector {
     position: fixed;
     bottom: 2px;
     left: 52px;
+       z-index: 10;
 }
 .menu-popup {
     position: absolute;
@@ -810,6 +812,9 @@ aside #viewcontacts {
        border-bottom: 0;
        padding: 5px;
 }
+#profile-jot-net {
+       margin: 5px 0;
+}
 #jot-preview-link {
     margin: 0 0 0 10px;
     border: 0;
@@ -831,12 +836,12 @@ aside #viewcontacts {
     background-color: #555753;
     height: 22px;
     width: 20px;
-    -webkit-border-radius: 5px 0px 0px 5px;
-    -moz-border-radius: 5px 0px 0px 5px;
-    border-radius: 5px 0px 0px 5px;     
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;     
     overflow: hidden;
     border: 0px;
-    margin: 0 -4px 0 10px;
+    margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
        width: 1px;
@@ -854,23 +859,21 @@ aside #viewcontacts {
        height: 22px;
        background-color: #555753;
        color: #eeeeec;
-       -webkit-border-radius: 0 5px 5px 0;
-       -moz-border-radius: 0 5px 5px 0;
-       border-radius: 0 5px 5px 0;
+       -webkit-border-radius: 5px;
+       -moz-border-radius: 5px;
+       border-radius: 5px;
        border: 0;
        margin: 0;
        float: right;
 }
-#jot-perms-icons {
-       background-color: #555753;
+#jot-perms-icon {
        height: 22px;
        width: 20px;
-       -webkit-border-radius: 0 5px 5px 0;
-       -moz-border-radius: 0 5px 5px 0;
-       border-radius: 0 5px 5px 0;
+       -webkit-border-radius: 5px;
+       -moz-border-radius: 5px;
+       border-radius: 5px;
        overflow: hidden;
        border: 0;
-       margin: 0 0 0 94.4%;
 }
 #profile-jot-acl-wrapper {
        margin: 0 10px;
@@ -916,7 +919,8 @@ aside #viewcontacts {
        color: #cccccc;
 }
 #profile-jot-desc {
-       color: #a00;
+       color: #ff2000;
+       margin: 5px 0;
 }
 #jot-title-wrapper {
        margin-bottom: 5px;
@@ -1503,20 +1507,26 @@ div[id$="wrapper"] br {
 }
 .mail-list-sender-name {
     display: inline;
+       font-size: 1.1em;
 }
 .mail-list-date {
     display: inline;
-    font-size: 0.8em;
+    font-size: 0.9em;
     padding-left: 10px;
 }
+.mail-list-sender-name, .mail-list-date {
+       font-style: italic;
+}
 .mail-list-subject {
-    font-size: 1.5em;
+    font-size: 1.2em;
+       font-weight: bold;
 }
 .mail-list-delete-wrapper {
     float: right;
 }
 .mail-list-outside-wrapper-end {
     clear: both;
+       border-bottom: 1px #eec dotted;
 }
 .mail-conv-sender {
     float: left;
@@ -1734,11 +1744,21 @@ div[id$="wrapper"] br {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-    margin: 5px 2px 0 0;
+       background: #2e2f2e;
+       border-radius: 5px 5px 0 0;
+       width: 175px;
+       height: 20px;
+       position: relative;
+    margin: -25px -30px 0px 0px;
+       display: none;
+}
+.profile-edit-side-div:hover {
+       /*margin: 0px 0px 0px 0px;*/
+       display: inline;
 }
 .profile-edit-side-link {
-       margin: 0 20px -18px 0;
-    float: right;
+       margin: 0 0px 0px 155px;
+       /*float: right;*/
 }
 .profile-listing {
     float: left;
@@ -1749,6 +1769,9 @@ div[id$="wrapper"] br {
     padding: 0;
     list-style: none;
 }
+.marital {
+       margin-top: 5px;
+}
 #register-sitename {
     display: inline;
     font-weight: bold;
@@ -1970,6 +1993,9 @@ div[id$="wrapper"] br {
     background: #88a9d2;
     font-weight: bold;
 }
+.group-selected:hover, .nets-selected:hover {
+       color: #2e2f2e;
+}
 .groupsideedit {
     margin-right: 10px;
 }
@@ -2115,11 +2141,16 @@ div[id$="wrapper"] br {
     width: 16px; height: 16px;
 }
 #adminpage table tr:hover {
-    background-color:#bbc7d7;
+       color: #2e2f2e;
+    background-color: #eec;
 }
 #adminpage .selectall {
     text-align: right;
 }
+#adminpage #users a {
+       color: #2e2f2e;
+       text-decoration: underline;
+}
 
 /**
  * Form fields
@@ -2397,7 +2428,7 @@ div[id$="wrapper"] br {
        background-position: -70px -40px;
 }
 .unlock {
-       background-position: -90px -40px;
+       background-position: -88px -40px;
 }
 .video {
        background-position: -110px -40px;
@@ -2481,8 +2512,8 @@ footer {
 }
 #profile-jot-text {
     height: 20px;
-    color: #666;
-    border: 1px solid #ccc;
+    color: #eec;
+    border: 1px solid #eec;
     border-radius: 5px;
     width: 99.5%;
 }
@@ -2493,113 +2524,117 @@ footer {
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper {
     display: block !important;
+       background: #2e2f2e;
+       color: #eec;
 }
 #acl-wrapper {
-    width: 690px;
-    float: left;
+    width: 660px;
+       margin: 0 auto;
 }
 #acl-search {
     float: right;
     background: #fff url("../../../images/search_18.png") no-repeat right center;
     padding-right: 20px;
+       margin: 6px;
 }
 #acl-showall {
-    float:left;
-    display:block;
-    width:auto;
-    height:18px;
-    background-color:#CCC;
-    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:#999;
+    float: left;
+    display: block;
+    width: auto;
+    height: 18px;
+    background: #eec url("../../../images/show_all_off.png") 8px 8px no-repeat;
+    padding: 7px 10px 7px 30px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    color: #999;
+       margin: 5px 0;
 }
 #acl-showall.selected {
-    color:#000;
-    background-color:#F90;
-    background-image:url(../../../images/show_all_on.png);
+    color: #000;
+    background: #f90 url(../../../images/show_all_on.png) 8px 8px no-repeat;
 }
 #acl-list {
-    height:210px;
-    border:1px solid #ccc;
-    clear:both;
-    margin-top:30px;
-    overflow:auto;
-}
-#acl-list-content {
+    height: 210px;
+    border: 1px solid #ccc;
+    clear: both;
+    margin-top: 30px;
+    overflow: auto;
 }
+/*#acl-list-content {*/
+/*}*/
 .acl-list-item {
-    display:block;
-    width:150px;
-    height:30px;
-    border:1px solid #ccc;
-    margin:5px;
-    float:left;
+       border: 1px solid #eec;
+    display: block;
+    float: left;
+    height: 110px;
+    margin: 3px 0 5px 5px;
+    width: 120px;
 }
 .acl-list-item img {
-    width:22px;
-    height:22px;
-    float:left;
-    margin:4px;
+    width: 22px;
+    height: 22px;
+    float: left;
+    margin: 5px 5px 20px;
 }
 .acl-list-item p {
     height: 12px;
     font-size: 10px;
-    margin: 0;
+    margin: 0 0 22px;
     padding: 2px 0 1px;
 }
 .acl-list-item a {
-    font-size:8px;
-    display:block;
-    width:40px;
-    height:10px;
-    float:left;
-    color:#999;
-    background-color:#CCC;
-    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;
+    background: #eec 3px 3px no-repeat;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+       clear: both;
+    font-size: 10px;
+    display: block;
+    width: 55px;
+    height: 20px;
+    color: #2e2f2e;
+    margin: 5px auto 0;
+       padding: 0 3px;
+       text-align: center;
+       vertical-align: middle;
 }
 #acl-wrapper a:hover {
-    text-decoration:none;
-    color:#000;
+    text-decoration: none;
+    color: #2e2f2e;
+       border: 0;
 }
 .acl-button-show {
-    background-image:url('../../../images/show_off.png');
+    background-image: url('../../../images/show_off.png');
+       margin: 0 auto;
 }
 .acl-button-hide {
-    background-image:url('../../../images/hide_off.png');
+    background-image: url('../../../images/hide_off.png');
+       margin: 0 auto;
 }
 .acl-button-show.selected {
-    color:#000;
-    background-color:#9ade00;
-    background-image:url(../../../images/show_on.png);
+    color: #2e2f2e;
+    background-color: #9ade00;
+    background-image: url(../../../images/show_on.png);
 }
 .acl-button-hide.selected {
-    color:#000;
-    background-color:#ff4141;
-    background-image:url(../../../images/hide_on.png);
+    color: #2e2f2e;
+    background-color: #ff4141;
+    background-image: url(../../../images/hide_on.png);
 }
 .acl-list-item.groupshow {
-    border-color:#9ade00;
+    border-color: #9ade00;
 }
 .acl-list-item.grouphide {
-    border-color:#ff4141;
+    border-color: #ff4141;
 }
 /** /acl **/
 
 
 /* autocomplete popup */
 .acpopup {
-       max-height: 150px;
+       max-height: 175px;
+    max-width: 42%;
        background-color: #555753;
        color: #fff;
        overflow: auto;