Merge pull request #594 from MickeyKay/sass-fixes

Add fixes for faulty Sass import paths and negative values. Closes #588.
Automattic · Aug 29, 2014 · b76f394 · b76f394
2 parents 6e4a3f5 + 4effd89
commit b76f394
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/sass/layout/_content-sidebar.scss b/sass/layout/_content-sidebar.scss
@@ -1,6 +1,6 @@
 .content-area {
 	float: left;
-	margin: 0 -$size__site-sidebar 0 0;
+	margin: 0 (-$size__site-sidebar) 0 0;
 	width: $size__site-main;
 }
 

diff --git a/sass/layout/_sidebar-content.scss b/sass/layout/_sidebar-content.scss
@@ -1,6 +1,6 @@
 .content-area {
 	float: right;
-	margin: 0 0 0 -$size__site-sidebar;
+	margin: 0 0 0 (-$size__site-sidebar);
 	width: $size__site-main;
 }
 

diff --git a/sass/site/_site.scss b/sass/site/_site.scss
@@ -1,5 +1,5 @@
-// @import "layout/content-sidebar";
-// @import "layout/sidebar-content";
+// @import "../layout/content-sidebar";
+// @import "../layout/sidebar-content";
 /*--------------------------------------------------------------
 10.1 Posts and pages
 --------------------------------------------------------------*/