upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 22:27:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Merge pull request #12558 from nextcloud/blurry-button

Browse source 
Apply border to primary button if on log in page (and not in a dark container) or if in header
This commit is contained in:
Morris Jobke 2018-11-22 10:18:52 +01:00 committed by GitHub
commit 2e68b73e5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/theming/css/theming.scss
View file

@ -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 {

14
core/css/inputs.scss
View file

@ -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);