Skip to content

Commit

Permalink
fix(button): extract button variables
Browse files Browse the repository at this point in the history
  • Loading branch information
joneff committed Oct 1, 2020
1 parent c1889b5 commit 44a3806
Show file tree
Hide file tree
Showing 16 changed files with 465 additions and 463 deletions.
116 changes: 0 additions & 116 deletions packages/bootstrap/scss/_variables.scss
Expand Up @@ -550,122 +550,6 @@ $invalid-border: $error !default;
$invalid-shadow: 0 0 0 .2rem rgba($invalid-border, .25) !default;


// Buttons

/// Width of border around buttons
/// @group buttons
$button-border-width: $btn-border-width !default;
/// Border radius of buttons
/// @group buttons
$button-border-radius: $border-radius !default;

/// Horizontal padding of buttons
/// @group buttons
$button-padding-x: $btn-padding-x !default;
/// Vertical padding of buttons
/// @group buttons
$button-padding-y: $btn-padding-y !default;
$button-font-family: $font-family !default;
$button-font-size: $font-size !default;
$button-line-height: $btn-line-height !default;

$button-padding-x-sm: $btn-padding-x-sm !default;
$button-padding-y-sm: $btn-padding-y-sm !default;
$button-line-height-sm: $btn-line-height-sm !default;

$button-calc-size: calc( #{$button-line-height * 1em} + #{$button-padding-y * 2} + #{$button-border-width * 2} ) !default;
$button-inner-calc-size: calc( #{$button-line-height * 1em} + #{$button-padding-y * 2} ) !default;

/// The background of the buttons.
/// @group buttons
$button-bg: $secondary !default;

/// The text color of the buttons.
/// @group buttons
$button-text: contrast-wcag( $button-bg, $gray-900 ) !default;

/// The border color of the buttons.
/// @group buttons
$button-border: $button-bg !default;

/// The background gradient of the buttons.
/// @group buttons
$button-gradient: null !default;
$button-shadow: null !default;

/// The background of hovered buttons.
/// @group buttons
$button-hovered-bg: try-darken( $button-bg, 7.5% ) !default;

/// The text color of hovered buttons.
/// @group buttons
$button-hovered-text: contrast-wcag( $button-hovered-bg, $gray-900 ) !default;

/// The border color of hovered buttons.
/// @group buttons
$button-hovered-border: try-darken( $button-border, 10% ) !default;

/// The background gradient of hovered buttons.
/// @group buttons
$button-hovered-gradient: null !default;
$button-hovered-shadow: null !default;

/// The background color of pressed buttons.
/// @group buttons
$button-pressed-bg: try-darken( $button-bg, 10% ) !default;

/// The text color of pressed buttons.
/// @group buttons
$button-pressed-text: contrast-wcag( $button-pressed-bg, $gray-900 ) !default;

/// The border color of pressed buttons.
/// @group buttons
$button-pressed-border: try-darken( $button-border, 12.5% ) !default;

/// The background gradient of pressed buttons.
/// @group buttons
$button-pressed-gradient: null !default;
$button-pressed-shadow: null !default;

/// The shadow of focused buttons.
/// @group buttons
$button-focused-shadow: 0 0 0 3px rgba($button-border, .5) !default;


// Disabled button
$button-disabled-bg: null !default;
$button-disabled-text: null !default;


// Primary button
$primary-button-bg: $primary !default;
$primary-button-text: contrast-wcag( $primary-button-bg ) !default;
$primary-button-border: $primary-button-bg !default;
$primary-button-gradient: null !default;

$primary-button-hovered-bg: try-darken( $primary-button-bg, 7.5% ) !default;
$primary-button-hovered-text: contrast-wcag( $primary-button-hovered-bg ) !default;
$primary-button-hovered-border: try-darken( $primary-button-border, 10% ) !default;
$primary-button-hovered-gradient: null !default;

$primary-button-pressed-bg: try-darken( $primary-button-bg, 10% ) !default;
$primary-button-pressed-text: contrast-wcag( $primary-button-pressed-bg ) !default;
$primary-button-pressed-border: try-darken( $primary-button-border, 12.5% ) !default;
$primary-button-pressed-gradient: null !default;
$primary-button-pressed-shadow: inset 0 2px 2px 0 rgba(0, 0, 0, .06) !default;

$primary-button-focused-shadow: 0 0 0 3px rgba($primary-button-border, .5) !default;

$flat-button-hover-opacity: .08 !default;
$flat-button-focused-opacity: null !default;
$flat-button-active-opacity: .16 !default;
$flat-button-selected-opacity: .2 !default;

$clear-button-text: #6c757d !default;
$clear-button-hover-text: $button-text !default;
$clear-button-focused-opacity: .1 !default;


$drag-clue-opacity: null !default;
$drag-clue-line-height: null !default;
$drag-clue-border-radius: null !default;
Expand Down
1 change: 1 addition & 0 deletions packages/bootstrap/scss/button/_index.scss
Expand Up @@ -9,5 +9,6 @@


// Component
@import "_variables.scss";
@import "_layout.scss";
@import "_theme.scss";
114 changes: 114 additions & 0 deletions packages/bootstrap/scss/button/_variables.scss
@@ -0,0 +1,114 @@
// Button

/// Width of border around buttons
/// @group buttons
$button-border-width: $btn-border-width !default;
/// Border radius of buttons
/// @group buttons
$button-border-radius: $border-radius !default;

/// Horizontal padding of buttons
/// @group buttons
$button-padding-x: $btn-padding-x !default;
/// Vertical padding of buttons
/// @group buttons
$button-padding-y: $btn-padding-y !default;
$button-font-family: $font-family !default;
$button-font-size: $font-size !default;
$button-line-height: $btn-line-height !default;

$button-padding-x-sm: $btn-padding-x-sm !default;
$button-padding-y-sm: $btn-padding-y-sm !default;
$button-line-height-sm: $btn-line-height-sm !default;

$button-calc-size: calc( #{$button-line-height * 1em} + #{$button-padding-y * 2} + #{$button-border-width * 2} ) !default;
$button-inner-calc-size: calc( #{$button-line-height * 1em} + #{$button-padding-y * 2} ) !default;

/// The background of the buttons.
/// @group buttons
$button-bg: $secondary !default;

/// The text color of the buttons.
/// @group buttons
$button-text: contrast-wcag( $button-bg, $gray-900 ) !default;

/// The border color of the buttons.
/// @group buttons
$button-border: $button-bg !default;

/// The background gradient of the buttons.
/// @group buttons
$button-gradient: null !default;
$button-shadow: null !default;

/// The background of hovered buttons.
/// @group buttons
$button-hovered-bg: try-darken( $button-bg, 7.5% ) !default;

/// The text color of hovered buttons.
/// @group buttons
$button-hovered-text: contrast-wcag( $button-hovered-bg, $gray-900 ) !default;

/// The border color of hovered buttons.
/// @group buttons
$button-hovered-border: try-darken( $button-border, 10% ) !default;

/// The background gradient of hovered buttons.
/// @group buttons
$button-hovered-gradient: null !default;
$button-hovered-shadow: null !default;

/// The background color of pressed buttons.
/// @group buttons
$button-pressed-bg: try-darken( $button-bg, 10% ) !default;

/// The text color of pressed buttons.
/// @group buttons
$button-pressed-text: contrast-wcag( $button-pressed-bg, $gray-900 ) !default;

/// The border color of pressed buttons.
/// @group buttons
$button-pressed-border: try-darken( $button-border, 12.5% ) !default;

/// The background gradient of pressed buttons.
/// @group buttons
$button-pressed-gradient: null !default;
$button-pressed-shadow: null !default;

/// The shadow of focused buttons.
/// @group buttons
$button-focused-shadow: 0 0 0 3px rgba($button-border, .5) !default;


// Disabled button
$button-disabled-bg: null !default;
$button-disabled-text: null !default;


// Primary button
$primary-button-bg: $primary !default;
$primary-button-text: contrast-wcag( $primary-button-bg ) !default;
$primary-button-border: $primary-button-bg !default;
$primary-button-gradient: null !default;

$primary-button-hovered-bg: try-darken( $primary-button-bg, 7.5% ) !default;
$primary-button-hovered-text: contrast-wcag( $primary-button-hovered-bg ) !default;
$primary-button-hovered-border: try-darken( $primary-button-border, 10% ) !default;
$primary-button-hovered-gradient: null !default;

$primary-button-pressed-bg: try-darken( $primary-button-bg, 10% ) !default;
$primary-button-pressed-text: contrast-wcag( $primary-button-pressed-bg ) !default;
$primary-button-pressed-border: try-darken( $primary-button-border, 12.5% ) !default;
$primary-button-pressed-gradient: null !default;
$primary-button-pressed-shadow: inset 0 2px 2px 0 rgba(0, 0, 0, .06) !default;

$primary-button-focused-shadow: 0 0 0 3px rgba($primary-button-border, .5) !default;

$flat-button-hover-opacity: .08 !default;
$flat-button-focused-opacity: null !default;
$flat-button-active-opacity: .16 !default;
$flat-button-selected-opacity: .2 !default;

$clear-button-text: #6c757d !default;
$clear-button-hover-text: $button-text !default;
$clear-button-focused-opacity: .1 !default;
1 change: 1 addition & 0 deletions packages/bootstrap/scss/forms/_index.scss
Expand Up @@ -3,6 +3,7 @@


// Dependencies // TODO: extract variables
@import "../button/_variables.scss";
@import "../input/_variables.scss";
@import "../toolbar/_index.scss";
@import "../window/_variables.scss";
Expand Down
116 changes: 0 additions & 116 deletions packages/classic/scss/_variables.scss
Expand Up @@ -532,122 +532,6 @@ $invalid-border: rgba( $error, .5 ) !default;
$invalid-shadow: null !default;


// Buttons

/// Width of border around buttons
/// @group button
$button-border-width: 1px !default;
/// Border radius of buttons
/// @group button
$button-border-radius: $border-radius !default;

/// Horizontal padding of buttons
/// @group button
$button-padding-x: $padding-x !default;
/// Vertical padding of buttons
/// @group button
$button-padding-y: $padding-y !default;
$button-font-family: $font-family !default;
$button-font-size: $font-size !default;
$button-line-height: $form-line-height !default;

$button-padding-x-sm: $button-padding-x / 2 !default;
$button-padding-y-sm: $button-padding-y / 2 !default;
$button-line-height-sm: $form-line-height-sm !default;

$button-inner-calc-size: calc( #{$button-line-height * 1em} + #{$button-padding-y * 2} ) !default;
$button-calc-size: calc( #{$button-inner-calc-size} + 2px ) !default;

/// The text color of the buttons.
/// @group button
$button-text: $base-text !default;

/// The background of the buttons.
/// @group button
$button-bg: $base-bg !default;

/// The border color of the buttons.
/// @group button
$button-border: $base-border !default;

/// The background gradient of the buttons.
/// @group button
$button-gradient: $base-gradient !default;
$button-shadow: null !default;

/// The text color of hovered buttons.
/// @group button
$button-hovered-text: $hovered-text !default;

/// The background of hovered buttons.
/// @group button
$button-hovered-bg: $hovered-bg !default;

/// The border color of hovered buttons.
/// @group button
$button-hovered-border: $hovered-border !default;

/// The background gradient of hovered buttons.
/// @group button
$button-hovered-gradient: $hovered-gradient !default;
$button-hovered-shadow: null !default;

/// The text color of pressed buttons.
/// @group button
$button-pressed-text: $button-text !default;

/// The background color of pressed buttons.
/// @group button
$button-pressed-bg: $button-bg !default;

/// The border color of pressed buttons.
/// @group button
$button-pressed-border: $button-border !default;

/// The background gradient of pressed buttons.
/// @group button
$button-pressed-gradient: none !default;
$button-pressed-shadow: 0 2px 2px 0 rgba(0, 0, 0, .06) !default;

/// The shadow of focused buttons.
/// @group button
$button-focused-shadow: 0 3px 4px 0 rgba(0, 0, 0, .06) !default;


// Disabled button
$button-disabled-bg: null !default;
$button-disabled-text: null !default;


// Primary button
$primary-button-bg: $primary !default;
$primary-button-text: contrast-wcag( $primary-button-bg ) !default;
$primary-button-border: $primary-button-bg !default;
$primary-button-gradient: rgba( adjust-hue( $primary-button-bg, 14), 0 ), rgba( adjust-hue( $primary-button-bg, 14), .2 ) !default;

$primary-button-hovered-text: $primary-button-text !default;
$primary-button-hovered-bg: adjust-hue( $primary-button-bg, 3) !default;
$primary-button-hovered-border: $primary-button-hovered-bg !default;
$primary-button-hovered-gradient: rgba( adjust-hue( $primary-button-hovered-bg, 14), 0 ), rgba( adjust-hue( $primary-button-hovered-bg, 14), .2 ) !default;

$primary-button-pressed-text: $primary-button-text !default;
$primary-button-pressed-bg: $primary-button-bg !default;
$primary-button-pressed-border: $primary-button-pressed-bg !default;
$primary-button-pressed-gradient: rgba( adjust-hue( $primary-button-pressed-bg, 14), .2 ), rgba( adjust-hue( $primary-button-pressed-bg, 14), 0 ) !default;
$primary-button-pressed-shadow: inset 0 2px 2px 0 rgba(0, 0, 0, .06) !default;

$primary-button-focused-shadow: 0 3px 4px 0 rgba($primary, .4) !default;

$flat-button-hover-opacity: .08 !default;
$flat-button-focused-opacity: null !default;
$flat-button-active-opacity: .16 !default;
$flat-button-selected-opacity: .2 !default;

$clear-button-text: $button-text !default;
$clear-button-hover-text: darken($body-text, 13%) !default;
$clear-button-focused-opacity: .1 !default;


$drag-clue-opacity: null !default;
$drag-clue-line-height: null !default;
$drag-clue-border-radius: null !default;
Expand Down
1 change: 1 addition & 0 deletions packages/classic/scss/button/_index.scss
@@ -1,3 +1,4 @@
// Component
@import "_variables.scss";
@import "~@progress/kendo-theme-default/scss/button/_layout.scss";
@import "~@progress/kendo-theme-default/scss/button/_theme.scss";

0 comments on commit 44a3806

Please sign in to comment.