Skip to content

Commit

Permalink
Merge branch '2.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
mrmlnc committed Aug 26, 2015
2 parents e1d4ca8 + 4eeea32 commit 6e9282b
Show file tree
Hide file tree
Showing 21 changed files with 2,229 additions and 2,604 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015 Denis Malinochkin
Copyright (c) 2014-2015 Denis Malinochkin

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
49 changes: 30 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,11 @@ How to use

Just import the file, whitch includes variables colors in your project.

**Less:**

````Less
```Less
// Less, Scss, Stylus
@import "lib/material-color";
````

**Sass:**

````Sass
@import "lib/material-color"
````

**Stylus:**

````Stylus
@import "lib/material-color"
````

If you use Bower, the path would be:

````
Expand All @@ -46,10 +33,9 @@ If you use Bower, the path would be:

**The build variable:**

`(@|$)(prefix)-clr-(color)-(range)`
`(@|$)clr-(color)-(range)`

- **(@|$)** - Sign of the variable in the preprocessor.
- **(prefix)** - The prefix variable. Namespace of your variables and variables of the library. (With `material-color-prefixed` and without `material-color`)
- **(color)** - Color.
- **(range)** - 100, 300, 700, A100 and so on. The default value of 500.

Expand All @@ -59,11 +45,11 @@ If you use Bower, the path would be:
@import "lib/material-color";

.example-1 {
background-color: @md-clr-blue;
background-color: @clr-blue;
}

.example-2 {
background-color: @md-clr-green-700;
background-color: @clr-green-700;
}
````

Expand All @@ -86,3 +72,28 @@ clr-ui-caption
clr-ui-menu
clr-ui-button
````

**Mixin**

There are provided lists of variables for looping through the colors. In order to use this functionality you must import file and call mixin(s):

```
@import "mixins/class-generator";

// Less
.material-color-class("red"); // another color or "all"
.material-color-class("red", background-color); // another property or empty (default: color)

// Scss
@include material-color-class("red"); // another color or "all"
@include material-color-class("red", background-color); // another property or empty (default: color)

// Stylus
material-color-class('red'); // another color or 'all'
material-color-class('red', background-color); // another property or empty (default: color)
```
## Thanks
- **Ali Amini** <[email protected]> ([@AliAmini](https://github.com/AliAmini))
- **Chris Pawlukiewicz** <[email protected]> ([@paynoattn](https://github.com/paynoattn))
9 changes: 6 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "material-color",
"version": "2.1.0",
"version": "2.2.0",
"authors": [
"Denis Malinochkin <[email protected]>"
"@mrmlnc (Denis Malinochkin)"
],
"description": "The colour palette, based on Google's Material Design, for use in your project",
"keywords": [
Expand All @@ -17,5 +17,8 @@
"stylus"
],
"license": "MIT",
"homepage": "https://github.com/mrmlnc/material-color"
"homepage": "https://github.com/mrmlnc/material-color",
"ignore": [
"test"
]
}
Loading

0 comments on commit 6e9282b

Please sign in to comment.