Skip to content

Commit

Permalink
Correct colors (red, green, blue)
Browse files Browse the repository at this point in the history
  • Loading branch information
Denis Malinochkin committed Dec 22, 2014
1 parent a8d614f commit 514f805
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 95 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "material-color",
"version": "2.0.0",
"version": "2.1.0",
"authors": [
"Denis Malinochkin <dmalinochkin@land.ru>"
],
Expand Down
35 changes: 17 additions & 18 deletions material-color-prefixed.less
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// ================================================================================
// ==========================================================================
//
// Name: UI Color Palette
// Description: The color palette of material design.
// Version: 2.0.0
// Version: 2.1.0
//
// Author: Denis Malinochkin
// Git: https://github.com/mrmlnc/material-color
//
// twitter: @mrmlnc
//
// ================================================================================
// ==========================================================================

// Palettes
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------

// Red
@md-list-red: #fde0dc, #f9bdbb, #f69988, #f36c60, #e84e40,
#e51c23, #dd191d, #d01716, #c41411, #b0120a,
#ff7997, #ff5177, #ff2d6f, #e00032;
@md-list-red: #ffebee, #ffcdd2, #ef9a9a, #e57373, #ef5350,
#f44336, #e53935, #d32f2f, #c62828, #b71c1c,
#ff8a80, #ff5252, #ff1744, #d50000;

// Pink
@md-list-pink: #fce4ec, #f8bbd0, #f48fb1, #f06292, #ec407a,
Expand All @@ -40,9 +40,9 @@
#8c9eff, #536dfe, #3d5afe, #304ffe;

// Blue
@md-list-blue: #e7e9fd, #d0d9ff, #afbfff, #91a7ff, #738ffe,
#5677fc, #4e6cef, #455ede, #3b50ce, #2a36b1,
#a6baff, #6889ff, #4d73ff, #4d69ff;
@md-list-blue: #e3f2fd, #bbdefb, #90caf9, #64b5f6, #42a5f5,
#2196f3, #1e88e5, #1976d2, #1565c0, #0d47a1,
#82b1ff, #448aff, #2979ff, #2962ff;

// Light Blue
@md-list-light-blue: #e1f5fe, #b3e5fc, #81d4fa, #4fc3f7, #29b6f6,
Expand All @@ -60,9 +60,9 @@
#a7ffeb, #64ffda, #1de9b6, #00bfa5;

// Green
@md-list-green: #d0f8ce, #a3e9a4, #72d572, #42bd41, #2baf2b,
#259b24, #0a8f08, #0a7e07, #056f00, #0d5302,
#a2f78d, #5af158, #14e715, #12c700;
@md-list-green: #e8f5e9, #c8e6c9, #a5d6a7, #81c784, #66bb6a,
#4caf50, #43a047, #388e3c, #2e7d32, #1b5e20,
#b9f6ca, #69f0ae, #00e676, #00c853;

// Light Green
@md-list-light-green: #f1f8e9, #dcedc8, #c5e1a5, #aed581, #9ccc65,
Expand Down Expand Up @@ -100,8 +100,7 @@

// Grey
@md-list-grey: #fafafa, #f5f5f5, #eeeeee, #e0e0e0, #bdbdbd,
#9e9e9e, #757575, #616161, #424242, #212121,
#000000;
#9e9e9e, #757575, #616161, #424242, #212121;

// Blue Grey
@md-list-blue-grey: #eceff1, #cfd8dc, #b0bec5, #90a4ae, #78909c,
Expand All @@ -110,7 +109,7 @@


// Definitions
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------

// Red
@md-clr-red: extract(@md-list-red, 6);
Expand Down Expand Up @@ -444,7 +443,6 @@
@md-clr-grey-700: extract(@md-list-grey, 8);
@md-clr-grey-800: extract(@md-list-grey, 9);
@md-clr-grey-900: extract(@md-list-grey, 10);
@md-clr-grey-1000: extract(@md-list-grey, 11);


// Blue Grey
Expand All @@ -462,8 +460,9 @@
@md-clr-blue-grey-900: extract(@md-list-blue-grey, 10);



// UI Color Application
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------

