diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-03-26 13:02:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-26 13:02:47 -0600 |
| commit | 7dd5d7363e5891b6ef270188f25d9cd582b6e7fe (patch) | |
| tree | a5ff783fadab1f65f65ca553dfdeebf759d1a040 /core/css | |
| parent | 84b5521981d05012094050e39b81b0870b1f5f03 (diff) | |
| parent | 2048e3e2014aceaee16336f3ceddbb00cf92993e (diff) | |
| download | nextcloud-server-7dd5d7363e5891b6ef270188f25d9cd582b6e7fe.tar.gz nextcloud-server-7dd5d7363e5891b6ef270188f25d9cd582b6e7fe.zip | |
Merge pull request #4074 from nextcloud/replace-name-with-icon
replace name in top right with icon for less noise
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/header.scss | 31 | ||||
| -rw-r--r-- | core/css/icons.scss | 8 |
2 files changed, 19 insertions, 20 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index 4b6c0fbd007..3de0c50bcd3 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; * { @@ -372,7 +368,7 @@ nav { #expand { display: flex; align-items: center; - padding: 7px 30px 6px 10px; + padding: 7px 20px 6px 10px; cursor: pointer; * { cursor: pointer; @@ -386,14 +382,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 +403,11 @@ nav { display: none; } } + + #expandDisplayName { + padding: 8px; + opacity: .7; + } } #expanddiv { @@ -425,7 +424,7 @@ nav { box-sizing: border-box; &:after { /* position of dropdown arrow */ - right: 15px; + right: 13px; } a { display: block; @@ -449,14 +448,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 +574,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'); } |