google
/
material-design-lite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to the color templates. 

- Removing secondary color concept
- Fixing template minification
master
Sérgio Gomes 2015-03-19 12:47:21 +00:00
parent b8edf49282
commit dc5df8f872
5 changed files with 30 additions and 10863 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/material.css.template
View File

@ -5254,7 +5254,7 @@ dt {
text-align: left;
margin: 0;
padding: 0 16px;
outline-color: rgb($palette-secondary-400);
outline-color: rgb(189,189,189);
position: relative;
overflow: hidden;
font-size: 14px;
@ -5288,12 +5288,12 @@ dt {
.wsk-menu__item[disabled] .wsk-ripple {
background: transparent; }
.wsk-menu__item:hover {
background-color: rgb($palette-secondary-200); }
background-color: rgb(238,238,238); }
.wsk-menu__item:focus {
outline: none;
background-color: rgb($palette-secondary-200); }
background-color: rgb(238,238,238); }
.wsk-menu__item:active {
background-color: rgb($palette-secondary-300); }
background-color: rgb(224,224,224); }
.wsk-menu__item--ripple-container {
display: block;
@ -8548,7 +8548,7 @@ dt {
bottom: 0;
left: 0;
position: absolute;
background: rgb($palette-secondary-300);
background: rgb(224,224,224);
-webkit-animation: border-expand 0.2s cubic-bezier(0.4, 0, 0.4, 1) 0s alternate forwards;
-moz-animation: border-expand 0.2s cubic-bezier(0.4, 0, 0.4, 1) 0s alternate forwards;
-webkit-transition: all 1s cubic-bezier(0.4, 0, 1, 1);

2
css/material.min.css.map
View File

File diff suppressed because one or more lines are too long

10819
css/material.min.css.template
View File

File diff suppressed because one or more lines are too long

2
gulpfile.js
View File

@ -112,7 +112,7 @@ gulp.task('styletemplates', function () {
.pipe($.header(banner, {pkg: pkg}))
.pipe(gulp.dest('./css'))
// Minify Styles
.pipe($.if('*.css', $.csso()))
.pipe($.if('*.css.template', $.csso()))
.pipe($.concat('material.min.css.template'))
.pipe(gulp.dest('./css'))
.pipe($.size({title: 'styles'}));

60
src/_colors.scss
View File

@ -10,7 +10,6 @@ $styleguide-generate-template: false !default;
@if $styleguide-generate-template == false {
$palette-primary: $palette-indigo !default;
$palette-accent: $palette-pink !default;
$palette-secondary: $palette-grey !default;
} @else {
$palette-primary:
'$palette-primary-50'
@ -42,25 +41,10 @@ $styleguide-generate-template: false !default;
'$palette-accent-A200'
'$palette-accent-A400'
'$palette-accent-A700';
$palette-secondary:
'$palette-secondary-50'
'$palette-secondary-100'
'$palette-secondary-200'
'$palette-secondary-300'
'$palette-secondary-400'
'$palette-secondary-500'
'$palette-secondary-600'
'$palette-secondary-700'
'$palette-secondary-800'
'$palette-secondary-900'
'$palette-secondary-A100'
'$palette-secondary-A200'
'$palette-secondary-A400'
'$palette-secondary-A700';
}
$palette-disabled: $palette-grey !default;
$palette-page: $palette-grey !default;
$palette-disabled: $palette-grey;
$palette-page: $palette-grey;
$palette-primary-50: nth($palette-primary, 1);
$palette-primary-100: nth($palette-primary, 2);
@ -96,21 +80,21 @@ $palette-accent-900: nth($palette-accent, 10);
$palette-accent-A700: nth($palette-accent, 14);
}
$palette-secondary-50: nth($palette-secondary, 1);
$palette-secondary-100: nth($palette-secondary, 2);
$palette-secondary-200: nth($palette-secondary, 3);
$palette-secondary-300: nth($palette-secondary, 4);
$palette-secondary-400: nth($palette-secondary, 5);
$palette-secondary-500: nth($palette-secondary, 6);
$palette-secondary-600: nth($palette-secondary, 7);
$palette-secondary-700: nth($palette-secondary, 8);
$palette-secondary-800: nth($palette-secondary, 9);
$palette-secondary-900: nth($palette-secondary, 10);
@if length($palette-secondary) > 10 {
$palette-secondary-A100: nth($palette-secondary, 11);
$palette-secondary-A200: nth($palette-secondary, 12);
$palette-secondary-A400: nth($palette-secondary, 13);
$palette-secondary-A700: nth($palette-secondary, 14);
$palette-grey-50: nth($palette-grey, 1);
$palette-grey-100: nth($palette-grey, 2);
$palette-grey-200: nth($palette-grey, 3);
$palette-grey-300: nth($palette-grey, 4);
$palette-grey-400: nth($palette-grey, 5);
$palette-grey-500: nth($palette-grey, 6);
$palette-grey-600: nth($palette-grey, 7);
$palette-grey-700: nth($palette-grey, 8);
$palette-grey-800: nth($palette-grey, 9);
$palette-grey-900: nth($palette-grey, 10);
@if length($palette-grey) > 10 {
$palette-grey-A100: nth($palette-grey, 11);
$palette-grey-A200: nth($palette-grey, 12);
$palette-grey-A400: nth($palette-grey, 13);
$palette-grey-A700: nth($palette-grey, 14);
}
$palette-disabled-50: nth($palette-disabled, 1);
@ -226,7 +210,7 @@ $layout-header-nav-hover-color: unquote("rgba(#{nth($palette-grey, 8)}, 0.6)") !
$layout-header-tab-text-color: unquote("rgba(#{$palette-page-200}, 0.6)") !default;
// Tabs
$layout-header-tab-highlight: unquote("rgb(#{$palette-secondary-300})") !default;
$layout-header-tab-highlight: unquote("rgb(#{$palette-grey-300})") !default;
/* ========== Content Tabs ========== */
@ -302,10 +286,10 @@ $list-container-view-background: white !default;
// Default Item Colors
$default-item-text-color: #000;
$default-item-outline-color: unquote("rgb(#{$palette-secondary-400})") !default;
$default-item-hover-bg-color: unquote("rgb(#{$palette-secondary-200})") !default;
$default-item-focus-bg-color: unquote("rgb(#{$palette-secondary-200})") !default;
$default-item-active-bg-color: unquote("rgb(#{$palette-secondary-300})") !default;
$default-item-outline-color: unquote("rgb(#{$palette-grey-400})") !default;
$default-item-hover-bg-color: unquote("rgb(#{$palette-grey-200})") !default;
$default-item-focus-bg-color: unquote("rgb(#{$palette-grey-200})") !default;
$default-item-active-bg-color: unquote("rgb(#{$palette-grey-300})") !default;
// Disabled Button Colors
$disabled-item-text-color: unquote("rgb(#{$palette-disabled-400})") !default;