// Typography
@md-clr-ui-display-4: @md-clr-grey-600;
Expand Down
35 changes: 17 additions & 18 deletions material-color-prefixed.scss
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// ================================================================================
// ==========================================================================
//
// Name: UI Color Palette
// Description: The color palette of material design.
// Version: 2.0.0
// Version: 2.1.0
//
// Author: Denis Malinochkin
// Git: https://github.com/mrmlnc/material-color
//
// twitter: @mrmlnc
//
// ================================================================================
// ==========================================================================

// Palettes
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------

// Red
$md-list-red: #fde0dc, #f9bdbb, #f69988, #f36c60, #e84e40,
#e51c23, #dd191d, #d01716, #c41411, #b0120a,
#ff7997, #ff5177, #ff2d6f, #e00032;
$md-list-red: #ffebee, #ffcdd2, #ef9a9a, #e57373, #ef5350,
#f44336, #e53935, #d32f2f, #c62828, #b71c1c,
#ff8a80, #ff5252, #ff1744, #d50000;

// Pink
$md-list-pink: #fce4ec, #f8bbd0, #f48fb1, #f06292, #ec407a,
Expand All @@ -40,9 +40,9 @@ $md-list-indigo: #e8eaf6, #c5cae9, #9fa8da, #7986cb, #5c6b
#8c9eff, #536dfe, #3d5afe, #304ffe;

// Blue
$md-list-blue: #e7e9fd, #d0d9ff, #afbfff, #91a7ff, #738ffe,
#5677fc, #4e6cef, #455ede, #3b50ce, #2a36b1,
#a6baff, #6889ff, #4d73ff, #4d69ff;
$md-list-blue: #e3f2fd, #bbdefb, #90caf9, #64b5f6, #42a5f5,
#2196f3, #1e88e5, #1976d2, #1565c0, #0d47a1,
#82b1ff, #448aff, #2979ff, #2962ff;

// Light Blue
$md-list-light-blue: #e1f5fe, #b3e5fc, #81d4fa, #4fc3f7, #29b6f6,
Expand All @@ -60,9 +60,9 @@ $md-list-teal: #e0f2f1, #b2dfdb, #80cbc4, #4db6ac, #26a6
#a7ffeb, #64ffda, #1de9b6, #00bfa5;

// Green
$md-list-green: #d0f8ce, #a3e9a4, #72d572, #42bd41, #2baf2b,
#259b24, #0a8f08, #0a7e07, #056f00, #0d5302,
#a2f78d, #5af158, #14e715, #12c700;
$md-list-green: #e8f5e9, #c8e6c9, #a5d6a7, #81c784, #66bb6a,
#4caf50, #43a047, #388e3c, #2e7d32, #1b5e20,
#b9f6ca, #69f0ae, #00e676, #00c853;

// Light Green
$md-list-light-green: #f1f8e9, #dcedc8, #c5e1a5, #aed581, #9ccc65,
Expand Down Expand Up @@ -100,8 +100,7 @@ $md-list-brown: #efebe9, #d7ccc8, #bcaaa4, #a1887f, #8d6e

// Grey
$md-list-grey: #fafafa, #f5f5f5, #eeeeee, #e0e0e0, #bdbdbd,
#9e9e9e, #757575, #616161, #424242, #212121,
#000000;
#9e9e9e, #757575, #616161, #424242, #212121;

// Blue Grey
$md-list-blue-grey: #eceff1, #cfd8dc, #b0bec5, #90a4ae, #78909c,
Expand All @@ -110,7 +109,7 @@ $md-list-blue-grey: #eceff1, #cfd8dc, #b0bec5, #90a4ae, #7890


// Definitions
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------

// Red
$md-clr-red: nth($md-list-red, 6);
Expand Down Expand Up @@ -444,7 +443,6 @@ $md-clr-grey-600: nth($md-list-grey, 7);
$md-clr-grey-700: nth($md-list-grey, 8);
$md-clr-grey-800: nth($md-list-grey, 9);
$md-clr-grey-900: nth($md-list-grey, 10);
$md-clr-grey-1000: nth($md-list-grey, 11);


// Blue Grey
Expand All @@ -462,8 +460,9 @@ $md-clr-blue-grey-800: nth($md-list-blue-grey, 9);
$md-clr-blue-grey-900: nth($md-list-blue-grey, 10);



// UI Color Application
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------

