Skip to content

Commit

Permalink
feat: integrate material theme with themebuilder
Browse files Browse the repository at this point in the history
  • Loading branch information
joneff committed Dec 28, 2018
1 parent 7a5033c commit c4eac63
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions packages/material/scss/_variables.scss
Expand Up @@ -246,7 +246,7 @@ $cell-padding: 8px !default;
$zindex-popup: 1; $zindex-popup: 1;
$zindex-window: 2; $zindex-window: 2;


$rgba-transparent: rgba( 0, 0, 0, 0 ); $rgba-transparent: rgba( $black, 0 );




// Theme colors // Theme colors
Expand Down Expand Up @@ -609,7 +609,7 @@ $grid-header-text: if($theme-type == dark, $light-secondary-text, $dark-secondar
$grid-header-border: $grid-border !default; $grid-header-border: $grid-border !default;
$grid-header-gradient: null !default; $grid-header-gradient: null !default;


// ZHEKOV TODO: we need this, so k-alt won't override it. When we remove k-alt, we can make this null. // TODO(ZHEKOV): we need this, so k-alt won't override it. When we remove k-alt, we can make this null.
$grid-alt-bg: transparent !default; $grid-alt-bg: transparent !default;
$grid-alt-text: null !default; $grid-alt-text: null !default;
$grid-alt-border: null !default; $grid-alt-border: null !default;
Expand Down Expand Up @@ -737,7 +737,7 @@ $notification-error-text: contrast-wcag( $notification-error-bg ) !default;


// Link // Link
$link-text: $secondary !default; $link-text: $secondary !default;
$link-hover-text: desaturate(darken($secondary, 5), 25) !default; $link-hover-text: $secondary-darker !default;




// Chart // Chart
Expand Down Expand Up @@ -1016,7 +1016,7 @@ $mediaplayer-toolbar-text: $toolbar-text !default;


// Tooltip // Tooltip
$tooltip-bg: material-color( grey, 700, .9 ) !default; $tooltip-bg: material-color( grey, 700, .9 ) !default;
$tooltip-text: contrast-wcag( $tooltip-bg ) !default; $tooltip-text: get-base-contrast( grey, 700 ) !default;




// Progressbar // Progressbar
Expand All @@ -1037,7 +1037,7 @@ $progressbar-indeterminate-text: $progressbar-text !default;
$progressbar-indeterminate-border: $progressbar-border !default; $progressbar-indeterminate-border: $progressbar-border !default;
$progressbar-indeterminate-gradient: null !default; $progressbar-indeterminate-gradient: null !default;


$progressbar-chunk-border: $bg-color !default; $progressbar-chunk-border: $component-bg !default;






Expand Down
4 changes: 2 additions & 2 deletions packages/material/scss/swatches/blue-pink-dark.scss
@@ -1,5 +1,5 @@
$primary-name: blue; $primary-palette-name: blue;
$secondary-name: pink; $secondary-palette-name: pink;
$theme-type: dark; $theme-type: dark;


@import "../all.scss"; @import "../all.scss";
4 changes: 2 additions & 2 deletions packages/material/scss/swatches/blue-pink-light.scss
@@ -1,5 +1,5 @@
$primary-name: blue; $primary-palette-name: blue;
$secondary-name: pink; $secondary-palette-name: pink;
$theme-type: light; $theme-type: light;


@import "../all.scss"; @import "../all.scss";
4 changes: 2 additions & 2 deletions packages/material/scss/swatches/indigo-pink-dark.scss
@@ -1,5 +1,5 @@
$primary-name: indigo; $primary-palette-name: indigo;
$secondary-name: pink; $secondary-palette-name: pink;
$theme-type: dark; $theme-type: dark;


@import "../all.scss"; @import "../all.scss";
4 changes: 2 additions & 2 deletions packages/material/scss/swatches/indigo-pink-light.scss
@@ -1,5 +1,5 @@
$primary-name: indigo; $primary-palette-name: indigo;
$secondary-name: pink; $secondary-palette-name: pink;
$theme-type: light; $theme-type: light;


@import "../all.scss"; @import "../all.scss";
4 changes: 2 additions & 2 deletions packages/material/scss/swatches/pink-bluegray-dark.scss
@@ -1,5 +1,5 @@
$primary-name: pink; $primary-palette-name: pink;
$secondary-name: blueGray; $secondary-palette-name: blueGray;
$theme-type: dark; $theme-type: dark;


@import "../all.scss"; @import "../all.scss";

0 comments on commit c4eac63

Please sign in to comment.