Update readme and variable names in font-face

mediamonks · Mar 16, 2017 · 5b2aa62 · 5b2aa62
1 parent 43edac8
commit 5b2aa62
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -38,41 +38,41 @@ npm i -S seng-scss
 ### Variables
 
 - [variables](./utils/_variables.scss)
-	- $pathAsset: default project asset path (..)
-	- $pathFont: default project font path (font, prefixed with $pathAsset)
-	- $pathImage: default project image path (image, prefixed with $pathAsset)
-	- $zLayout: default list of zIndex names (default)
-	- $mediaQueries: default list of mediaQueries (empty list)
-	- $ease{name}: List of easing bezier curves
-		- $easeLinear
-        - $ease
-        - $easeIn
-        - $easeOut
-        - $easeInOut
-        - $easeInQuad
-        - $easeOutQuad
-        - $easeInCubic
-        - $easeOutCubic
-        - $easeInQuart
-        - $easeOutQuart
-        - $easeInQuint
-        - $easeOutQuint
-        - $easeInSine
-        - $easeOutSine
-        - $easeInExpo
-        - $easeOutExpo
-        - $easeInCirc
-        - $easeOutCirc
-        - $easeInBack
-        - $easeOutBack
-        - $easeInOutQuad
-        - $easeInOutCubic
-        - $easeInOutQuart
-        - $easeInOutQuint
-        - $easeInOutSine
-        - $easeInOutExpo
-        - $easeInOutCirc
-        - $easeInOutBack
+	- **$pathAsset**: default project asset path (..)
+	- **$pathFont**: default project font path (font, prefixed with $pathAsset)
+	- **$pathImage**: default project image path (image, prefixed with $pathAsset)
+	- **$zLayout**: default list of zIndex names (default)**
+	- **$mediaQueries**: default list of mediaQueries (empty list)
+	- **$ease{name}**: List of easing bezier curves
+		- **$easeLinear**
+        - **$ease**
+        - **$easeIn**
+        - **$easeOut**
+        - **$easeInOut**
+        - **$easeInQuad**
+        - **$easeOutQuad**
+        - **$easeInCubic**
+        - **$easeOutCubic**
+        - **$easeInQuart**
+        - **$easeOutQuart**
+        - **$easeInQuint**
+        - **$easeOutQuint**
+        - **$easeInSine**
+        - **$easeOutSine**
+        - **$easeInExpo**
+        - **$easeOutExpo**
+        - **$easeInCirc**
+        - **$easeOutCirc**
+        - **$easeInBack**
+        - **$easeOutBack**
+        - **$easeInOutQuad**
+        - **$easeInOutCubic**
+        - **$easeInOutQuart**
+        - **$easeInOutQuint**
+        - **$easeInOutSine**
+        - **$easeInOutExpo**
+        - **$easeInOutCirc**
+        - **$easeInOutBack**
 
 
 ## Contribute

diff --git a/utils/mixin/_font-face.scss b/utils/mixin/_font-face.scss
@@ -7,12 +7,12 @@
  * @param {string} $fontWeight (normal) - Font weight value
  * @param {string} $fontStyle (normal) - Font style value
  */
-@mixin font-face($fontName, $folderName, $fileName, $fontWeight: normal, $fontStyle: normal) {
+@mixin font-face($name, $folder, $file, $weight: normal, $style: normal) {
 	@font-face {
-		font-family: $fontName;
-		src: font('#{$folderName}/#{$fileName}.woff2') format('woff2'),
-			 font('#{$folderName}/#{$fileName}.woff') format('woff');
-		font-weight: $fontWeight;
-		font-style: $fontStyle;
+		font-family: $name;
+		src: font('#{$folder}/#{$file}.woff2') format('woff2'),
+			 font('#{$folder}/#{$file}.woff') format('woff');
+		font-weight: $weight;
+		font-style: $style;
 	}
 }