Merge pull request #30 from chrishumboldt/dev-chris

Dev chris
chrishumboldt · Aug 6, 2014 · 9054603 · 9054603
2 parents 8402132 + 45628f9
commit 9054603
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 58 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Webplate",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "homepage": "https://getwebplate.com",
   "authors": [
     "Chris Humboldt <chrismodem@gmail.com>"

diff --git a/core/build/package.json b/core/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Webplate",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "An awesome front-end javascript bootstrap that lets you stay focused on building your site or app all the while remaining really easy to use.",
   "main": "../../index.html",
   "dependencies": {

diff --git a/core/sass/blueplate/_alignment.scss b/core/sass/blueplate/_alignment.scss
@@ -9,7 +9,6 @@
 // Table of contents
 // ---------------------------------------------------------------------------------------
 // Centering
-// Position
 
 
 // Centering
@@ -26,28 +25,3 @@
 }
 
 
-// Position
-// ---------------------------------------------------------------------------------------
-@mixin position($position: relative, $arguments: false) {
-	position: $position;
-
-	// Arguments
-	@include position-arguments($arguments);
-}
-@mixin position-absolute($arguments: false) {
-	@include position(absolute, $arguments);
-}
-@mixin position-fixed($arguments: false) {
-	@include position(fixed, $arguments);
-}
-@mixin position-relative($arguments: false) {
-	@include position(relative, $arguments);
-}
-@mixin position-static($arguments: false) {
-	@include position(static, $arguments);
-}
-@mixin position-inherit($arguments: false) {
-	@include position(inherit, $arguments);
-}
-
-
diff --git a/core/sass/blueplate/_background.scss b/core/sass/blueplate/_background.scss
@@ -15,7 +15,7 @@
 
 // Background colour
 // ---------------------------------------------------------------------------------------
-@mixin background-colour($colour: $grey) {
+@mixin background-colour($colour) {
 	background-color: $colour;
 }
 @mixin background-color($colour) {

diff --git a/core/sass/blueplate/_border.scss b/core/sass/blueplate/_border.scss
@@ -8,12 +8,39 @@
 
 // Table of contents
 // ---------------------------------------------------------------------------------------
-// Radius
 // Border lines
+// Border radius
 // Border shades
 
 
-// Radius
+// Border lines
+// ---------------------------------------------------------------------------------------
+@mixin border($colour: $grey, $size: 1px, $type: solid) {
+	border: $size $type $colour;
+}
+@mixin border-top($colour: $grey, $size: 1px, $type: solid) {
+	border-top: $size $type $colour;
+}
+@mixin border-bottom($colour: $grey, $size: 1px, $type: solid) {
+	border-bottom: $size $type $colour;
+}
+@mixin border-left($colour: $grey, $size: 1px, $type: solid) {
+	border-left: $size $type $colour;
+}
+@mixin border-right($colour: $grey, $size: 1px, $type: solid) {
+	border-right: $size $type $colour;
+}
+@mixin border-vertical($colour: $grey, $size: 1px, $type: solid) {
+	@include border-top($colour, $size, $type);
+	@include border-bottom($colour, $size, $type);
+}
+@mixin border-horizontal($colour: $grey, $size: 1px, $type: solid) {
+	@include border-left($colour, $size, $type);
+	@include border-right($colour, $size, $type);
+}
+
+
+// Border radius
 // ---------------------------------------------------------------------------------------
 @mixin border-radius($radius: 2px) {
 	border-radius: $radius;
@@ -89,33 +116,6 @@
 }
 
 
-// Border lines
-// ---------------------------------------------------------------------------------------
-@mixin border($colour: $grey, $size: 1px, $type: solid) {
-	border: $size $type $colour;
-}
-@mixin border-top($colour: $grey, $size: 1px, $type: solid) {
-	border-top: $size $type $colour;
-}
-@mixin border-bottom($colour: $grey, $size: 1px, $type: solid) {
-	border-bottom: $size $type $colour;
-}
-@mixin border-left($colour: $grey, $size: 1px, $type: solid) {
-	border-left: $size $type $colour;
-}
-@mixin border-right($colour: $grey, $size: 1px, $type: solid) {
-	border-right: $size $type $colour;
-}
-@mixin border-vertical($colour: $grey, $size: 1px, $type: solid) {
-	@include border-top($colour, $size, $type);
-	@include border-bottom($colour, $size, $type);
-}
-@mixin border-horizontal($colour: $grey, $size: 1px, $type: solid) {
-	@include border-left($colour, $size, $type);
-	@include border-right($colour, $size, $type);
-}
-
-
 // Border shades
 // ---------------------------------------------------------------------------------------
 @mixin border-light($highlight: 0.8, $colour: #ffffff) {

diff --git a/core/sass/blueplate/_import.scss b/core/sass/blueplate/_import.scss
@@ -36,6 +36,7 @@
 @import "input_types";
 @import "ios";
 @import "layout";
+@import "position";
 @import "responsive-layout";
 @import "size";
 @import "spacing";

diff --git a/core/sass/blueplate/_position.scss b/core/sass/blueplate/_position.scss
@@ -0,0 +1,41 @@
+/**
+ * SASS File: 		_position.scss
+ * Type: 			partial
+ * Author:        	Chris Humboldt
+ * Last Edited:   	6 August 2014
+ */
+
+
+// Table of contents
+// ---------------------------------------------------------------------------------------
+// Position
+
+
+// Position
+// ---------------------------------------------------------------------------------------
+@mixin position($position: relative, $arguments: false) {
+	position: $position;
+
+	// Arguments
+	@include position-set($arguments);
+}
+@mixin position-set($arguments: false) {
+	@include position-arguments($arguments);
+}
+@mixin position-absolute($arguments: false) {
+	@include position(absolute, $arguments);
+}
+@mixin position-fixed($arguments: false) {
+	@include position(fixed, $arguments);
+}
+@mixin position-relative($arguments: false) {
+	@include position(relative, $arguments);
+}
+@mixin position-static($arguments: false) {
+	@include position(static, $arguments);
+}
+@mixin position-inherit($arguments: false) {
+	@include position(inherit, $arguments);
+}
+
+