diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-04-09 10:19:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 10:19:50 +0200 |
| commit | 123d9f0ce960a3ed0010bc8bcd86273d25ce2d50 (patch) | |
| tree | 6006028d8e7b7f4e9ed6e8ed03643567de9141b5 /core | |
| parent | b2350810e0dc32c47b38e03b9149e136c0c4ea8b (diff) | |
| parent | ffa2eaeb5629660b98d96605f632f54836868fff (diff) | |
| download | nextcloud-server-123d9f0ce960a3ed0010bc8bcd86273d25ce2d50.tar.gz nextcloud-server-123d9f0ce960a3ed0010bc8bcd86273d25ce2d50.zip | |
Merge pull request #8777 from nextcloud/various-css-fixes
Various css fixes
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/apps.scss | 22 | ||||
| -rw-r--r-- | core/css/inputs.scss | 3 |
2 files changed, 18 insertions, 7 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index 6b3ab623704..624f7984293 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -233,7 +233,7 @@ kbd { > a, > .app-navigation-entry-bullet { /* hide icon or bullet if loading state*/ - background: none !important; + background: transparent !important; } } /* Main entry link */ @@ -281,6 +281,12 @@ kbd { border: none; border-radius: 50%; cursor: pointer; + transition: background 100ms ease-in-out; + + + a { + /* hide icon if bullet, can't have both */ + background: transparent !important; + } } /* popover fix the flex positionning of the li parent */ @@ -337,7 +343,7 @@ kbd { margin: 0; z-index: 110; } - &:after { + &:before { position: absolute; height: 44px; width: 44px; @@ -357,13 +363,14 @@ kbd { -webkit-transform: rotate(-90deg); -ms-transform: rotate(-90deg); transform: rotate(-90deg); + z-index: 50; } /* force padding on link no matter if 'a' has an icon class */ > a:first-child { padding-left: 44px; } - &:after, + &:before, > a { transition: background 100ms ease-in-out, transform 250ms ease-in-out, @@ -375,12 +382,15 @@ kbd { } &:hover, &:focus { - &:after { + &:before { opacity: 1; } + .app-navigation-entry-bullet { + background: transparent !important; + } } &.open { - &:after { + &:before { -webkit-transform: rotate(0); -ms-transform: rotate(0); transform: rotate(0); @@ -467,7 +477,7 @@ kbd { height: 38px; flex: 0 0 36px; &:not(:last-child) { - border-radius: 0; + border-radius: 0 !important; } &:not(:first-child) { margin-left: -1px; diff --git a/core/css/inputs.scss b/core/css/inputs.scss index caa8209bdbd..7509575f9e5 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -219,7 +219,7 @@ input { background-clip: padding-box; /* Avoid background under border */ background-color: $color-main-background !important; opacity: 1; - width: 16px; + width: 34px; padding: 7px 6px; cursor: pointer; &:disabled { @@ -247,6 +247,7 @@ input { + .icon-confirm { border-color: $color-primary-element !important; border-left-color: transparent !important; + z-index: 2; /* above previous input */ } } } |