Commit 15b4dc46 by Brian Talbot

Merge pull request #93 from edx/talbs/fix-neat-sass-import

Neat-based Sass Import Fix
parents a7293f32 63e2ca77
...@@ -39,6 +39,10 @@ htmlcov ...@@ -39,6 +39,10 @@ htmlcov
.project .project
.pydevproject .pydevproject
# Sass/Codekit
apps/openassessment/xblock/static/sass/.sass-cache/
config.codekit
# some mac thing # some mac thing
.DS_Store .DS_Store
......
...@@ -88,7 +88,6 @@ $f-serif: 'PT Serif', Cambria, Georgia, 'Times New Roman', Times, serif; ...@@ -88,7 +88,6 @@ $f-serif: 'PT Serif', Cambria, Georgia, 'Times New Roman', Times, serif;
$f-sans-serif: 'Open Sans','Helvetica Neue', Helvetica, Arial, sans-serif; $f-sans-serif: 'Open Sans','Helvetica Neue', Helvetica, Arial, sans-serif;
// layout - grid // layout - grid
@import "neat/neat-helpers";
$max-width: 100%; $max-width: 100%;
$grid-columns: 12; $grid-columns: 12;
$gutter: $baseline-v; $gutter: $baseline-v;
......
...@@ -14,7 +14,6 @@ $baseline-h: 40px; // horizonta ...@@ -14,7 +14,6 @@ $baseline-h: 40px; // horizonta
// layout - grid (neat-based - http://neat.bourbon.io/) // layout - grid (neat-based - http://neat.bourbon.io/)
// -------------------- // --------------------
// grid // grid
@import "neat/neat-helpers";
$max-width: 100%; // http://gridcalculator.dk/#/1040/12/20/20 $max-width: 100%; // http://gridcalculator.dk/#/1040/12/20/20
$grid-columns: 12; // make grid 12 columns $grid-columns: 12; // make grid 12 columns
$column: $baseline-v; $column: $baseline-v;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment