Skip to content

Commit

Permalink
updated for Foundation 2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
zurbchris committed Nov 18, 2011
1 parent cf31808 commit daa914e
Show file tree
Hide file tree
Showing 28 changed files with 675 additions and 657 deletions.
2 changes: 1 addition & 1 deletion .rvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rvm ruby-1.9.2@sass-foundation --create
rvm ruby-1.9.2@foundation-sass --create
File renamed without changes.
2 changes: 0 additions & 2 deletions templates/project/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@
http_path = '/'
http_stylesheets_path = '/stylesheets'
http_images_path = '/images'
http_fonts_path = '/fonts'
http_javascripts_path = '/javascripts'

# File system locations
sass_dir = 'sass'
css_dir = 'stylesheets'
images_dir = 'images'
fonts_dir = 'fonts'
javascripts_dir = 'javascripts'

# Set to true for debugging
Expand Down
7 changes: 2 additions & 5 deletions templates/project/javascripts/app.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
$(document).ready(function() {

/* Use this js doc for all application specific JS */
$(window).resize(function() {
console.log($(window).width());
});

/* Use this js doc for all application specific JS */

/* TABS --------------------------------- */
/* Remove if you don't need :) */
Expand Down
6 changes: 6 additions & 0 deletions templates/project/javascripts/jquery.customforms.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ jQuery(document).ready(function ($) {

input.checked = ((input.checked) ? false : true);
$element.toggleClass('checked');

$input.trigger('change');
}

function toggleRadio($element) {
Expand All @@ -81,6 +83,8 @@ jQuery(document).ready(function ($) {
});
input.checked = ((input.checked) ? false : true);
$element.toggleClass('checked');

$input.trigger('change');
}

$('form.custom span.custom.checkbox').live('click', function (event) {
Expand Down Expand Up @@ -158,5 +162,7 @@ jQuery(document).ready(function ($) {

});
$select[0].selectedIndex = selectedIndex;

$select.trigger('change');
});
})(jQuery);
1 change: 1 addition & 0 deletions templates/project/javascripts/jquery.orbit-1.3.0.js
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@
this.$bullets = $(this.bulletHTML);
this.$wrapper.append(this.$bullets);
this.$slides.each(this.addBullet);
this.$element.addClass('with-bullets');
if (this.options.centerBullets) this.$bullets.css('margin-left', -this.$bullets.width() / 2);
},

Expand Down
63 changes: 32 additions & 31 deletions templates/project/manifest.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,41 +10,41 @@
file "config.rb"

# CSS Files
stylesheet "stylesheets/app.css", :media => 'screen'
stylesheet "stylesheets/forms.css", :media => 'screen'
stylesheet "stylesheets/globals.css", :media => 'screen'
stylesheet "stylesheets/ie.css", :media => 'screen'
stylesheet "stylesheets/orbit.css", :media => 'screen'
stylesheet "stylesheets/reveal.css", :media => 'screen'
stylesheet "stylesheets/ui.css", :media => 'screen'
stylesheet "stylesheets/mobile.css", :media => 'screen'
stylesheet "stylesheets/grid.css", :media => 'screen'
stylesheet "stylesheets/typography.css", :media => 'screen'
file "stylesheets/app.css", :media => 'screen'
file "stylesheets/forms.css", :media => 'screen'
file "stylesheets/globals.css", :media => 'screen'
file "stylesheets/ie.css", :media => 'screen'
file "stylesheets/orbit.css", :media => 'screen'
file "stylesheets/reveal.css", :media => 'screen'
file "stylesheets/ui.css", :media => 'screen'
file "stylesheets/mobile.css", :media => 'screen'
file "stylesheets/grid.css", :media => 'screen'
file "stylesheets/typography.css", :media => 'screen'

# Image Files
image "images/misc/button-gloss.png"
image "images/misc/button-overlay.png"
image "images/misc/custom-form-sprites.png"
image "images/misc/input-bg.png"
image "images/misc/modal-gloss.png"
image "images/misc/table-sorter.png"
image "images/orbit/bullets.jpg"
image "images/orbit/left-arrow.png"
image "images/orbit/loading.gif"
image "images/orbit/mask-black.png"
image "images/orbit/pause-black.png"
image "images/orbit/right-arrow.png"
image "images/orbit/rotator-black.png"
image "images/orbit/timer-black.png"
file "images/misc/button-gloss.png"
file "images/misc/button-overlay.png"
file "images/misc/custom-form-sprites.png"
file "images/misc/input-bg.png"
file "images/misc/modal-gloss.png"
file "images/misc/table-sorter.png"
file "images/orbit/bullets.jpg"
file "images/orbit/left-arrow.png"
file "images/orbit/loading.gif"
file "images/orbit/mask-black.png"
file "images/orbit/pause-black.png"
file "images/orbit/right-arrow.png"
file "images/orbit/rotator-black.png"
file "images/orbit/timer-black.png"

