Skip to content

Commit

Permalink
feat(colorpicker): update component rendering and styles to match lat…
Browse files Browse the repository at this point in the history
…est design
  • Loading branch information
Juveniel authored and joneff committed Oct 15, 2021
1 parent a37220e commit a0bb137
Show file tree
Hide file tree
Showing 109 changed files with 1,410 additions and 604 deletions.
4 changes: 4 additions & 0 deletions packages/bootstrap/scss/all.scss
Expand Up @@ -49,6 +49,10 @@

// Inputs
@import "autocomplete/_index.scss";
@import "color-preview/_index.scss";
@import "colorpalette/_index.scss";
@import "colorgradient/_index.scss";
@import "coloreditor/_index.scss";
@import "colorpicker/_index.scss";
@import "combobox/_index.scss";
@import "datetime/_index.scss";
Expand Down
11 changes: 11 additions & 0 deletions packages/bootstrap/scss/color-preview/_index.scss
@@ -0,0 +1,11 @@
@import "../core/_index.scss";


// Dependencies


// Component
@import "../colorgradient/images/alpha-slider-bgr.scss";
@import "_variables.scss";
@import "_layout.scss";
@import "_theme.scss";
1 change: 1 addition & 0 deletions packages/bootstrap/scss/color-preview/_layout.scss
@@ -0,0 +1 @@
@import "~@progress/kendo-theme-default/scss/color-preview/_layout.scss";
1 change: 1 addition & 0 deletions packages/bootstrap/scss/color-preview/_theme.scss
@@ -0,0 +1 @@
@import "~@progress/kendo-theme-default/scss/color-preview/_theme.scss";
13 changes: 13 additions & 0 deletions packages/bootstrap/scss/color-preview/_variables.scss
@@ -0,0 +1,13 @@
// Color Preview
$color-preview-border-radius: $border-radius !default;
$color-preview-border-width: 1px !default;
$color-preview-bg: null !default;
$color-preview-text: null !default;
$color-preview-border: $component-border !default;
$color-preview-hover-border: $hovered-border !default;

$color-preview-no-color-bg: $white !default;
$color-preview-no-color-text: $error !default;
$color-preview-no-color-border: null !default;

