Fix formatting

Start new changes
Cyber-Duck · Aug 3, 2015 · 1029df7 · 1029df7
1 parent 7345daf
commit 1029df7
Show file tree

Hide file tree

Showing 10 changed files with 243 additions and 232 deletions.
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
@@ -15,7 +15,7 @@
 // * @include box-shadow(2px 2px 2px 2px rgba(0,0,0,0.2));
 // *
 @mixin box-shadow($value: 0 0 4px 0 rgba(0, 0, 0, .5)) {
-  @include prefixer(box-shadow, $value, webkit);
+    @include prefixer(box-shadow, $value, webkit);
 }
 
 
@@ -27,12 +27,12 @@
 // * @include gradients(#FF0, #F00);
 // *
 @mixin gradients($first, $second) {
-  background-color: $first;
-  background-image: -o-linear-gradient(top, $first 0%, $second 100%);
-  background-image: -ms-linear-gradient(top, $first 0%, $second 100%);
-  background-image: -moz-linear-gradient(top, $first, $second);
-  background-image: -webkit-gradient(linear, left top, left bottom, from($first), to($second));
-  background-image: linear-gradient(top, $first 0%, $second 100%);
+    background-color: $first;
+    background-image: -o-linear-gradient(top, $first 0%, $second 100%);
+    background-image: -ms-linear-gradient(top, $first 0%, $second 100%);
+    background-image: -moz-linear-gradient(top, $first, $second);
+    background-image: -webkit-gradient(linear, left top, left bottom, from($first), to($second));
+    background-image: linear-gradient(top, $first 0%, $second 100%);
 }
 
 
@@ -43,7 +43,7 @@
 // * @include box-sizing;
 // *
 @mixin box-sizing($type: border-box) {
-  @include prefixer(box-sizing, $type, moz webkit);
+    @include prefixer(box-sizing, $type, moz webkit);
 }
 
 
@@ -55,11 +55,11 @@
 // * @include opacity(0.7, true);
 // *
 @mixin opacity($opac, $ie: false) {
-  @if $ie {
-    filter: alpha(opacity=$opac * 100);
-    -ms-filter: alpha(opacity=$opac * 100);
-  }
-  opacity: $opac;
+    @if $ie {
+        filter: alpha(opacity=$opac * 100);
+        -ms-filter: alpha(opacity=$opac * 100);
+    }
+    opacity: $opac;
 }
 
 
@@ -70,7 +70,7 @@
 // * @include transition(height 200ms ease-out);
 // *
 @mixin transition($value: .15s) {
-  @include prefixer(transition, $value, webkit);
+    @include prefixer(transition, $value, webkit);
 }
 
 
