diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-11-08 12:47:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 12:47:58 +0100 |
| commit | 497cd7fa4e629d6bb4a279e62b45debb3f47e6b2 (patch) | |
| tree | d2ec41c92650520a8ed3d4f1b0ec51f71cea087f /core/css | |
| parent | 79c9439c50729ab2880c21876ed0a775a6b85a5d (diff) | |
| parent | b44581e15d198e91c9bf947cd05afdbd559a7b30 (diff) | |
| download | nextcloud-server-497cd7fa4e629d6bb4a279e62b45debb3f47e6b2.tar.gz nextcloud-server-497cd7fa4e629d6bb4a279e62b45debb3f47e6b2.zip | |
Merge pull request #7064 from nextcloud/popover-fix
Fix popover layout
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/apps.scss | 41 | ||||
| -rw-r--r-- | core/css/share.scss | 20 |
2 files changed, 33 insertions, 28 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index 06a105971bb..5493375b5ae 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -837,8 +837,28 @@ kbd { font-weight: 300; box-shadow: none; width: 100%; + color: $color-main-text; /* Override the app-navigation li opacity */ opacity: .7 !important; + [class^='icon-'], + [class*=' icon-'], + &[class^='icon-'], + &[class*=' icon-'] { + min-width: 0; /* Overwrite icons*/ + min-height: 0; + background-position: 10px center; + background-size: 16px; + } + [class^='icon-'], + [class*=' icon-'] { + /* Keep padding to define the width to + assure correct position of a possible text */ + padding: 18px 0 18px 36px; + } + &[class^='icon-'], + &[class*=' icon-'] { + padding: 0 10px 0 36px !important; + } &:hover, &:focus, &.active { opacity: 1 !important; } @@ -857,7 +877,6 @@ kbd { } /* Add padding if contains icon+text */ &:not(:empty) { - padding: 0 !important; padding-right: 10px !important; } > img { @@ -870,15 +889,19 @@ kbd { margin: -2px 12px 0; } } + > input.radio + label { + padding: 0 !important; + &::before { + margin: -2px 11px 0; + } + } } - [class^='icon-'], - [class*=' icon-']{ - /* Keep padding to define the width to - assure correct position of a possible text */ - padding: 18px 0 18px 36px; - min-width: 0; /* Overwrite icons*/ - min-height: 0; - background-position: 10px center; + > button { + padding: 0; + span { + opacity: 1; + } } + } } diff --git a/core/css/share.scss b/core/css/share.scss index 2a9f357bc38..37217fa926a 100644 --- a/core/css/share.scss +++ b/core/css/share.scss @@ -104,7 +104,6 @@ .popovermenu { right: -11px; top: 35px; - padding: 3px 6px; } } @@ -112,8 +111,7 @@ white-space: nowrap; display: inline-block; } - .unshare img, - .showCruds img { + .unshare img { vertical-align: text-bottom; /* properly align icons */ } @@ -132,22 +130,6 @@ } } -a { - &.showCruds { - display: inline; - opacity: .5; - } - &.unshare { - display: inline-block; - opacity: .5; - padding: 10px; - } - &.showCruds:hover, - &.unshare:hover { - opacity: 1; - } -} - #link { border-top: 1px solid nc-darken($color-main-background, 14%); padding-top: 8px; |