diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-11-22 10:18:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-22 10:18:52 +0100 |
| commit | 2e68b73e5ebb34d8200b06554b8ec573eaf42378 (patch) | |
| tree | 07088dc7d74e902b6904e5074fd95cc391740800 | |
| parent | bebdb19ac24c08d3a1153550cd62002608f129bd (diff) | |
| parent | f80a0234319ce1206892259b65e63f5277b2ecb9 (diff) | |
| download | nextcloud-server-2e68b73e5ebb34d8200b06554b8ec573eaf42378.tar.gz nextcloud-server-2e68b73e5ebb34d8200b06554b8ec573eaf42378.zip | |
Merge pull request #12558 from nextcloud/blurry-button
Apply border to primary button if on log in page (and not in a dark container) or if in header
| -rw-r--r-- | apps/theming/css/theming.scss | 7 | ||||
| -rw-r--r-- | core/css/inputs.scss | 14 |
2 files changed, 14 insertions, 7 deletions
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index e2cd8fb11ee..ea3792458fa 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -82,10 +82,9 @@ $invert: luma($color-primary) > 0.6; @include icon-color('checkbox-mark', 'actions', $color-white, 1, true); } } - #body-user { - .primary { - border: 1px solid transparent; - } + /* Always give primary button a border for light primary colors */ + .primary { + border-color: var(--color-border) !important; } } @else { #appmenu:not(.inverted) svg { diff --git a/core/css/inputs.scss b/core/css/inputs.scss index fde251075a8..8b4198644da 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -85,14 +85,22 @@ div[contenteditable=true], /* Primary action button, use sparingly */ &.primary { background-color: var(--color-primary-element); - border: 1px solid var(--color-primary-text); + border-color: var(--color-primary-element); color: var(--color-primary-text); cursor: pointer; + + /* Apply border to primary button if on log in page (and not in a dark container) or if in header */ + #body-login :not(.body-login-container) &, + #header & { + border-color: var(--color-primary-text); + } + &:not(:disabled) { &:hover, &:focus, - &:active { - background-color: var(--color-primary-element-light) + &:active { + background-color: var(--color-primary-element-light); + border-color: var(--color-primary-element-light); } &:active { color: var(--color-primary-text-dark); |