Merge remote branch 'upstream/master'

[friendica.git] / view / theme / dispy / dark / style.less

diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index f2714b717d3efacc656d8541d2bce8d7e12e6b08..000918a9b535c2c2343cf0d5fd2702d452379206 100644 (file)
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -190,7 +190,7 @@ label {
        font-size: small;
        margin: 0 10px 1em 0;
        .borders(1px, solid, @bg_colour);
-       padding: 5px;
+       padding: 3px 5px;
        background: @main_colour;
        color: darken(@main_alt_colour, 86.5%);
        .box_shadow(3px, 3px, 5px);
@@ -198,10 +198,14 @@ label {
 input {
        .box(250px, 25px);
        .borders(1px, solid, darken(@main_alt_colour, 33.5%));
+       width: 17em;
        &[type="checkbox"],
        &[type="radio"] {
-               margin: 0;
                .box(15px, 15px);
+               margin: 0;
+       }
+       &[type="radio"] {
+               margin: 5px 0;
        }
        &[type="submit"],
        &[type="button"] {
@@ -280,30 +284,35 @@ h6 {
        .box(100%, 100%);
        margin: 0 auto;
 }
-.button,
-#profile-listing-desc {
+.button {
        // .box(25%, auto);
        // background: @menu_bg_colour;
        color: @main_colour;
        // .borders(2px, outset, darken(@menu_bg_colour, 20%));
-       // .rounded_corners;
+       .rounded_corners;
        padding: 5px;
        // font-size: smaller;
        cursor: pointer;
-       &.active {
-               .box_shadow(4px, 4px, 7px);
-       }
+       // &.active {
+               // .box_shadow(4px, 4px, 7px);
+       // }
        a {
                color: @main_colour;
                // font-size: smaller;
                font-weight: bold;
        }
 }
+#profile-listing-desc {
+       a {
+               color: @main_colour;
+               font-weight: bold;
+       }
+}
 [class$="-desc"],
 [id$="-desc"] {
-       color: @bg_colour;
-       // background: @main_colour;
-       .borders(1px, outset, @main_colour);
+       color: @main_colour;
+       background: @bg_colour;
+       .borders(3px, outset, @main_colour);
        .rounded_corners;
        // .box_shadow(3px, 3px, 5px);
     margin: 3px 10px 7px 0;
@@ -658,17 +667,19 @@ nav #nav-notifications-linkmenu {
 }
 #search-text,
 #mini-search-text {
-       background: @bg_colour;
-       color: @main_colour;
+       background: white;
+       color: @bg_colour;
        margin: 8px;
 }
 #search-text {
-       .borders;
+       .borders(1px, solid, @main_alt_colour);
+       margin: 8px 0;
 }
 #mini-search-text {
        font-size: 8pt;
        height: 14px;
        width: 10em;
+       margin: 5px;
 }
 #scrollup {
        position: fixed;
@@ -754,11 +765,13 @@ nav #nav-notifications-linkmenu {
 .menu-popup {
        position: absolute;
        display: none;
-       width: 11em;
+       // width: 11em;
        background: white;
        color: @bg_colour;
        margin: 0px;
        padding: 0px;
+       font-size: small;
+       line-height: 1.1;
        .borders(3px, solid, @link_colour);
        .rounded_corners;
        z-index: 100000;
@@ -1016,7 +1029,7 @@ nav #nav-notifications-linkmenu {
        background: darken(@main_alt_colour, 46.8%);
 }
 [id$="jot-text_ifr"] {
-       width: 99.900002% !important;
+       // width: 99.900002% !important;
        color: @bg_colour;
        background: @main_colour;
        .mceContentBody {
@@ -1226,34 +1239,45 @@ nav #nav-notifications-linkmenu {
                font-size: smaller;
        }
 }