@@ -82,11 +82,23 @@
 // * @include rotate(45deg);
 // *
 @mixin rotate($deg, $orig: 50% 50%) {
-  @include prefixer(transform, rotate(#{$deg}), webkit ms);
-  @if $orig != 50% and $orig != (50% 50%) 
-  and $orig != center and $orig != (center center) {
-    @include prefixer(transform-origin, $orig, webkit ms);
-  }
+    @include prefixer(transform, rotate(#{$deg}), webkit ms);
+    @if $orig != 50% and $orig != (50% 50%) 
+    and $orig != center and $orig != (center center) {
+        @include prefixer(transform-origin, $orig, webkit ms);
+    }
+}
+
+
+
+// * Translate 
+// * @param $hdist ($distance);
+// * @param $vdist ($distance);
+// *
+// * @include translate(20px, 20px);
+// *
+@mixin translate($hdist: 0, $vdist: 0) {
+    @include prefixer(transform, translate(#{$hdist}, #{$vdist}), webkit ms);
 }
 
 
@@ -97,7 +109,7 @@
 // * @include animation(myanimation 2s 3);
 // *
 @mixin animation($options) {
-  @include prefixer(animation, $options);
+    @include prefixer(animation, $options);
 }
 
 
@@ -108,17 +120,17 @@
 // * @include placeholder(#999);
 // *
 @mixin placeholder($color) {
-  &::-webkit-input-placeholder {
-    color: $color;
-  }
+    &::-webkit-input-placeholder {
+        color: $color;
+    }
 
-  &::-moz-placeholder {
-    color: $color; 
-  }
+    &::-moz-placeholder {
+        color: $color; 
+    }
 
-  &::-ms-input-placeholder {
-    color: $color;
-  }
+    &::-ms-input-placeholder {
+        color: $color;
+    }
 }
 
 
@@ -127,8 +139,8 @@
 // * @include noselect;
 // *
 @mixin noselect {
-  -webkit-touch-callout: none;
-  @include prefixer(user-select, none, webkit ms);
+    -webkit-touch-callout: none;
+    @include prefixer(user-select, none, webkit ms);
 }
 
 
@@ -140,7 +152,7 @@
 // *
 // * This mixin is deprecated, will be removed in future versions
 @mixin radius($radius) { 
-  @include prefixer(border-radius, $radius);
+    @include prefixer(border-radius, $radius);
 } 
 
 
@@ -153,8 +165,8 @@
 // * @include prefixer(animation, $options);
 // *
 @mixin prefixer($property, $value, $prefixes: webkit moz ms o) {
-  @each $prefix in $prefixes {
-    #{'-' + $prefix + '-' + $property}: #{$value};
-  }
-  #{$property}: #{$value};
+    @each $prefix in $prefixes {
+        #{'-' + $prefix + '-' + $property}: #{$value};
+    }
+    #{$property}: #{$value};
 }
diff --git a/scss/_vars.scss b/scss/_vars.scss
@@ -1,47 +1,46 @@
 // Colours
-$highlight:				#fa9200;
+$highlight:                     #fa9200;
 
-$error:             	#f00;
-$error-bg: 		    	#ffe5e5;
+$error:                         #f00;
+$error-bg:                      #ffe5e5;
 
-$success: 		    	#390;
-$success-bg: 	    	#eaf5e5;
+$success:                       #390;
+$success-bg:                    #eaf5e5;
 
-$info: 			    	#39f;
-$info-bg: 		    	#eaf5ff;
+$info:                          #39f;
+$info-bg:                       #eaf5ff;
 
-$warning: 				#ff0;
-$warning-bg: 			#ffffe5;
-
-$black:             	#000;
-$white:             	#fff;
-$text:              	#000;
-$title:					#000;
+$warning:                       #ff0;
+$warning-bg:                    #ffffe5;
 
+$black:                         #000;
+$white:                         #fff;
+$text:                          #000;
+$title:                         #000;
 
 // Grid
-$col-qty:				12;
-$col-width: 			60px;
-$gutter:				20px;
+$col-qty:                       12;
+$col-width:                     60px;
+$gutter:                        20px;
 
 // Large desktop grid
-$xl-col-width: 			70px;
-$xl-gutter:				30px;
+$xl-col-width:                  70px;
+$xl-gutter:                     30px;
 
 
 // Breakpoints
-$breakpoint-xl: 		1360px;
-$breakpoint-large: 		1024px;
-$breakpoint-medium: 	680px;
-$breakpoint-small: 		120px;
+$breakpoint-xl:                 1360px;
+$breakpoint-large:              1024px;
+$breakpoint-medium:             680px;
+$breakpoint-small:              120px;
 
 
 // Paths
-$img: 		    		'../img/';
-$sprite: 		    	'../img/sprite.png';
-$fonts: 		    	'../fonts/';
+$img:                           '../img/';
+$sprite:                        '../img/sprite.png';
+$fonts:                         '../fonts/';
 
-	
+    
 // Typography
-$body-font: 			sans-serif;
-$title-font: 			serif;
+$body-font:                     sans-serif;
+$title-font:                    serif;
diff --git a/scss/_version.scss b/scss/_version.scss
@@ -6,4 +6,4 @@
 // * Created by: Cyber-Duck Ltd <[email protected]>,
 // *             Ramon Lapenta <[email protected]>
 // *
-// *
+// *
diff --git a/scss/ie.scss b/scss/ie.scss
@@ -12,57 +12,57 @@ header,
 hgroup, 
 nav, 
 section { 
-  display: block; 
+    display: block; 
 }
 
 $wrap: $col-width * $col-qty + $gutter * ($col-qty - 1);
 
 .container {
-  margin: 0 auto;
-  width: $wrap + $gutter;
+    margin: 0 auto;
+    width: $wrap + $gutter;
 }
 
 @for $i from 2 through $col-qty {
-  .col#{$i} {
-    float: left;
-    margin: 0 $gutter/2;
-    width: ($col-width * $i) + ($gutter * $i) - $gutter;
-  }
+    .col#{$i} {
+        float: left;
+        margin: 0 $gutter/2;
+        width: ($col-width * $i) + ($gutter * $i) - $gutter;
+    }
 }
 
 @for $i from 1 through ($col-qty - 1) {
-  .pre#{$i} {
-    padding-left: ($col-width * $i) + ($gutter * $i);
-  }
+    .pre#{$i} {
+        padding-left: ($col-width * $i) + ($gutter * $i);
+    }
 }
 
 @for $i from 1 through ($col-qty - 1) {
-  .suf#{$i} {
-    padding-right: ($col-width * $i) + ($gutter * $i);
-  }
+    .suf#{$i} {
+        padding-right: ($col-width * $i) + ($gutter * $i);
+    }
 }
 
 // Grid utilities
 .colr {
-  float: right;
-  margin: 0 $gutter/2;
+    float: right;
+    margin: 0 $gutter/2;
 }
 
 .alpha {
-  margin-left: 0;
+    margin-left: 0;
 }
 
 .omega {
-  margin-right: 0;
+    margin-right: 0;
 }
 
 .clear {
-  clear: both;
+    clear: both;
 }
 
 .center {
-  float: none;
-  margin: 0 auto;
+    float: none;
+    margin: 0 auto;
 }
 
 // * Import all sections and common files from desk folder
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ @@
     // * Created by: Cyber-Duck Ltd <[email protected]>,
     // *             Ramon Lapenta <[email protected]>
     // *
-    // *
+    // *