Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add new variables for buttons
Signed-off-by: marco <[email protected]>
  • Loading branch information
marcoambrosini authored and backportbot[bot] committed Oct 7, 2021
commit 8223a66d2e050a21a7ed790a44110284c197e9b5
4 changes: 3 additions & 1 deletion apps/theming/css/theming.scss
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,9 @@ input.primary,

/** Handle primary buttons for bright colors */
@if (luma($color-primary) > 0.8) {
:root {
--color-primary-light-text: var(--color-primary-text);
}
select,
button, .button,
input:not([type='range']),
Expand All @@ -278,7 +281,6 @@ input.primary,
}
}
}

}

@if ($color-primary == #ffffff) {
Expand Down
11 changes: 11 additions & 0 deletions core/css/css-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,23 @@
--color-placeholder-dark: #{$color-placeholder-dark};

--color-primary: #{$color-primary};
--color-primary-hover: #{$color-primary-hover};
--color-primary-light: #{$color-primary-light};
--color-primary-light-hover: #{$color-primary-light-hover};
--color-primary-text: #{$color-primary-text};
--color-primary-light-text: #{$color-primary-light-text};
--color-primary-text-dark: #{$color-primary-text-dark};
--color-primary-element: #{$color-primary-element};
--color-primary-element-hover: #{$color-primary-element-hover};
--color-primary-element-light: #{$color-primary-element-light};
--color-primary-element-lighter: #{$color-primary-element-lighter};

--color-error: #{$color-error};
--color-error-hover: #{$color-error-hover};
--color-warning: #{$color-warning};
--color-warning-hover: #{$color-warning-hover};
--color-success: #{$color-success};
--color-success-hover: #{$color-success-hover};

--color-text-maxcontrast: #{$color-text-maxcontrast};
--color-text-light: #{$color-main-text};
Expand All @@ -44,6 +52,8 @@

--color-border: #{$color-border};
--color-border-dark: #{$color-border-dark};


--border-radius: #{$border-radius};
--border-radius-large: #{$border-radius-large};
--border-radius-pill: #{$border-radius-pill};
Expand All @@ -58,3 +68,4 @@

--header-height: #{$header-height};
}

11 changes: 11 additions & 0 deletions core/css/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,27 @@ $color-placeholder-light: nc-darken($color-main-background, 10%) !default;
$color-placeholder-dark: nc-darken($color-main-background, 20%) !default;

$color-primary: #0082c9 !default;
$color-primary-hover: mix($color-primary, $color-main-background, 80%) !default;

$color-primary-light: mix($color-primary, $color-main-background, 10%) !default;
$color-primary-light-text: $color-primary !default;
$color-primary-light-hover: mix($color-primary-light, $color-main-text, 95%) !default;

$color-primary-text: #ffffff !default;
// do not use nc-darken/lighten in case of overriding because
// primary-text is independent of color-main-text
$color-primary-text-dark: darken($color-primary-text, 7%) !default;
$color-primary-element: $color-primary !default;
$color-primary-element-hover: mix($color-primary-element, $color-main-background, 80%) !default;
$color-primary-element-light: lighten($color-primary-element, 15%) !default;
$color-primary-element-lighter: mix($color-primary-element, $color-main-background, 15%) !default;

$color-error: #e9322d;
$color-error-hover: mix($color-error, $color-main-background, 80%) !default;
$color-warning: #eca700;
$color-warning-hover: mix($color-warning, $color-main-background, 80%) !default;
$color-success: #46ba61;
$color-success-hover: mix($color-success, $color-main-background, 80%) !default;
// used for svg
$color-white: #fff;
$color-black: #000;
Expand All @@ -81,6 +91,7 @@ $color-box-shadow: transparentize(nc-darken($color-main-background, 70%), 0.5) !
$color-border: nc-darken($color-main-background, 7%) !default;
// darker border like inputs or very visible elements
$color-border-dark: nc-darken($color-main-background, 14%) !default;

$border-radius: 3px !default;
$border-radius-large: 10px !default;
// Pill-style button, value is large so big buttons also have correct roundness
Expand Down