Skip to content

Commit

Permalink
updating mixins
Browse files Browse the repository at this point in the history
  • Loading branch information
zurbchris committed Jul 25, 2012
1 parent 6f01c89 commit cd74947
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 33 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
zurb-foundation (3.0.7.rc2)
zurb-foundation (3.0.7.rc3)
compass (>= 0.12.2)
rake
sass (>= 3.2.0.alpha.244)
Expand Down
2 changes: 1 addition & 1 deletion lib/foundation/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Foundation
VERSION = "3.0.7.rc3"
VERSION = "3.0.7.rc4"
end
2 changes: 2 additions & 0 deletions stylesheets/foundation/mixins/_all.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "respond-to";
@import "font-size";
@import "css-triangle";
@import "clearfix";
@import "semantic-grid";
25 changes: 0 additions & 25 deletions stylesheets/foundation/mixins/_semantic-grid.scss
Original file line number Diff line number Diff line change
@@ -1,30 +1,5 @@
// Inspired by https://github.com/twigkit/semantic.gs/blob/master/stylesheets/scss/grid.scss

// Mixin for Semantic Grid reponsiveness

@mixin respondTo($media) {
@if $media == smallScreen {
@media only screen and (max-width: $screenSmall - 1) { @content; }
} @else if $media == mediumScreen {
@media only screen and (max-width: $screenMedium) and (min-width: $screenSmall) { @content; }
} @else if $media == largeScreen {
@media only screen and (min-width: $screenXlarge) { @content; }
}
}

// The micro clearfix http://nicolasgallagher.com/micro-clearfix-hack/

@mixin clearfix() { *zoom:1;
&:before, &:after { content: ""; display: table; }
&:after { clear: both; }
}
@mixin mobileClearfix() {
@include respondTo(smallScreen) { &:before, &:after { content: ""; display: table; }
&:after { clear: both; }
&:last-child { float: none; }
}
}

// Outer row mixin for container rows

@mixin outerRow() { width: $rowWidth; max-width: 100%; min-width: $screenSmall; margin: 0 auto; @include clearfix(); }
Expand Down
20 changes: 14 additions & 6 deletions templates/project/sass/app.scss
Original file line number Diff line number Diff line change
@@ -1,34 +1,42 @@
// You custom settings file to override Foundation defaults.
// You custom settings file to override Foundation defaults
@import "settings";

// Comment out this import if you are customizing you imports below.
// Comment out this import if you are customizing you imports below
@import "foundation";

// ----------------------------------------
// Import specific parts of Foundation by commenting the import "foundation"
// and uncommenting what you want below.

// You must uncomment compass/css3 if customizing.
// You must uncomment compass/css3 if customizing

// @import "compass/css3";

// You must uncomment functions/all if customizing.
// You must uncomment functions/all if customizing

// @import "foundation/settings";
// @import "foundation/function/all";

// Control which mixins you have access too

// @import "foundation/mixins/respond-to";
// @import "foundation/mixins/css-triangle";
// @import "foundation/mixins/font-size";
// @import "foundation/mixins/clearfix";
// @import "foundation/mixins/semantic-grid";

// Control which common styles get compiled.
// Control which common styles get compiled

// @import "foundation/common/globals";
// @import "foundation/common/typography";
// @import "foundation/common/forms";

// Must include the grid for any responsiveness

// @import "foundation/components/grid";

// Control which components you get if customizing.
// Control which components you get if customizing

// @import "foundation/components/modules/buttons";
// @import "foundation/components/modules/tabs";
// @import "foundation/components/modules/ui";
Expand Down

0 comments on commit cd74947

Please sign in to comment.