# Javascrips
javascript "javascripts/app.js"
javascript "javascripts/forms.jquery.js"
javascript "javascripts/jquery.customforms.js"
javascript "javascripts/jquery.min.js"
javascript "javascripts/jquery.reveal.js"
javascript "javascripts/jquery.orbit-1.3.0.js"
javascript "javascripts/jquery.placeholder.min.js"
file "javascripts/app.js"
file "javascripts/forms.jquery.js"
file "javascripts/jquery.customforms.js"
file "javascripts/jquery.min.js"
file "javascripts/jquery.reveal.js"
file "javascripts/jquery.orbit-1.3.0.js"
file "javascripts/jquery.placeholder.min.js"

# Sass Files
file "sass/app.sass"
Expand All @@ -60,6 +60,7 @@
# Sass Mixins
file "sass/includes/_mixins.sass"
file "sass/includes/_settings.sass"
file "sass/includes/_colors.sass"

help %Q{
Expand Down
16 changes: 2 additions & 14 deletions templates/project/sass/app.sass
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
// `Settings, it's where we configure an needed vars that are global to Foundation
//----------------------------------------------------------------------------------------------------
@import includes/settings

// `Compass, importing CSS3 mixins and it's utilities
//----------------------------------------------------------------------------------------------------
@import compass/css3
@import compass/utilities

// `Import our mixins. For now this is one file.
//----------------------------------------------------------------------------------------------------
@import includes/mixins
@import includes/colors

/* Artfully masterminded by ZURB */
/* Artfully masterminded by ZURB */

3 changes: 2 additions & 1 deletion templates/project/sass/forms.sass
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
@import includes/settings
@import includes/mixins
@import includes/colors
/* Artfully masterminded by ZURB :: Make sure to include app.js if using inline label inputs */

/* Standard Forms */
form
formv
margin: 0 0 18px
label
display: block
Expand Down
3 changes: 2 additions & 1 deletion templates/project/sass/globals.sass
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
@import includes/settings
@import includes/mixins
@import includes/colors
/* Artfully masterminded by ZURB */
/* Table of Contents */
/* :: Reset & Standards */
/* :: Links */
/* :: Lists */
/* :: Tables */
/* :: Misc */
/* :: Misc */

/* Global Reset & Standards */
/* Eric Meyer's CSS Reset :: http://meyerweb.com/eric/tools/css/reset/ :: v2.0 | 20110126 :: License: none (public domain) */
Expand Down
45 changes: 23 additions & 22 deletions templates/project/sass/grid.sass
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@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 Expand Up @@ -88,28 +89,28 @@
&:first-child
margin-left: 87.0%

.one.centered
margin-left: 47.9%
.two.centered
margin-left: 43.5%
.three.centered
margin-left: 39.2%
.four.centered
margin-left: 34.8%
.five.centered
margin-left: 30.5%
.six.centered
margin-left: 26.1%
.seven.centered
margin-left: 21.8%
.eight.centered
margin-left: 17.4%
.nine.centered
margin-left: 13.1%
.ten.centered
margin-left: 8.7%
.eleven.centered
margin-left: 4.3%
//.one.centered
// margin-left: 47.9%
//.two.centered
// margin-left: 43.5%
//.three.centered
// margin-left: 39.2%
//.four.centered
// margin-left: 34.8%
//.five.centered
// margin-left: 30.5%
//.six.centered
// margin-left: 26.1%
//.seven.centered
// margin-left: 21.8%
//.eight.centered
// margin-left: 17.4%
//.nine.centered
// margin-left: 13.1%
//.ten.centered
// margin-left: 8.7%
//.eleven.centered
// margin-left: 4.3%
img, object, embed
max-width: 100%
Expand Down
1 change: 1 addition & 0 deletions templates/project/sass/ie.sass
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import includes/settings
@import includes/mixins
@import includes/colors

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

Expand Down
4 changes: 2 additions & 2 deletions templates/project/sass/includes/_colors.sass
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// `Colors
// Colors
//----------------------------------------------------------------------------------------------------
$blue: #00a6fc
$white: #fff
$black: #000
$red: #e91c21
$charcoal: #141414
$black: #141414
8 changes: 7 additions & 1 deletion templates/project/sass/includes/_mixins.sass
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
// `Font stacks
// Compass, importing CSS3 mixins and it's utilities
//----------------------------------------------------------------------------------------------------
@import compass/css3
@import compass/utilities

// Font stacks
//----------------------------------------------------------------------------------------------------
@mixin HelveticaFontStack
Expand Down
3 changes: 1 addition & 2 deletions templates/project/sass/includes/_settings.sass
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// `Setttings to configure any needed vars that are global to Foundation
// Setttings to configure any needed vars that are global to Foundation
//----------------------------------------------------------------------------------------------------
// $experimental-support-for-opera: false
$experimental-support-for-khtml: false
$experimental-support-for-microsoft: false
Loading

0 comments on commit daa914e

Please sign in to comment.