Skip to content

Commit

Permalink
Use material-colors instead of google-material-color (#198)
Browse files Browse the repository at this point in the history
  • Loading branch information
jaimesanz authored and riophae committed Jan 21, 2019
1 parent 72ec99a commit a7611e2
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 37 deletions.
16 changes: 8 additions & 8 deletions docs/styles/docs.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* stylelint-disable declaration-no-important */

@import "~google-material-color/dist/palette.less";
@import "~material-colors/dist/colors.less";

/* Utils */

Expand Down Expand Up @@ -41,13 +41,13 @@ body {
font-size: 14px;
line-height: 1.5;
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
color: @palette-Grey-700;
color: @md-grey-700;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

::selection {
background: fade(@palette-Light-Blue-600, 10%);
background: fade(@md-light-blue-600, 10%);
}

dl, h1, h2, h3, h4, h5, h6, ol, p, pre, ul {
Expand Down Expand Up @@ -89,7 +89,7 @@ input[type="radio"] {

a {
text-decoration: none;
color: @palette-Grey-700;
color: @md-grey-700;
}

a img {
Expand Down Expand Up @@ -166,7 +166,7 @@ kbd {

#content a,
.site-footer a {
color: @palette-Light-Blue-600;
color: @md-light-blue-600;
font-weight: 600;
}

Expand Down Expand Up @@ -250,7 +250,7 @@ kbd {
}

svg:hover {
color: @palette-Light-Blue-600;
color: @md-light-blue-600;
}

h1 & svg {
Expand All @@ -265,7 +265,7 @@ kbd {
}

p.tip {
@tip-color: @palette-Orange-500;
@tip-color: @md-orange-500;

position: relative;
margin: 1em 0;
Expand Down Expand Up @@ -513,7 +513,7 @@ label input[type="checkbox"] {

a:hover,
&.current a {
color: @palette-Light-Blue-600;
color: @md-light-blue-600;
font-weight: 600;
}
}
Expand Down
12 changes: 6 additions & 6 deletions docs/styles/prism.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~google-material-color/dist/palette.less";
@import "~material-colors/dist/colors.less";

/**
* prism.js default theme for JavaScript, CSS and HTML
Expand Down Expand Up @@ -42,7 +42,7 @@ pre[class*="language-"] {
.token.prolog,
.token.doctype,
.token.cdata {
color: @palette-Blue-Grey-300;
color: @md-blue-grey-300;
}

.token.punctuation {
Expand All @@ -60,7 +60,7 @@ pre[class*="language-"] {
.token.constant,
.token.symbol,
.token.deleted {
color: @palette-Light-Blue-800;
color: @md-light-blue-800;
}

.token.selector,
Expand All @@ -69,7 +69,7 @@ pre[class*="language-"] {
.token.char,
.token.builtin,
.token.inserted {
color: @palette-Green-700;
color: @md-green-700;
}

.token.operator,
Expand All @@ -83,11 +83,11 @@ pre[class*="language-"] {
.token.atrule,
.token.attr-value,
.token.keyword {
color: @palette-Orange-900;
color: @md-orange-900;
}

.token.function {
color: @palette-Red-900;
color: @md-red-900;
}

.token.regex,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"easings-css": "^1.0.0",
"fuzzysearch": "^1.0.3",
"google-material-color": "^1.3.1",
"is-promise": "^2.1.0",
"lodash": "^4.0.0",
"material-colors": "^1.2.6",
"watch-size": "^2.0.0"
},
"devDependencies": {
Expand Down
44 changes: 22 additions & 22 deletions src/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Dependencies
*/

@import "~google-material-color/dist/palette.less";
@import "~material-colors/dist/colors.less";
@import "~easings-css/easings.less";

/**
Expand All @@ -27,38 +27,38 @@
@treeselect-control-border-color: #ddd;
@treeselect-control-border-color-hover: #cfcfcf;
@treeselect-control-border-color-active: @treeselect-control-border-color-hover;
@treeselect-control-border-color-focus: @palette-Light-Blue-600;
@treeselect-control-border-color-focus: @md-light-blue-600;
@treeselect-control-border-radius: @treeselect-border-radius-lg;
@treeselect-control-bg: #fff;
@treeselect-control-box-shadow-focus: 0 0 0 3px fade(@treeselect-control-border-color-focus, 10%);
@treeselect-control-bg-disabled: #f9f9f9;

@treeselect-placeholder-font-color: @palette-Grey-400;
@treeselect-placeholder-font-color: @md-grey-400;
@treeselect-single-value-font-color: #333;
@treeselect-single-value-font-color-focused: @treeselect-placeholder-font-color;
@treeselect-multi-value-margin-x: 0;
@treeselect-multi-value-margin-y: 2px;
@treeselect-multi-value-padding-x: @treeselect-padding;
@treeselect-multi-value-padding-y: 0;
@treeselect-multi-value-font-size: @treeselect-font-size-sm;
@treeselect-multi-value-font-color: @palette-Light-Blue-600;
@treeselect-multi-value-item-bg: @palette-Blue-50;
@treeselect-multi-value-item-bg-new: @palette-Green-50;
@treeselect-multi-value-font-color: @md-light-blue-600;
@treeselect-multi-value-item-bg: @md-blue-50;
@treeselect-multi-value-item-bg-new: @md-green-50;
@treeselect-multi-value-item-border-width: 1px;
@treeselect-multi-value-item-border-color: transparent;
@treeselect-multi-value-font-color-hover: @treeselect-multi-value-font-color;
@treeselect-multi-value-item-bg-hover: @treeselect-multi-value-item-bg;
@treeselect-multi-value-item-bg-new-hover: @treeselect-multi-value-item-bg-new;
@treeselect-multi-value-font-color-disabled: @palette-Grey-600;
@treeselect-multi-value-item-bg-disabled: @palette-Grey-100;
@treeselect-multi-value-font-color-disabled: @md-grey-600;
@treeselect-multi-value-item-bg-disabled: @md-grey-100;
@treeselect-multi-value-item-font-color-control-disabled: #555;
@treeselect-multi-value-item-bg-control-disabled: #fff;
@treeselect-multi-value-item-border-color-control-disabled: #e5e5e5;
@treeselect-multi-value-remove-color: @treeselect-multi-value-font-color;
@treeselect-multi-value-remove-color-hover: @palette-Red-600;
@treeselect-multi-value-remove-color-hover: @md-red-600;
@treeselect-multi-value-remove-size: 6px;
@treeselect-multi-value-divider-color: #fff;
@treeselect-limit-tip-font-color: @palette-Grey-400;
@treeselect-limit-tip-font-color: @md-grey-400;
@treeselect-limit-tip-font-size: @treeselect-multi-value-font-size;
@treeselect-limit-tip-font-weight: 600;
@treeselect-single-input-font-size: inherit;
Expand All @@ -72,20 +72,20 @@

@treeselect-arrow-size: 9px;
@treeselect-arrow-color: #ccc;
@treeselect-arrow-color-hover: @palette-Grey-700;
@treeselect-arrow-color-hover: @md-grey-700;
@treeselect-arrow-transition-timing-function: @ease-out-expo;

@treeselect-x-size: 8px;
@treeselect-x-color: @treeselect-arrow-color;
@treeselect-x-color-hover: @palette-Red-600;
@treeselect-x-color-hover: @md-red-600;

@treeselect-option-bg-highlight: @palette-Grey-100;
@treeselect-option-selected-bg: @palette-Blue-50;
@treeselect-option-bg-highlight: @md-grey-100;
@treeselect-option-selected-bg: @md-blue-50;
@treeselect-option-selected-bg-hover: @treeselect-option-selected-bg;
@treeselect-checkbox-size: @treeselect-icon-size;
@treeselect-checkbox-border-radius: @treeselect-border-radius-sm;
@treeselect-checkbox-color: @palette-Grey-300;
@treeselect-checkbox-color-highlight: @palette-Light-Blue-600;
@treeselect-checkbox-color: @md-grey-300;
@treeselect-checkbox-color-highlight: @md-light-blue-600;
@treeselect-checkbox-border-color: @treeselect-checkbox-color;
@treeselect-checkbox-bg: #fff;
@treeselect-checkbox-border-color-hover: @treeselect-checkbox-color-highlight;
Expand All @@ -107,14 +107,14 @@
@treeselect-option-label-color: inherit;
@treeselect-option-label-color-disabled: rgba(0, 0, 0, 0.25);

@treeselect-loader-color-dark: @palette-Light-Blue-600;
@treeselect-loader-color-light: @palette-Light-Blue-100;
@treeselect-loader-color-dark: @md-light-blue-600;
@treeselect-loader-color-light: @md-light-blue-100;
@treeselect-loader-animation-duration: 1.6s;
@treeselect-warning-icon-bg: @palette-Orange-600;
@treeselect-error-icon-bg: @palette-Red-600;
@treeselect-tip-color: @palette-Grey-600;
@treeselect-warning-icon-bg: @md-orange-600;
@treeselect-error-icon-bg: @md-red-600;
@treeselect-tip-color: @md-grey-600;
@treeselect-tip-font-size: @treeselect-font-size-sm;
@treeselect-retry-text-color: @palette-Light-Blue-600;
@treeselect-retry-text-color: @md-light-blue-600;


/**
Expand Down

0 comments on commit a7611e2

Please sign in to comment.