-.tab {
+.multibutton () {
        .borders(1px, solid, @hover_colour);
        padding: 4px;
-       &:hover,
-       &:active {
+       .rounded_corners;
+       &:active,
+       &:hover {
                background: @shiny_colour;
                color: @main_colour;
                .borders(1px, solid, @hover_colour);
        }
-       &.active {
-               background: @main_colour;
-               color: @bg_colour;
+       a {
+               border: 0;
+               text-decoration: none;
+       }
+}
+.multibutton_active () {
+       background: @main_colour;
+       color: @bg_colour;
+       .borders(1px, solid, @hover_colour);
+       padding: 4px;
+       .rounded_corners;
+       &:hover {
+               background: @shiny_colour;
+               color: @main_colour;
                .borders(1px, solid, @hover_colour);
-               &:hover {
-                       background: @shiny_colour;
-                       color: @main_colour;
-                       .borders(1px, solid, @hover_colour);
-               }
-               a {
-                       color: @bg_colour;
-                       text-decoration: none;
-               }
        }
        a {
-               border: 0;
+               color: @bg_colour;
                text-decoration: none;
        }
 }
+.tab {
+       .multibutton;
+}
+.tab {
+       &.active {
+               .multibutton_active;
+       }
+}
 
 
 /**
@@ -1595,7 +1619,6 @@ div {
        }
        &[id$="wrapper"] {
                height: 100%;
-               margin-bottom: 1em;
                br {
                        clear: left;
                }
@@ -1933,11 +1956,6 @@ div {
 #contact-edit-poll-text {
        display: inline;
 }
-#contact-edit-info_tbl,
-#contact-edit-info_parent,
-.mceLayout {
-       width: 100%;
-}
 #contact-edit-end {
        clear: both;
        margin-bottom: 65px;
@@ -1956,20 +1974,25 @@ div {
 }
 .contact-photo-menu {
        width: auto;
-       .borders(2px, solid, darken(@main_alt_colour, 66.5%));
+       .borders(2px, solid, @link_colour);
        background: @bg_colour;
        color: @main_colour;
        position: absolute;
+       font-size: smaller;
+       .rounded_corners;
        left: 0px;
        top: 90px;
        display: none;
        z-index: 10000;
        li a {
                display: block;
-               padding: 2px;
+               padding: 4px;
+               color: @link_colour;
+               background: @main_colour;
+               line-height: 1;
                &:hover {
-                       color: white;
-                       background: #3465A4;
+                       background: @link_colour;
+                       color: @main_colour;
                        text-decoration: none;
                }
        }
@@ -2001,13 +2024,12 @@ div {
 }
 #register-form label,
 #profile-edit-form label {
-    width: 300px;
-    float: left;
+    width: 23em;
 } 
 #register-form span,
 #profile-edit-form span {
     color: @menu_bg_colour;
-    display: block;
+    display: inline-block;
     margin-bottom: 20px;
 }
 #profile-edit-marital-label span {
@@ -2020,12 +2042,6 @@ div {
 .profile-edit-side-div {
        display: none;
 }
-/*.profile-edit-side-div:hover {
-    display: block;
-}
-.profile-edit-side-link {
-    margin: 3px 0px 0px 70px;
-}*/
 #profiles-menu-trigger {
        margin: 0px 0px 0px 25px;
 }
@@ -2320,19 +2336,20 @@ div {
 .group-selected,
 .nets-selected,
 .fileas-selected {
-       padding: 3px;
-       color: @bg_colour;
-       background: @main_colour;
-       .borders(1px, solid, @link_colour);
-}
-.group-selected:hover,
-.nets-selected:hover,
-.fileas-selected:hover {
-       padding: 3px;
-       color: @link_colour;
-       background: @bg_colour;
-       .borders(1px, solid, @link_colour);
-}
+       // padding: 4px;
+       // color: @bg_colour;
+       // background: @main_colour;
+       // .borders(1px, solid, @link_colour);
+       .multibutton_active;
+}
+// .group-selected:hover,
+// .nets-selected:hover,
+// .fileas-selected:hover {
+//     padding: 4px;
+//     color: @link_colour;
+//     background: @bg_colour;
+//     .borders(1px, solid, @link_colour);
+// }
 .groupsideedit {
        margin-right: 10px;
 }
@@ -2350,13 +2367,8 @@ div {
        }
 }
 .sidebar-group-element {
-       padding: 3px;
-       &:hover {
-               color: @main_colour;
-               background: @shiny_colour;
-               .borders(1px, solid, @hover_colour);
-               padding: 3px;
-       }
+       .multibutton;
+       .rounded_corners;
 }
 #sidebar-new-group {
        margin: auto;
@@ -2380,17 +2392,9 @@ div {
        }
 }
 #side-peoplefind-url {
-       background-color: @bg_colour;
-       color: @main_colour;
        .borders(1px, solid, darken(@main_alt_colour, 33.5%));
        margin-right: 3px;
        width: 75%;
-       &:hover,
-       &:focus {
-               background-color: @main_alt_colour;
-               color: darken(@main_alt_colour, 80%);
-               .borders(1px, solid, darken(@main_alt_colour, 73.5%));
-       }
 }
 .nets-ul {
        .list_reset;