Skip to content

Commit

Permalink
Refactored to make this framework work better with compass.
Browse files Browse the repository at this point in the history
* Separated the foundation files from the application template files.
* Added a single import for the includes directory.
* There's no need for a foundation file in the project template as it
  kept inside the main gem now and it's contents are simply imported
  into the application file. Consequently, since it is harder to edit
  the foundation files, you will probably will need to make things
  more configurable. These are good things :) It means you can upgrade
  your framework without breaking the user's deltas.
* Changed the imports to be namespaced under `zurb`. This makes it
  unlikely for the user to encounter import conflicts.
* Updated the stylesheet directives in the project manifest to annotate
  the stylesheets declarations. This causes the output of the compass
  installer to provide better instructions.
* Removed the config file, it is provided by compass.
  • Loading branch information
chriseppstein committed Dec 17, 2011
1 parent 41cf686 commit 95b35d0
Show file tree
Hide file tree
Showing 28 changed files with 46 additions and 589 deletions.
1 change: 0 additions & 1 deletion stylesheets/_foundation-sass.sass

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import includes/settings
@import includes/mixins
@import includes/colors
@import includes

/* Artfully masterminded by ZURB :: Make sure to include app.js if using inline label inputs */

/* Standard Forms */
Expand Down
9 changes: 9 additions & 0 deletions stylesheets/zurb/_foundation.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@import includes
@import globals
@import typography
@import grid
@import ui
@import forms
@import orbit
@import reveal
@import mobile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import includes/settings
@import includes/mixins
@import includes/colors
@import includes

/* Artfully masterminded by ZURB */
/* Table of Contents */
/* :: Reset & Standards */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@import includes/settings
@import includes/mixins
@import includes/colors
/* Arfully Masterminded by ZURB */
/* Grid :: This is the mobile-friendly, responsive grid that lets Foundation work much of its magic. */

Expand Down
3 changes: 3 additions & 0 deletions stylesheets/zurb/_includes.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import includes/settings
@import includes/colors
@import includes/mixins
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import includes/settings
@import includes/mixins
@import includes/colors
@import includes

/* Typography */
h1,h2,h3,h4,h5,h6
color: #181818
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
33 changes: 0 additions & 33 deletions templates/project/config.rb

This file was deleted.

19 changes: 3 additions & 16 deletions templates/project/manifest.rb
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
description 'foundation-sass'
description 'Zurb Foundation'

# Sass Files
stylesheet 'sass/app.sass', :to => 'app.sass'
stylesheet 'sass/forms.sass', :to => 'forms.sass'
stylesheet 'sass/globals.sass', :to => 'globals.sass'
stylesheet 'sass/ie.sass', :to => 'ie.sass'
stylesheet 'sass/orbit.sass', :to => 'orbit.sass'
stylesheet 'sass/reveal.sass', :to => 'reveal.sass'
stylesheet 'sass/ui.sass', :to => 'ui.sass'
stylesheet 'sass/mobile.sass', :to => 'mobile.sass'
stylesheet 'sass/grid.sass', :to => 'grid.sass'
stylesheet 'sass/typography.sass', :to => 'typography.sass'

# Sass Mixins
stylesheet 'sass/includes/_mixins.sass', :to => 'includes/_mixins.sass'
stylesheet 'sass/includes/_settings.sass', :to => 'includes/_settings.sass'
stylesheet 'sass/includes/_colors.sass', :to => 'includes/_colors.sass'
stylesheet 'sass/app.sass', :to => 'app.sass', :media => "screen, projector, print"
stylesheet 'sass/ie.sass', :to => 'ie.sass', :condition => "IE lt 9"

# Javascrips
javascript 'javascripts/app.js', :to => 'app.js'
Expand Down
28 changes: 24 additions & 4 deletions templates/project/sass/app.sass
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
@import includes/settings
@import includes/mixins
@import includes/colors
@import zurb/foundation

/* Artfully masterminded by ZURB */
// --------------------------------------------------
// Table of Contents
// --------------------------------------------------
// :: Shared Styles
// :: Page Name 1
// :: Page Name 2
// -----------------------------------------
// Shared Styles
// -----------------------------------------
// -----------------------------------------
// Page Name 1
// -----------------------------------------
// -----------------------------------------
// Page Name 2
//------------------------------------------
4 changes: 1 addition & 3 deletions templates/project/sass/ie.sass
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import includes/settings
@import includes/mixins
@import includes/colors
@import zurb/includes

/* This is for all IE specfific style less than IE9. We hate IE. */

Expand Down
1 change: 0 additions & 1 deletion templates/project/stylesheets/app.css

This file was deleted.

70 changes: 0 additions & 70 deletions templates/project/stylesheets/forms.css

This file was deleted.

69 changes: 0 additions & 69 deletions templates/project/stylesheets/globals.css

This file was deleted.

66 changes: 0 additions & 66 deletions templates/project/stylesheets/grid.css

This file was deleted.

2 changes: 0 additions & 2 deletions templates/project/stylesheets/ie.css

This file was deleted.

Loading

0 comments on commit 95b35d0

Please sign in to comment.