Permalink
Browse files

Merge branch 'gh-pages' of https://github.com/Magnus-G/pattern-mixin

…into gh-pages
  • Loading branch information...
Magnus Gyllensward
Magnus Gyllensward committed Dec 20, 2013
2 parents f5ffa00 + 57c7b19 commit 988b8c30a223136f3f6b4a9784710595dd1feb22
Showing with 21 additions and 1 deletion.
  1. +8 −0 README.md
  2. +1 −0 _texture-mixin.scss
  3. +11 −0 index.html
  4. +1 −1 texture-base.scss
View
@@ -0,0 +1,8 @@
+texture-mixin
+=============
+
+To add a texture:
+
+1. Add it to the end of the mixin file. Never in the middle since it will break the references.
+2. Update index.html, texture-mixin.scss
+3. Add the png file, both inverted and normal. Both normal size and @2x.
View
@@ -85,6 +85,7 @@
"grey.png"
"shinedotted.png"
"stacked_circles.png"
+ "noisy_grid_simple.png"
;
@if ($inverted == 1) {
View
@@ -908,6 +908,17 @@ <h4>Texture 87</h4>
<div class="example-inverted"></div>
</div>
</div>
+<div class="texture-88">
+ <div class="texture-heading">
+ <h4>Texture 88</h4>
+ <input type="" class="color {pickerFaceColor:'#3F3F3F',pickerBorderColor:'#3F3F3F',pickerInsetColor:'#3F3F3F'}" onchange="document.getElementsByClassName('examples')[87].style.backgroundColor = '#'+this.color">
+ </div>
+ <div class="examples">
+ <div class="example-normal"></div>
+ <div class="example-inverted"></div>
+ </div>
+</div>
+
</div>
View
@@ -128,7 +128,7 @@ div {
border-bottom-left-radius: 0;
}
-@for $i from 1 through 87 {
+@for $i from 1 through 88 {
.texture-#{$i} {
.example-normal {
@include texture(transparentize(white, 1), $i, 0);

0 comments on commit 988b8c3

Please sign in to comment.