// Typography
$md-clr-ui-display-4: $md-clr-grey-600;
Expand Down
22 changes: 11 additions & 11 deletions material-color-prefixed.styl
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
// ================================================================================
// ==========================================================================
//
// Name: UI Color Palette
// Description: The color palette of material design.
// Version: 2.0.0
// Version: 2.1.0
//
// Author: Denis Malinochkin
// Git: https://github.com/mrmlnc/material-color
//
// twitter: @mrmlnc
//
// ================================================================================
// ==========================================================================

// Palettes
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------

// Red
$md-list-red = ( #fde0dc #f9bdbb #f69988 #f36c60 #e84e40 #e51c23 #dd191d #d01716 #c41411 #b0120a #ff7997 #ff5177 #ff2d6f #e00032 )
$md-list-red = ( #ffebee #ffcdd2 #ef9a9a #e57373 #ef5350 #f44336 #e53935 #d32f2f #c62828 #b71c1c #ff8a80 #ff5252 #ff1744 #d50000 )

// Pink
$md-list-pink = ( #fce4ec #f8bbd0 #f48fb1 #f06292 #ec407a #e91e63 #d81b60 #c2185b #ad1457 #880e4f #ff80ab #ff4081 #f50057 #c51162 )
Expand All @@ -30,7 +30,7 @@ $md-list-deep-purple = ( #ede7f6 #d1c4e9 #b39ddb #9575cd #7e57c2
$md-list-indigo = ( #e8eaf6 #c5cae9 #9fa8da #7986cb #5c6bc0 #3f51b5 #3949ab #303f9f #283593 #1a237e #8c9eff #536dfe #3d5afe #304ffe )

// Blue
$md-list-blue = ( #e7e9fd #d0d9ff #afbfff #91a7ff #738ffe #5677fc #4e6cef #455ede #3b50ce #2a36b1 #a6baff #6889ff #4d73ff #4d69ff )
$md-list-blue = ( #e3f2fd #bbdefb #90caf9 #64b5f6 #42a5f5 #2196f3 #1e88e5 #1976d2 #1565c0 #0d47a1 #82b1ff #448aff #2979ff #2962ff )

// Light Blue
$md-list-light-blue = ( #e1f5fe #b3e5fc #81d4fa #4fc3f7 #29b6f6 #03a9f4 #039be5 #0288d1 #0277bd #01579b #80d8ff #40c4ff #00b0ff #0091ea )
Expand All @@ -42,7 +42,7 @@ $md-list-cyan = ( #e0f7fa #b2ebf2 #80deea #4dd0e1 #26c6da
$md-list-teal = ( #e0f2f1 #b2dfdb #80cbc4 #4db6ac #26a69a #009688 #00897b #00796b #00695c #004d40 #a7ffeb #64ffda #1de9b6 #00bfa5 )

// Green
$md-list-green = ( #d0f8ce #a3e9a4 #72d572 #42bd41 #2baf2b #259b24 #0a8f08 #0a7e07 #056f00 #0d5302 #a2f78d #5af158 #14e715 #12c700 )
$md-list-green = ( #e8f5e9 #c8e6c9 #a5d6a7 #81c784 #66bb6a#4caf50 #43a047 #388e3c #2e7d32 #1b5e20#b9f6ca #69f0ae #00e676 #00c853 )

// Light Green
$md-list-light-green = ( #f1f8e9 #dcedc8 #c5e1a5 #aed581 #9ccc65 #8bc34a #7cb342 #689f38 #558b2f #33691e #ccff90 #b2ff59 #76ff03 #64dd17 )
Expand All @@ -66,15 +66,15 @@ $md-list-deep-orange = ( #fbe9e7 #ffccbc #ffab91 #ff8a65 #ff7043
$md-list-brown = ( #efebe9 #d7ccc8 #bcaaa4 #a1887f #8d6e63 #795548 #6d4c41 #5d4037 #4e342e #3e2723 )

// Grey
$md-list-grey = ( #fafafa #f5f5f5 #eeeeee #e0e0e0 #bdbdbd #9e9e9e #757575 #616161 #424242 #212121 #000000 )
$md-list-grey = ( #fafafa #f5f5f5 #eeeeee #e0e0e0 #bdbdbd #9e9e9e #757575 #616161 #424242 #212121 )

// Blue Grey
$md-list-blue-grey = ( #eceff1 #cfd8dc #b0bec5 #90a4ae #78909c #607d8b #546e7a #455a64 #37474f #263238 )



// Definitions
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------

// Red
$md-clr-red = $md-list-red[5];
Expand Down Expand Up @@ -408,7 +408,6 @@ $md-clr-grey-600 = $md-list-grey[6];
$md-clr-grey-700 = $md-list-grey[7];
$md-clr-grey-800 = $md-list-grey[8];
$md-clr-grey-900 = $md-list-grey[9];
$md-clr-grey-1000 = $md-list-grey[10];


// Blue Grey
Expand All @@ -426,8 +425,9 @@ $md-clr-blue-grey-800 = $md-list-blue-grey[8];
$md-clr-blue-grey-900 = $md-list-blue-grey[9];



// UI Color Application
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------

// Typography
$md-clr-ui-display-4 = $md-clr-grey-600;
Expand Down
36 changes: 18 additions & 18 deletions material-color.less
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// ================================================================================
// ==========================================================================
//
// Name: UI Color Palette
// Description: The color palette of material design.
// Version: 2.0.0
// Version: 2.1.0
//
// Author: Denis Malinochkin
// Git: https://github.com/mrmlnc/material-color
//
// twitter: @mrmlnc
//
// ================================================================================
// ==========================================================================

// Palettes
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------

// Red
@list-red: #fde0dc, #f9bdbb, #f69988, #f36c60, #e84e40,
#e51c23, #dd191d, #d01716, #c41411, #b0120a,
#ff7997, #ff5177, #ff2d6f, #e00032;
@list-red: #ffebee, #ffcdd2, #ef9a9a, #e57373, #ef5350,
#f44336, #e53935, #d32f2f, #c62828, #b71c1c,
#ff8a80, #ff5252, #ff1744, #d50000;

// Pink
@list-pink: #fce4ec, #f8bbd0, #f48fb1, #f06292, #ec407a,
Expand All @@ -40,9 +40,9 @@
#8c9eff, #536dfe, #3d5afe, #304ffe;

// Blue
@list-blue: #e7e9fd, #d0d9ff, #afbfff, #91a7ff, #738ffe,
#5677fc, #4e6cef, #455ede, #3b50ce, #2a36b1,
#a6baff, #6889ff, #4d73ff, #4d69ff;
@list-blue: #e3f2fd, #bbdefb, #90caf9, #64b5f6, #42a5f5,
#2196f3, #1e88e5, #1976d2, #1565c0, #0d47a1,
#82b1ff, #448aff, #2979ff, #2962ff;

// Light Blue
@list-light-blue: #e1f5fe, #b3e5fc, #81d4fa, #4fc3f7, #29b6f6,
Expand All @@ -60,9 +60,9 @@
#a7ffeb, #64ffda, #1de9b6, #00bfa5;

// Green
@list-green: #d0f8ce, #a3e9a4, #72d572, #42bd41, #2baf2b,
#259b24, #0a8f08, #0a7e07, #056f00, #0d5302,
#a2f78d, #5af158, #14e715, #12c700;
@list-green: #e8f5e9, #c8e6c9, #a5d6a7, #81c784, #66bb6a,
#4caf50, #43a047, #388e3c, #2e7d32, #1b5e20,
#b9f6ca, #69f0ae, #00e676, #00c853;

// Light Green
@list-light-green: #f1f8e9, #dcedc8, #c5e1a5, #aed581, #9ccc65,
Expand Down Expand Up @@ -100,16 +100,16 @@

// Grey
@list-grey: #fafafa, #f5f5f5, #eeeeee, #e0e0e0, #bdbdbd,
#9e9e9e, #757575, #616161, #424242, #212121,
#000000;
#9e9e9e, #757575, #616161, #424242, #212121;

// Blue Grey
@list-blue-grey: #eceff1, #cfd8dc, #b0bec5, #90a4ae, #78909c,
#607d8b, #546e7a, #455a64, #37474f, #263238;



// Definitions
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------

// Red
@clr-red: extract(@list-red, 6);
Expand Down Expand Up @@ -443,7 +443,6 @@
@clr-grey-700: extract(@list-grey, 8);
@clr-grey-800: extract(@list-grey, 9);
@clr-grey-900: extract(@list-grey, 10);
@clr-grey-1000: extract(@list-grey, 11);


// Blue Grey
Expand All @@ -461,8 +460,9 @@
@clr-blue-grey-900: extract(@list-blue-grey, 10);



// UI Color Application
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------

// Typography
@clr-ui-display-4: @clr-grey-600;
Expand Down
Loading

0 comments on commit 514f805

Please sign in to comment.