Skip to content
Browse files

Moved non-semantic grid classes to it's own file the default grid is …

…now semantic only to use the non-semantic grid classes you should use @import fluidity-non-semantic, this avoids loading the grid functions twice. By making this change the produced css for semantic grids is reduced by about 1000 lines that's an easy decision to make.
  • Loading branch information...
1 parent 1894448 commit e89b923f92d3fc9c7339c44e2556bf55bfab4533 @InkSpeck committed
View
10 lib/fluidity-non-semantic.styl
@@ -0,0 +1,10 @@
+@import "fluidity/normalize"
+@import "fluidity/type"
+@import "fluidity/non-semantic-grid"
+@import "fluidity/css3"
+
+// These are in order here based on dependency.
+// if you'd like to use forms or elements use a seperate @import in your .styl file
+// such as:
+// @import "fluidity/elements"
+// @import "fluidity/forms"
View
6 lib/fluidity.styl
@@ -1,10 +1,10 @@
@import "fluidity/normalize"
@import "fluidity/type"
-@import "fluidity/grid"
+@import "fluidity/semantic-grid"
@import "fluidity/css3"
// These are in order here based on dependency.
// if you'd like to use forms or elements use a seperate @import in your .styl file
-// such as:
+// such as:
// @import "fluidity/elements"
-// @import "fluidity/forms"
+// @import "fluidity/forms"
View
16 lib/fluidity/non-semantic-grid.styl
@@ -0,0 +1,16 @@
+@import "semantic-grid"
+
+.grid
+ grid()
+
+for width in 1..100
+ .grid-space-{width}
+ grid-space(1% * width)
+
+.center-space
+ center-space()
+
+.header
+.footer
+.section
+ section()
View
36 lib/fluidity/grid.styl → lib/fluidity/semantic-grid.styl
@@ -5,21 +5,29 @@ grid(width = grid-width, min-width = grid-min-width)
position relative
width width
min-width min-width
- margin 0 auto
+ margin 0 auto
overflow hidden
+
+
section()
- display block
- position relative
+ display block
+ position relative
float left
width 100%
height 100%
- margin 0
+ margin 0
padding 0
clear both
+header
+footer
+section
+ section()
+
+
space()
display block
- position relative
+ position relative
float left
height 100%
margin 0
@@ -33,21 +41,3 @@ grid-space(width)
center-space()
float none
margin 0 auto
-
-.grid
- grid()
-
-for width in 1..100
- .grid-space-{width}
- grid-space(1% * width)
-
-.center-space
- center-space()
-
-header
-.header
-footer
-.footer
-section
-.section
- section()
View
2 package.json
@@ -1,7 +1,7 @@
{
"name": "fluidity",
"description": "A fluid semantic grid system and lightweight css framework for Stylus",
- "version": "0.1.4",
+ "version": "0.1.5",
"repository": {
"type": "git",
"url": "git://github.com/InkSpeck/fluidity.git"

0 comments on commit e89b923

Please sign in to comment.
Something went wrong with that request. Please try again.