$color-preview-no-color-image: escape-svg( url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='20' height='20' version='1.1'><line x1='0' x2='20' y1='0' y2='20' stroke='#{$color-preview-no-color-text}' stroke-width='1'/></svg>") ) !default;
14 changes: 14 additions & 0 deletions packages/bootstrap/scss/coloreditor/_index.scss
@@ -0,0 +1,14 @@
@import "../core/_index.scss";


// Dependencies
@import "../common/_index.scss";
@import "../action-buttons/_index.scss";
@import "../color-preview/_index.scss";
@import "../colorpalette/_index.scss";
@import "../colorgradient/_index.scss";

// Component
@import "_variables.scss";
@import "_layout.scss";
@import "_theme.scss";
1 change: 1 addition & 0 deletions packages/bootstrap/scss/coloreditor/_layout.scss
@@ -0,0 +1 @@
@import "~@progress/kendo-theme-default/scss/coloreditor/_layout.scss";
1 change: 1 addition & 0 deletions packages/bootstrap/scss/coloreditor/_theme.scss
@@ -0,0 +1 @@
@import "~@progress/kendo-theme-default/scss/coloreditor/_theme.scss";
28 changes: 28 additions & 0 deletions packages/bootstrap/scss/coloreditor/_variables.scss
@@ -0,0 +1,28 @@
// Coloreditor/FlatColorPicker
$coloreditor-spacer: map-get( $spacing, 4 ) !default;

$coloreditor-min-width: 328px !default;
$coloreditor-border-width: 1px !default;
$coloreditor-border-radius: $border-radius !default;
$coloreditor-font-family: $font-family !default;
$coloreditor-font-size: $font-size !default;
$coloreditor-line-height: $line-height !default;
$coloreditor-bg: $component-bg !default;
$coloreditor-text: $component-text !default;
$coloreditor-border: $component-border !default;

$coloreditor-focus-border: $hovered-border !default;
$coloreditor-focus-shadow: null !default;

$coloreditor-header-padding-y: $coloreditor-spacer !default;
$coloreditor-header-padding-x: $coloreditor-header-padding-y !default;
$coloreditor-header-actions-gap: ( $coloreditor-spacer / 2 ) !default;

$coloreditor-preview-gap: 2px !default;
$coloreditor-color-preview-width: 34px !default;
$coloreditor-color-preview-height: 14px !default;

$coloreditor-views-padding-y: $coloreditor-spacer !default;
$coloreditor-views-padding-x: $coloreditor-views-padding-y !default;
$coloreditor-views-gap: $coloreditor-spacer !default;

19 changes: 19 additions & 0 deletions packages/bootstrap/scss/colorgradient/_index.scss
@@ -0,0 +1,19 @@
@import "../core/_index.scss";


// Dependencies
@import "../common/_index.scss";
@import "../utils/_flex.scss";
@import "../utils/_spacer.scss";
@import "../icons/_index.scss";
@import "../button/_index.scss";
@import "../slider/_index.scss";
@import "../textbox/_index.scss";
@import "../numerictextbox/_index.scss";


// Component
@import "images/alpha-slider-bgr.scss";
@import "_variables.scss";
@import "_layout.scss";
@import "_theme.scss";
1 change: 1 addition & 0 deletions packages/bootstrap/scss/colorgradient/_layout.scss
@@ -0,0 +1 @@
@import "~@progress/kendo-theme-default/scss/colorgradient/_layout.scss";
1 change: 1 addition & 0 deletions packages/bootstrap/scss/colorgradient/_theme.scss
@@ -0,0 +1 @@
@import "~@progress/kendo-theme-default/scss/colorgradient/_theme.scss";
51 changes: 51 additions & 0 deletions packages/bootstrap/scss/colorgradient/_variables.scss
@@ -0,0 +1,51 @@
// ColorGradient
$colorgradient-spacer: map-get( $spacing, 4 ) !default;

$colorgradient-width: 328px !default;
$colorgradient-border-width: 1px !default;
$colorgradient-border-radius: $border-radius !default;
$colorgradient-padding-y: $colorgradient-spacer !default;
$colorgradient-padding-x: $colorgradient-padding-y !default;
$colorgradient-gap: $colorgradient-spacer !default;
$colorgradient-font-family: $font-family !default;
$colorgradient-font-size: $font-size !default;
$colorgradient-line-height: $line-height !default;
$colorgradient-bg: $component-bg !default;
$colorgradient-text: $component-text !default;
$colorgradient-border: $component-border !default;

$colorgradient-focus-border: $hovered-border !default;
$colorgradient-focus-shadow: null !default;

$colorgradient-canvas-border-radius: $border-radius !default;
$colorgradient-canvas-gap: map-get( $spacing, 3 ) !default;
$colorgradient-canvas-rectangle-height: 180px !default;

$colorgradient-slider-track-size: 10px !default;
$colorgradient-slider-border-radius: 10px !default;
$colorgradient-slider-draghandle-border-width: 3px !default;

$colorgradient-slider-vertical-size: 180px !default;
$colorgradient-slider-horizontal-size: 100% !default;

$colorgradient-draghandle-width: 14px !default;
$colorgradient-draghandle-height: 14px !default;
$colorgradient-draghandle-border-width: 1px !default;
$colorgradient-draghandle-border-radius: 50% !default;
$colorgradient-draghandle-bg: transparent !default;
$colorgradient-draghandle-text: null !default;
$colorgradient-draghandle-border: rgba( $white, .8) !default;
$colorgradient-draghandle-shadow: 0 1px 4px rgba(0, 0, 0, .5) !default;
$colorgradient-draghandle-focus-shadow: 0 1px 4px black !default;
$colorgradient-draghandle-hover-shadow: $colorgradient-draghandle-focus-shadow !default;

$colorgradient-canvas-draghandle-margin-y: -( $colorgradient-draghandle-height / 2 ) !default;
$colorgradient-canvas-draghandle-margin-x: -( $colorgradient-draghandle-width / 2 ) !default;

$colorgradient-input-width: 56px !default;
$colorgradient-input-gap: ( $colorgradient-spacer / 2 ) !default;
$colorgradient-input-label-gap: map-get( $spacing, 1 ) !default;
$colorgradient-input-label-text: $disabled-text !default;

$colorgradient-contrast-ratio-font-weight: $font-weight-bold !default;
$colorgradient-contrast-spacer: ( $colorgradient-spacer / 2 ) !default;
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,3 @@
@include exports("alpha-slider-bgr.png") {
@include register-data-uri("alpha-slider-bgr.png", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAuSURBVHgBxYyxDQAwDMJIL+YT+DjtzFRliUfLcklqBCRT4eCTxbD6kdL2/LgYXqpvCbs3kBv/AAAAAElFTkSuQmCC");
}
11 changes: 11 additions & 0 deletions packages/bootstrap/scss/colorpalette/_index.scss
@@ -0,0 +1,11 @@
@import "../core/_index.scss";


// Dependencies
@import "../common/_index.scss";
@import "../utils/_flex.scss";

// Component
@import "_variables.scss";
@import "_layout.scss";
@import "_theme.scss";
1 change: 1 addition & 0 deletions packages/bootstrap/scss/colorpalette/_layout.scss
@@ -0,0 +1 @@
@import "~@progress/kendo-theme-default/scss/colorpalette/_layout.scss";
1 change: 1 addition & 0 deletions packages/bootstrap/scss/colorpalette/_theme.scss
@@ -0,0 +1 @@
@import "~@progress/kendo-theme-default/scss/colorpalette/_theme.scss";
10 changes: 10 additions & 0 deletions packages/bootstrap/scss/colorpalette/_variables.scss
@@ -0,0 +1,10 @@
// Colorpalette
$colorpalette-font-family: $font-family !default;
$colorpalette-font-size: $font-size !default;
$colorpalette-line-height: 0 !default;

$colorpalette-tile-width: map-get( $spacing, 6 ) !default;
$colorpalette-tile-height: $colorpalette-tile-width !default;
$colorpalette-tile-focus-shadow: 0 0 3px 1px rgba( black, .3 ), inset 0 0 0 1px rgba( white, .5 ) !default;
$colorpalette-tile-hover-shadow: 0 0 3px 1px rgba( black, .3 ), inset 0 0 0 1px rgba( white, .8 ) !default;
$colorpalette-tile-selected-shadow: 0 1px 3px 1px rgba( black, .3 ), inset 0 0 0 1px rgba( white, 1 ) !default;
6 changes: 2 additions & 4 deletions packages/bootstrap/scss/colorpicker/_index.scss
Expand Up @@ -5,15 +5,13 @@
@import "../common/_index.scss";
@import "../utils/_flex.scss";
@import "../button/_index.scss";
@import "../numerictextbox/_index.scss";
@import "../slider/_index.scss";
@import "../colorpalette/_index.scss";
@import "../colorgradient/_index.scss";
@import "../popup/_index.scss";
@import "../icons/_index.scss";


// Component
@import "_variables.scss";
@import "images/alpha-slider-bgr.scss";
@import "images/alpha-slider-bgr-reversed.scss";
@import "_layout.scss";
@import "_theme.scss";
18 changes: 0 additions & 18 deletions packages/bootstrap/scss/colorpicker/_variables.scss
@@ -1,19 +1,7 @@
// Colorpicker
$colorpicker-rect-padding: 15px !default;
$colorpicker-margin: 8px !default;
$colorpicker-width: 349px !default;
$colorpicker-border-width: 1px !default;
$colorpicker-font-family: $font-family !default;
$colorpicker-font-size: $font-size !default;
$colorpicker-line-height: $line-height !default;
$colorpicker-draghandle-width: 14px !default;
$colorpicker-draghandle-height: 14px !default;
$colorpicker-slider-track-size: 10px !default;
$colorpicker-slider-border-radius: 10px !default;
$colorpicker-input-width: 52px !default;
$colorpicker-hex-input-width: 85px !default;
$colorpicker-input-padding-x: $input-padding-y !default;
$colorpicker-input-padding-y: $input-padding-y !default;

$colorpicker-select-border-width: 1px !default;

Expand All @@ -32,9 +20,3 @@ $colorpicker-focused-text: $button-active-text !default;
$colorpicker-focused-border: $button-active-border !default;
$colorpicker-focused-gradient: $button-active-gradient !default;
$colorpicker-focused-shadow: $button-focused-shadow !default;

$colorpicker-draghandle-shadow: 0 1px 4px rgba(0, 0, 0, .5) !default;
$colorpicker-draghandle-focused-shadow: 0 1px 4px black !default;

$colorpalette-hovered-shadow: 0 0 3px 1px rgba( black, .3 ), inset 0 0 0 1px rgba( white, .8 ) !default;
$colorpalette-focused-shadow: 0 1px 3px 1px rgba( black, .3 ), inset 0 0 0 1px rgba( white, 1 ) !default;
Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

4 changes: 4 additions & 0 deletions packages/classic/scss/all.scss
Expand Up @@ -49,6 +49,10 @@

// Inputs
@import "autocomplete/_index.scss";
@import "color-preview/_index.scss";
@import "colorpalette/_index.scss";
@import "colorgradient/_index.scss";
@import "coloreditor/_index.scss";
@import "colorpicker/_index.scss";
@import "combobox/_index.scss";
@import "datetime/_index.scss";
Expand Down
11 changes: 11 additions & 0 deletions packages/classic/scss/color-preview/_index.scss
@@ -0,0 +1,11 @@
@import "../core/_index.scss";


// Dependencies


// Component
@import "../colorgradient/images/alpha-slider-bgr.scss";
@import "_variables.scss";
@import "_layout.scss";
@import "_theme.scss";
1 change: 1 addition & 0 deletions packages/classic/scss/color-preview/_layout.scss
@@ -0,0 +1 @@
@import "~@progress/kendo-theme-default/scss/color-preview/_layout.scss";
1 change: 1 addition & 0 deletions packages/classic/scss/color-preview/_theme.scss
@@ -0,0 +1 @@
@import "~@progress/kendo-theme-default/scss/color-preview/_theme.scss";
13 changes: 13 additions & 0 deletions packages/classic/scss/color-preview/_variables.scss
@@ -0,0 +1,13 @@
// Color Preview
$color-preview-border-radius: $border-radius !default;
$color-preview-border-width: 1px !default;
$color-preview-bg: null !default;
$color-preview-text: null !default;
$color-preview-border: $component-border !default;
$color-preview-hover-border: $hovered-border !default;

$color-preview-no-color-bg: $white !default;
$color-preview-no-color-text: $error !default;
$color-preview-no-color-border: null !default;

$color-preview-no-color-image: escape-svg( url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='20' height='20' version='1.1'><line x1='0' x2='20' y1='0' y2='20' stroke='#{$color-preview-no-color-text}' stroke-width='1'/></svg>") ) !default;
15 changes: 15 additions & 0 deletions packages/classic/scss/coloreditor/_index.scss
@@ -0,0 +1,15 @@
@import "../core/_index.scss";


// Dependencies
@import "../common/_index.scss";
@import "../action-buttons/_index.scss";
@import "../color-preview/_index.scss";
@import "../colorpalette/_index.scss";
@import "../colorgradient/_index.scss";


// Component
@import "_variables.scss";
@import "_layout.scss";
@import "_theme.scss";
1 change: 1 addition & 0 deletions packages/classic/scss/coloreditor/_layout.scss
@@ -0,0 +1 @@
@import "~@progress/kendo-theme-default/scss/coloreditor/_layout.scss";
1 change: 1 addition & 0 deletions packages/classic/scss/coloreditor/_theme.scss
@@ -0,0 +1 @@
@import "~@progress/kendo-theme-default/scss/coloreditor/_theme.scss";
27 changes: 27 additions & 0 deletions packages/classic/scss/coloreditor/_variables.scss
@@ -0,0 +1,27 @@
// Coloreditor/FlatColorPicker
$coloreditor-spacer: map-get( $spacing, 3 ) !default;

$coloreditor-min-width: 272px !default;
$coloreditor-border-width: 1px !default;
$coloreditor-border-radius: $border-radius !default;
$coloreditor-font-family: $font-family !default;
$coloreditor-font-size: $font-size !default;
$coloreditor-line-height: $line-height !default;
$coloreditor-bg: $component-bg !default;
$coloreditor-text: $component-text !default;
$coloreditor-border: $component-border !default;

$coloreditor-focus-border: null !default;
$coloreditor-focus-shadow: 1px 1px 7px 1px rgba(0, 0, 0, .3) !default;

$coloreditor-header-padding-y: $coloreditor-spacer !default;
$coloreditor-header-padding-x: $coloreditor-header-padding-y !default;
$coloreditor-header-actions-gap: ( $coloreditor-spacer / 1.5 ) !default;

$coloreditor-preview-gap: ( $coloreditor-spacer / 4 ) !default;
$coloreditor-color-preview-width: 34px !default;
$coloreditor-color-preview-height: 14px !default;

$coloreditor-views-padding-y: $coloreditor-spacer !default;
$coloreditor-views-padding-x: $coloreditor-views-padding-y !default;
$coloreditor-views-gap: $coloreditor-spacer !default;

0 comments on commit a0bb137

Please sign in to comment.