diff options
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/header.scss | 53 | ||||
| -rw-r--r-- | core/css/icons.scss | 8 | ||||
| -rw-r--r-- | core/css/styles.scss | 8 |
3 files changed, 25 insertions, 44 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index 4b6c0fbd007..6f41dd8154f 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -6,8 +6,8 @@ * @copyright Copyright (c) 2016, Erik Pellikka <erik@pellikka.org> * @copyright Copyright (c) 2016, jowi <sjw@gmx.ch> * @copyright Copyright (c) 2015, Hendrik Leppelsack <hendrik@leppelsack.de> - * @copyright Copyright (c) 2015, Jan-Christoph Borchardt <hey@jancborchardt.net> * @copyright Copyright (c) 2015, Volker E <volker.e@temporaer.net> + * @copyright Copyright (c) 2014-2017, Jan-Christoph Borchardt <hey@jancborchardt.net> * * @license GNU AGPL version 3 or any later version * @@ -248,10 +248,6 @@ nav { left: 242px; } -#expanddiv:after { - right: 15px; -} - #navigation { box-sizing: border-box; * { @@ -322,28 +318,6 @@ nav { } /* Apps management */ -.apps-management { - min-height: initial; - height: initial; - margin: 0; - a { - svg, - span { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)'; - opacity: .3; - } - /* icon opacity and hover effect */ - &:hover svg, - &:focus svg, - &.active svg, - &:hover span, - &:focus span, - &.active span { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; - opacity: 1; - } - } -} #apps { max-height: calc(100vh - 100px); @@ -372,7 +346,7 @@ nav { #expand { display: flex; align-items: center; - padding: 7px 30px 6px 10px; + padding: 7px 20px 6px 10px; cursor: pointer; * { cursor: pointer; @@ -386,14 +360,12 @@ nav { &:focus, &:active { color: $color-primary-text; - img { + img, + #expandDisplayName { -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } } - .icon-caret { - margin-top: 0; - } /* Profile picture in header */ .avatardiv { @@ -409,6 +381,11 @@ nav { display: none; } } + + #expandDisplayName { + padding: 8px; + opacity: .7; + } } #expanddiv { @@ -425,7 +402,7 @@ nav { box-sizing: border-box; &:after { /* position of dropdown arrow */ - right: 15px; + right: 13px; } a { display: block; @@ -449,14 +426,6 @@ nav { } } -/* do not show display name when profile picture is present */ - -#header { - .avatardiv.avatardiv-shown + #expandDisplayName { - display: none; - } -} - #appmenu { display: inline-block; width: auto; @@ -583,4 +552,4 @@ nav { } } -}
\ No newline at end of file +} diff --git a/core/css/icons.scss b/core/css/icons.scss index 42224a9cfc4..d6a03b3187b 100644 --- a/core/css/icons.scss +++ b/core/css/icons.scss @@ -318,6 +318,14 @@ img, object, video, button, textarea, input, select { background-image: url('../img/actions/settings.svg?v=1'); } +.icon-settings-dark { + background-image: url('../img/actions/settings-dark.svg?v=1'); +} + +.icon-settings-white { + background-image: url('../img/actions/settings-white.svg?v=1'); +} + .icon-share { background-image: url('../img/actions/share.svg?v=1'); } diff --git a/core/css/styles.scss b/core/css/styles.scss index 2bec3c8d3b1..a5b7f2481d9 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -6,8 +6,8 @@ * @copyright Copyright (c) 2016, Joas Schilling <coding@schilljs.com> * @copyright Copyright (c) 2016, Morris Jobke <hey@morrisjobke.de> * @copyright Copyright (c) 2016, Christoph Wurst <christoph@winzerhof-wurst.at> - * @copyright Copyright (c) 2016, Jan-Christoph Borchardt <hey@jancborchardt.net> * @copyright Copyright (c) 2016, Raghu Nayyar <hey@raghunayyar.com> + * @copyright Copyright (c) 2011-2017, Jan-Christoph Borchardt <hey@jancborchardt.net> * * @license GNU AGPL version 3 or any later version * @@ -195,6 +195,10 @@ body { background-color: $color-primary !important; border: 1px solid rgba($color-primary-text, 0.5) !important; } + &:hover, &:focus, &:active { + -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; + opacity: 1; + } & ~ .icon-close-white { display: inline; position: absolute; @@ -298,7 +302,7 @@ body { } #emptycontent, .emptycontent { - color: nc-darken($color-main-background, 8%); + color: nc-lighten($color-main-text, 53%); text-align: center; margin-top: 30vh; width: 100%; |