Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-ora2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-ora2
Commits
15b4dc46
Commit
15b4dc46
authored
Mar 10, 2014
by
Brian Talbot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #93 from edx/talbs/fix-neat-sass-import
Neat-based Sass Import Fix
parents
a7293f32
63e2ca77
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
.gitignore
+4
-0
apps/openassessment/xblock/static/sass/themes/edx/_utilities.scss
+0
-1
apps/openassessment/xblock/static/sass/xb/utilities/_variables.scss
+0
-1
No files found.
.gitignore
View file @
15b4dc46
...
@@ -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
...
...
apps/openassessment/xblock/static/sass/themes/edx/_utilities.scss
View file @
15b4dc46
...
@@ -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
;
...
...
apps/openassessment/xblock/static/sass/xb/utilities/_variables.scss
View file @
15b4dc46
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment