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 2e6e0ae8b6748379f9d5d257535f2ad28474425c..000918a9b535c2c2343cf0d5fd2702d452379206 100644 (file)
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -90,6 +90,9 @@ tr:nth-child(even) {
 //outline-style                Sets the style of an outline    dotted,dashed,solid,double,groove,ridge,inset,outset,inherit
 //outline-width                Sets the width of an outline    thin,medium,thick,length,inherit
 :focus {
+       outline: none;
+}
+a:focus {
        outline: invert, dashed, thin;
 }
 [disabled="disabled"] {
@@ -187,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);
@@ -195,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"] {
@@ -260,30 +267,6 @@ h6 {
 .smalltext {
        font-size: 0.7em;
 }
-#panel {
-       position: absolute;
-       .rounded_corners;
-       .borders(1px, solid, @main_alt_colour);
-       background-color: @bg_alt_colour;
-       color: @main_colour;
-       padding: 1em;
-}
-.pager {
-       margin-top: 60px;
-       display: block;
-       clear: both;
-       text-align: center;
-       font-size: small;
-       font-weight: bold;
-       span {
-               padding: 4px;
-               margin: 4px;
-       }
-}
-.pager_current {
-       background-color: @link_colour;
-       color: @bg_colour;
-}
 
 
 /**
@@ -301,10 +284,35 @@ h6 {
        .box(100%, 100%);
        margin: 0 auto;
 }
+.button {
+       // .box(25%, auto);
+       // background: @menu_bg_colour;
+       color: @main_colour;
+       // .borders(2px, outset, darken(@menu_bg_colour, 20%));
+       .rounded_corners;
+       padding: 5px;
+       // font-size: smaller;
+       cursor: pointer;
+       // &.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;
+       color: @main_colour;
+       background: @bg_colour;
+       .borders(3px, outset, @main_colour);
        .rounded_corners;
        // .box_shadow(3px, 3px, 5px);
     margin: 3px 10px 7px 0;
@@ -569,6 +577,9 @@ div.jGrowl div {
                padding-left: 58px;
                margin-top: 50px;
        }
+       // &.jGrowl-message {
+
+       // }
 }
 #nav-notifications-menu {
        margin: 30px 0 0 -20px;
@@ -656,18 +667,19 @@ nav #nav-notifications-linkmenu {
 }
 #search-text,
 #mini-search-text {
-       background: @bg_colour;
-       color: @main_colour;
-       font-size: 8pt;
+       background: white;
+       color: @bg_colour;
        margin: 8px;
-       height: 14px;
 }
 #search-text {
-       .borders;
-       width: 90%;
+       .borders(1px, solid, @main_alt_colour);
+       margin: 8px 0;
 }
 #mini-search-text {
+       font-size: 8pt;
+       height: 14px;
        width: 10em;
+       margin: 5px;
 }
 #scrollup {
        position: fixed;
@@ -753,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;
@@ -1015,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 {
@@ -1096,7 +1110,7 @@ nav #nav-notifications-linkmenu {
        .box(20px, 20px);
        .rounded_corners;
        .box_shadow(3px, 3px, 5px, 0);
-       .borders(2px, outset, @main_alt_colour);
+       .borders(2px, outset, @menu_bg_colour);
        overflow: hidden;
        margin: 0 10px 0 10px;
 }
@@ -1171,6 +1185,9 @@ nav #nav-notifications-linkmenu {
        color: darken(@main_alt_colour, 13%);
 }
 #profile-jot-desc {
+       background: @bg_colour;
+       .borders;
+       .rounded_corners;
        color: @red_orange;
        margin: 5px 0;
 }
@@ -1184,9 +1201,9 @@ nav #nav-notifications-linkmenu {
        display: none;
 }
 #jot-preview-content {
-       background-color: @bg_alt_colour;
+       background-color: @shiny_colour;
        color: @main_colour;
-       .borders(1px, solid, @main_colour);
+       .borders(1px, solid, @bg_colour);
        .rounded_corners;
        .box_shadow(5px, 0, 10px);
        padding: 3px 3px 6px 10px;
@@ -1222,30 +1239,45 @@ nav #nav-notifications-linkmenu {
                font-size: smaller;
        }
 }
-.tab {
+.multibutton () {
        .borders(1px, solid, @hover_colour);
        padding: 4px;
-       &:hover,
-       &.active: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);
-               a {
-                       color: @bg_colour;
-                       text-decoration: none;
-               }
        }
        a {
-               border: 0;
+               color: @bg_colour;
                text-decoration: none;
        }
 }
+.tab {
+       .multibutton;
+}
+.tab {
+       &.active {
+               .multibutton_active;
+       }
+}
 
 
 /**
@@ -1302,7 +1334,7 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-info {
        float: left;
-       width: 110px;
+       width: 8em;
 }
 .wall-item-photo-wrapper {
        .box(80px, 80px);
@@ -1367,16 +1399,21 @@ nav #nav-notifications-linkmenu {
        }
 }
 .wall-item-author,
-.wall-item-actions-author {
+.wall-item-actions-author,
+.wall-item-ago {
        clear: left;
        float: left;
-       font-size: 0.8em;
-       color: lighten(@menu_bg_colour, 20%);
-       margin: 1em auto 0 0.2em;
+       color: @main_colour;
+       line-height: 1;
+       display: inline-block;
+       font-size: 0.75em;
+       margin: 0.5em auto 0;
 }
-.wall-item-ago {
-       display: inline;
-       padding-left: 10px;
+.wall-item-author,
+.wall-item-actions-author {
+       margin: 0.5em auto 0;
+       font-size: 0.75em;
+       font-weight: bold;
 }
 .wall-item-location {
        margin-top: 15px;
@@ -1386,7 +1423,8 @@ nav #nav-notifications-linkmenu {
        .icon {
                float: left;
        }
-       > a, .smalltext {
+       > a,
+       .smalltext {
                margin-left: 25px;
                font-size: 0.7em;
                display: block;
@@ -1420,7 +1458,8 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-photo-menu {
        min-width: 92px;
-       .borders(2px, solid, white);
+       font-size: 0.75em;
+       .borders(2px, solid, @menu_bg_colour);
        border-top: 0px;
        background: @menu_bg_colour;
        position: absolute;
@@ -1432,7 +1471,7 @@ nav #nav-notifications-linkmenu {
        li a {
                white-space: nowrap;
                display: block;
-               padding: 5px 2px;
+               padding: 5px 6px;
                color: @main_alt_colour;
                &:hover {
                        color: @menu_bg_colour;
@@ -1461,6 +1500,9 @@ nav #nav-notifications-linkmenu {
        font-size: 0.9em;
        margin-left: 5em;
 }
+.hide-comments-outer {
+       font-size: small;
+}
 .wall-item-outside-wrapper.comment {
        margin-left: 5em;
        .wall-item-photo {
@@ -1475,9 +1517,6 @@ nav #nav-notifications-linkmenu {
                top: 45px;
                background-position: 35px center;
        }
-       .wall-item-info {
-               width: 60px;
-       }
        .wall-item-body {
                margin-left: 10px;
        }
@@ -1580,7 +1619,6 @@ div {
        }
        &[id$="wrapper"] {
                height: 100%;
-               margin-bottom: 1em;
                br {
                        clear: left;
                }
@@ -1918,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;
@@ -1941,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;
                }
        }
@@ -1986,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 {
@@ -2005,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;
 }
@@ -2305,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;
 }
@@ -2335,12 +2367,8 @@ div {
        }
 }
 .sidebar-group-element {
-       padding: 3px;
-       &:hover {
-               color: @bg_colour;
-               background: @link_colour;
-               padding: 3px;
-       }
+       .multibutton;
+       .rounded_corners;
 }
 #sidebar-new-group {
        margin: auto;
@@ -2364,16 +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;
@@ -2468,13 +2489,13 @@ div {
                }
                &#users {
                        padding: 5px;
-               }
-               &#users img {
-                       .box(16px, 16px);
-               }
-               &#users a {
-                       color: @main_colour;
-                       text-decoration: underline;
+                   img {
+                           .box(16px, 16px);
+               }
+            a {
+                           color: @main_colour;
+                           text-decoration: underline;
+            }
                }
        }
        td .icon {
@@ -2572,9 +2593,33 @@ div {
        }
 }
 #panel {
+       position: absolute;
+       font-size: small;
+       .rounded_corners;
+       .borders(1px, solid, @main_alt_colour);
+       background-color: @bg_alt_colour;
+       color: @main_colour;
+       padding: 1em;
        z-index: 100;
 }
-.grey, .gray {
+.pager {
+       margin-top: 60px;
+       display: block;
+       clear: both;
+       text-align: center;
+       font-size: small;
+       font-weight: bold;
+       span {
+               padding: 4px;
+               margin: 4px;
+       }
+}
+.pager_current {
+       background-color: @link_colour;
+       color: @bg_colour;
+}
+.grey,
+.gray {
        color: gray;
 }
 .orange {
@@ -2663,7 +2708,7 @@ div {
 .editicon {
        display: inline-block;
        .box(21px, 21px);
-       background: url(dark/editicons.png) no-repeat;
+       background: url("dark/editicons.png") no-repeat;
        border: 0;
        text-decoration: none;
 }
@@ -2928,6 +2973,7 @@ footer {
        margin: 0 10px;
        .borders(1px, solid, @menu_bg_colour);
        border-top: 0;
+       font-size: small;
        // .box_shadow;
 }
 #acl-wrapper {