zurb-foundation 3.0.6 → 3.0.7.rc10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (63) hide show
  1. data/Gemfile.lock +1 -1
  2. data/lib/foundation/generators/USAGE +14 -0
  3. data/lib/foundation/generators/install_generator.rb +30 -0
  4. data/lib/foundation/generators/layout_generator.rb +25 -0
  5. data/lib/foundation/generators/templates/application.html.erb +29 -0
  6. data/lib/foundation/generators/templates/application.html.haml +29 -0
  7. data/lib/foundation/version.rb +1 -1
  8. data/lib/zurb-foundation.rb +4 -0
  9. data/stylesheets/foundation/_settings.scss +9 -0
  10. data/stylesheets/foundation/common/_base.scss +3 -0
  11. data/stylesheets/foundation/{forms.scss → common/_forms.scss} +0 -0
  12. data/stylesheets/foundation/{globals.scss → common/_globals.scss} +1 -1
  13. data/stylesheets/foundation/{typography.scss → common/_typography.scss} +9 -7
  14. data/stylesheets/foundation/{grid.scss → components/_grid.scss} +0 -0
  15. data/stylesheets/foundation/components/modules/_all.scss +7 -0
  16. data/stylesheets/foundation/{buttons.scss → components/modules/_buttons.scss} +2 -2
  17. data/stylesheets/foundation/{navbar.scss → components/modules/_navbar.scss} +0 -0
  18. data/stylesheets/foundation/{offcanvas.scss → components/modules/_offcanvas.scss} +0 -0
  19. data/stylesheets/foundation/{orbit.scss → components/modules/_orbit.scss} +0 -0
  20. data/stylesheets/foundation/{reveal.scss → components/modules/_reveal.scss} +0 -0
  21. data/stylesheets/foundation/{tabs.scss → components/modules/_tabs.scss} +0 -0
  22. data/stylesheets/foundation/{ui.scss → components/modules/_ui.scss} +2 -2
  23. data/stylesheets/foundation/function/_all.scss +3 -0
  24. data/stylesheets/foundation/{_functions.scss → function/_convert-number-to-word.scss} +0 -0
  25. data/stylesheets/foundation/function/_grid-calc.scss +5 -0
  26. data/stylesheets/foundation/{_modular-scale.sass → function/_modular-scale.sass} +0 -0
  27. data/stylesheets/foundation/mixins/_all.scss +5 -0
  28. data/stylesheets/foundation/mixins/_clearfix.scss +13 -0
  29. data/stylesheets/foundation/{_mixins.scss → mixins/_css-triangle.scss} +1 -25
  30. data/stylesheets/foundation/mixins/_font-size.scss +11 -0
  31. data/stylesheets/foundation/mixins/_respond-to.scss +11 -0
  32. data/stylesheets/foundation/{_semantic-grid.scss → mixins/_semantic-grid.scss} +0 -25
  33. data/stylesheets/foundation.scss +16 -0
  34. data/templates/project/index.html +0 -10
  35. data/templates/project/manifest.rb +2 -12
  36. data/templates/project/sass/_settings.scss +10 -1
  37. data/templates/project/sass/app.scss +36 -17
  38. data/type.html +1 -16
  39. data/vendor/assets/javascripts/foundation/app.js +1 -1
  40. data/vendor/assets/javascripts/foundation/jquery.foundation.accordion.js +4 -4
  41. data/vendor/assets/javascripts/foundation/jquery.foundation.alerts.js +5 -5
  42. data/vendor/assets/javascripts/foundation/jquery.foundation.buttons.js +1 -1
  43. data/vendor/assets/javascripts/foundation/jquery.foundation.forms.js +7 -3
  44. data/vendor/assets/javascripts/foundation/jquery.foundation.navigation.js +6 -6
  45. data/vendor/assets/javascripts/foundation/jquery.foundation.orbit.js +1 -1
  46. data/vendor/assets/javascripts/foundation/jquery.foundation.reveal.js +1 -1
  47. data/vendor/assets/javascripts/foundation/jquery.foundation.tabs.js +5 -5
  48. data/vendor/assets/javascripts/foundation/jquery.foundation.tooltips.js +2 -2
  49. data/vendor/assets/javascripts/foundation/jquery.offcanvas.js +5 -5
  50. metadata +35 -37
  51. data/stylesheets/_foundation.scss +0 -13
  52. data/stylesheets/foundation/_base.scss +0 -6
  53. data/stylesheets/foundation/app.scss +0 -26
  54. data/templates/project/sass/foundation/buttons.scss +0 -5
  55. data/templates/project/sass/foundation/forms.scss +0 -3
  56. data/templates/project/sass/foundation/globals.scss +0 -3
  57. data/templates/project/sass/foundation/grid.scss +0 -3
  58. data/templates/project/sass/foundation/navbar.scss +0 -3
  59. data/templates/project/sass/foundation/orbit.scss +0 -3
  60. data/templates/project/sass/foundation/reveal.scss +0 -3
  61. data/templates/project/sass/foundation/tabs.scss +0 -3
  62. data/templates/project/sass/foundation/typography.scss +0 -3
  63. data/templates/project/sass/foundation/ui.scss +0 -3
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- zurb-foundation (3.0.6)
4
+ zurb-foundation (3.0.7.rc10)
5
5
  compass (>= 0.12.2)
6
6
  rake
7
7
  sass (>= 3.2.0.alpha.244)
@@ -0,0 +1,14 @@
1
+ Description:
2
+ Setup Foundation assets on your website or generate new layouts preconfigured to use Foundation
3
+
4
+ Example:
5
+ rails g foundation:install
6
+
7
+ This will replace the default application assets:
8
+ /app/assets/javascripts/application.js
9
+ /app/assets/stylesheets/application.css
10
+
11
+ rails generate foundation:layout
12
+
13
+ This will create:
14
+ /app/views/layouts/application.html.erb
@@ -0,0 +1,30 @@
1
+ require 'rails/generators'
2
+
3
+ module Foundation
4
+ module Generators
5
+ class InstallGenerator < Rails::Generators::Base
6
+ source_root File.join(File.dirname(__FILE__), 'templates')
7
+
8
+ def add_assets
9
+ insert_into_file "app/assets/javascripts/application#{detect_js_format[0]}", "#{detect_js_format[1]} require foundation\n", :after => "jquery_ujs\n"
10
+ settings_file = File.join(File.dirname(__FILE__),"..","..","..","templates","project","sass","_settings.scss")
11
+ create_file "app/assets/stylesheets/foundation_and_overrides.scss", File.read(settings_file)
12
+ append_to_file "app/assets/stylesheets/foundation_and_overrides.scss", "\n@import 'foundation';\n"
13
+ insert_into_file "app/assets/stylesheets/application#{detect_css_format[0]}", "#{detect_css_format[1]} require foundation_and_overrides\n", :after => "require_self\n"
14
+ end
15
+
16
+ def detect_js_format
17
+ return ['.js.coffee', '#='] if File.exist?('app/assets/javascripts/application.js.coffee')
18
+ return ['.js', '//='] if File.exist?('app/assets/javascripts/application.js')
19
+ end
20
+
21
+ def detect_css_format
22
+ return ['.css', ' *='] if File.exist?('app/assets/stylesheets/application.css')
23
+ return ['.css.sass', ' //='] if File.exist?('app/assets/stylesheets/application.css.sass')
24
+ return ['.sass', ' //='] if File.exist?('app/assets/stylesheets/application.sass')
25
+ return ['.css.scss', ' //='] if File.exist?('app/assets/stylesheets/application.css.scss')
26
+ return ['.scss', ' //='] if File.exist?('app/assets/stylesheets/application.scss')
27
+ end
28
+ end
29
+ end
30
+ end
@@ -0,0 +1,25 @@
1
+ require 'rails/generators'
2
+
3
+ module Foundation
4
+ module Generators
5
+ class LayoutGenerator < Rails::Generators::Base
6
+ source_root File.join(File.dirname(__FILE__), 'templates')
7
+ argument :layout_name, :type => :string, :default => 'application', :banner => 'layout_name'
8
+
9
+ class_option :haml, :desc => 'Generate HAML layout instead of ERB.', :type => :boolean
10
+
11
+ def create_layout
12
+ if options.haml?
13
+ template 'application.html.haml', "app/views/layouts/#{file_name}.html.haml"
14
+ else
15
+ template 'application.html.erb', "app/views/layouts/#{file_name}.html.erb"
16
+ end
17
+ end
18
+
19
+ private
20
+ def file_name
21
+ layout_name.underscore.downcase
22
+ end
23
+ end
24
+ end
25
+ end
@@ -0,0 +1,29 @@
1
+ <!DOCTYPE html>
2
+ <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
3
+ <!--[if lt IE 7 ]> <html class="ie6" lang="en"> <![endif]-->
4
+ <!--[if IE 7 ]> <html class="ie7" lang="en"> <![endif]-->
5
+ <!--[if IE 8 ]> <html class="ie8" lang="en"> <![endif]-->
6
+ <!--[if (gte IE 9)|!(IE)]><!--> <html lang="en"> <!--<![endif]-->
7
+ <head>
8
+ <meta charset="utf-8" />
9
+
10
+ <!-- Uncomment to make IE8 render like IE7 -->
11
+ <!-- <meta http-equiv="X-UA-Compatible" content="IE=7" /> -->
12
+
13
+ <!-- Set the viewport width to device width for mobile -->
14
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
15
+
16
+ <title><%%= content_for?(:title) ? yield(:title) : "Untitled" %></title>
17
+
18
+ <!-- Included CSS Files -->
19
+ <%%= stylesheet_link_tag "application" %>
20
+
21
+ <!-- Included JS Files -->
22
+ <%%= javascript_include_tag "application" %>
23
+
24
+ <%%= csrf_meta_tags %>
25
+ </head>
26
+ <body>
27
+ <%%= yield %>
28
+ </body>
29
+ </html>
@@ -0,0 +1,29 @@
1
+ !!! 5
2
+ / paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/
3
+ /[if lt IE 7 ] <html class=\"ie6\" lang=\"en\">
4
+ /[if IE 7 ] <html class=\"ie7\" lang=\"en\">
5
+ /[if IE 8 ] <html class=\"ie8\" lang=\"en\">
6
+ /[if IE 9 ] <html class=\"ie9\" lang=\"en\">
7
+ /[if (gt IE 9)|!(IE)] <!--> <html lang=\"en\">
8
+
9
+ %head
10
+ %meta{ :charset => "utf-8" }
11
+
12
+ -# Uncomment to make IE8 render like IE7
13
+ -# meta http-equiv="X-UA-Compatible" content="IE=7"
14
+
15
+ -# Set the viewport width to device width for mobile
16
+ %meta{ :name => "viewport", :content => "width=device-width, initial-scale=1.0" }
17
+
18
+ %title= content_for?(:title) ? yield(:title) : "Untitled"
19
+
20
+ -# Included CSS Files
21
+ = stylesheet_link_tag "application"
22
+
23
+ -# Included JS Files
24
+ = javascript_include_tag "application"
25
+
26
+ = csrf_meta_tag
27
+
28
+ %body
29
+ = yield
@@ -1,3 +1,3 @@
1
1
  module Foundation
2
- VERSION = "3.0.6"
2
+ VERSION = "3.0.7.rc10"
3
3
  end
@@ -1,4 +1,8 @@
1
1
  require 'foundation/version'
2
+ if defined?(Rails)
3
+ require "foundation/generators/layout_generator"
4
+ require "foundation/generators/install_generator"
5
+ end
2
6
  require 'compass'
3
7
  extension_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
4
8
  Compass::Frameworks.register('foundation', :path => extension_path)
@@ -20,6 +20,15 @@ $white: #fff !default;
20
20
  $shinyEdge: rgba(#fff, .5) !default;
21
21
  $darkEdge: rgba(#000, .2) !default;
22
22
 
23
+ // Font Settings
24
+ $headerFontFamily: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default;
25
+ $headerFontWeight: bold !default;
26
+ $headerFontColor: #222 !default;
27
+ $bodyFontFamily: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default;
28
+ $bodyFontWeight: normal !default;
29
+ $bodyFontColor: #222 !default;
30
+
31
+
23
32
  // Button Settings
24
33
 
25
34
  $buttonRadius: 3px !default;
@@ -0,0 +1,3 @@
1
+ @import "globals";
2
+ @import "typography";
3
+ @import "forms";
@@ -4,7 +4,7 @@
4
4
 
5
5
  * { @include box-sizing(border-box); }
6
6
  html { font-size: 62.5%; }
7
- body { background: $white; @include defaultFontFamily; @include font-size(14); line-height: 1; color: $txtColor; position: relative; -webkit-font-smoothing: antialiased; }
7
+ body { background: $white; font-family: $bodyFontFamily; font-size: ms(0); line-height: 1; color: $bodyFontColor; position: relative; -webkit-font-smoothing: antialiased; }
8
8
 
9
9
  /* Links ---------------------- */
10
10
 
@@ -6,7 +6,7 @@
6
6
  font-size: ms(0);
7
7
  }
8
8
 
9
- p { font-size: ms(0); line-height: 1.6; margin-bottom: ms(1);
9
+ p { font-family: $bodyFontFamily; font-weight: $bodyFontWeight; font-size: ms(0); line-height: 1.6; margin-bottom: ms(1);
10
10
  &.lead { font-size: ms(0) * 1.25; line-height: 1.6; margin-bottom: ms(1); }
11
11
  img.left, img { margin: ms(1); margin-left: 0; }
12
12
  img.right { margin: ms(1); margin-right: 0; }
@@ -14,11 +14,13 @@
14
14
  aside p { font-size: ms(0) - 1; line-height: 1.35; font-style: italic; }
15
15
 
16
16
  h1, h2, h3, h4, h5, h6 {
17
+ font-family: $headerFontFamily;
18
+ font-weight: $headerFontWeight;
17
19
  text-rendering: optimizeLegibility;
18
20
  line-height: 1.1;
19
21
  margin-bottom: ms(0);
20
22
  margin-top: ms(0);
21
- small { font-size: 60%; color: #888; line-height: 0; }
23
+ small { font-size: 60%; color: lighten($headerFontColor, 30%); line-height: 0; }
22
24
  }
23
25
 
24
26
  h1 { font-size: ms(5); }
@@ -30,7 +32,7 @@
30
32
 
31
33
  hr { border: solid #ddd; border-width: 1px 0 0; clear: both; margin: 22px 0 21px; height: 0; }
32
34
 
33
- .subheader { line-height: 1.3; color: #777; font-weight: 300; margin-bottom: ms(1); }
35
+ .subheader { line-height: 1.3; color: lighten($headerFontColor, 30%); font-weight: 300; margin-bottom: ms(1); }
34
36
 
35
37
  em, i { font-style: italic; line-height: inherit; }
36
38
  strong, b { font-weight: bold; line-height: inherit; }
@@ -59,15 +61,15 @@
59
61
 
60
62
 
61
63
  /* Blockquotes ---------------------- */
62
- blockquote, blockquote p { line-height: 1.5; color: #777; }
64
+ blockquote, blockquote p { line-height: 1.5; color: lighten($headerFontColor, 30%); }
63
65
  blockquote { margin: 0 0 ms(1); padding: 9px 20px 0 19px; border-left: 1px solid #ddd;
64
- cite { display: block; font-size: ms(0) - 1; color: #555;
66
+ cite { display: block; font-size: ms(0) - 1; color: lighten($headerFontColor, 20%);
65
67
  &:before { content: "\2014 \0020"; }
66
- a, a:visited { color: #555; }
68
+ a, a:visited { color: lighten($headerFontColor, 20%); }
67
69
  }
68
70
  }
69
71
 
70
- abbr, acronym { text-transform: uppercase; font-size: 90%; color: #222; border-bottom: 1px solid #ddd; cursor: help; }
72
+ abbr, acronym { text-transform: uppercase; font-size: 90%; color: $headerFontColor; border-bottom: 1px solid #ddd; cursor: help; }
71
73
  abbr { text-transform: none; }
72
74
 
73
75
  /*
@@ -0,0 +1,7 @@
1
+ @import "buttons";
2
+ @import "navbar";
3
+ @import "offcanvas";
4
+ @import "orbit";
5
+ @import "reveal";
6
+ @import "tabs";
7
+ @import "ui";
@@ -3,7 +3,7 @@
3
3
 
4
4
  /* Normal Buttons ---------------------- */
5
5
 
6
- .button { width: auto; background: $mainColor; border: 1px solid darken(($mainColor), 15%); @include box-shadow(0 1px 0 $shinyEdge inset); color: $white; cursor: pointer; display: inline-block; @include defaultFontFamily; font-size: ms(0); font-weight: bold; line-height: 1; margin: 0; outline: none; padding: $btnBase ($btnBase * 2) ($btnBase + 1); position: relative; text-align: center; text-decoration: none; @include single-transition(background-color, .15s, ease-in-out);
6
+ .button { width: auto; background: $mainColor; border: 1px solid darken(($mainColor), 15%); @include box-shadow(0 1px 0 $shinyEdge inset); color: $white; cursor: pointer; display: inline-block; font-family: $bodyFontFamily; font-size: ms(0); font-weight: bold; line-height: 1; margin: 0; outline: none; padding: $btnBase ($btnBase * 2) ($btnBase + 1); position: relative; text-align: center; text-decoration: none; @include single-transition(background-color, .15s, ease-in-out);
7
7
 
8
8
  /* Hovers */
9
9
  &:hover { color: $white; background-color: darken(($mainColor), 10%); }
@@ -95,7 +95,7 @@
95
95
  &>ul { @include box-sizing(content-box); display: none; position: absolute; left: -1px; background: #fff; background: rgba(#fff,0.95); list-style: none; margin: 0; padding: 0; border: 1px solid darken($white, 20%); border-top: none; min-width: 100%; z-index: 40;
96
96
 
97
97
  li { cursor: pointer; padding: 0; min-height: 18px; line-height: 18px; margin: 0; white-space: nowrap; list-style: none;
98
- a { display: block; color: #555; font-size: ms(0) - 1; font-weight: normal; padding: 6px 14px; text-align: left; }
98
+ a { display: block; color: #555; font-size: ms(0) - 1; font-weight: $bodyFontWeight; padding: 6px 14px; text-align: left; }
99
99
  &:hover { background-color: lighten($mainColor, 45%); color: #222; }
100
100
  &.divider { min-height: 0; padding: 0; height: 1px; margin: 4px 0; background: darken($white, 7%); }
101
101
  }
@@ -207,7 +207,7 @@
207
207
 
208
208
  /* Panels ---------------------- */
209
209
 
210
- div.panel { background: darken($white, 5%); border: solid 1px darken($white, 10%); margin: 0 0 22px 0; padding: 20px;
210
+ .panel { background: darken($white, 5%); border: solid 1px darken($white, 10%); margin: 0 0 22px 0; padding: 20px;
211
211
 
212
212
  > :first-child { margin-top: 0; }
213
213
  > :last-child { margin-bottom: 0; }
@@ -268,7 +268,7 @@
268
268
  dl.sub-nav { display: block; width: auto; overflow: hidden; margin: -4px 0 18px -9px; padding-top: 4px;
269
269
 
270
270
  dt, dd { float: left; display: inline; margin-left: 9px; margin-bottom: 4px; }
271
- dt { color: #999; font-weight: normal; }
271
+ dt { color: #999; font-weight: $bodyFontWeight; }
272
272
  dd a { text-decoration: none; @include border-radius(1000px); }
273
273
  dd.active a { font-weight: bold; background: $mainColor; color: #fff; padding: 3px 9px; cursor: default; }
274
274
 
@@ -0,0 +1,3 @@
1
+ @import "modular-scale";
2
+ @import "convert-number-to-word";
3
+ @import "grid-calc";
@@ -0,0 +1,5 @@
1
+ // Grid Calculation for Percentages
2
+
3
+ @function gridCalc($colNumber, $totalColumns) {
4
+ @return percentage(($colNumber / $totalColumns));
5
+ }
@@ -0,0 +1,5 @@
1
+ @import "font-size";
2
+ @import "css-triangle";
3
+ @import "respond-to";
4
+ @import "clearfix";
5
+ @import "semantic-grid";
@@ -0,0 +1,13 @@
1
+ // The micro clearfix http://nicolasgallagher.com/micro-clearfix-hack/
2
+
3
+ @mixin clearfix() { *zoom:1;
4
+ &:before, &:after { content: ""; display: table; }
5
+ &:after { clear: both; }
6
+ }
7
+
8
+ @mixin mobileClearfix() {
9
+ @include respondTo(smallScreen) { &:before, &:after { content: ""; display: table; }
10
+ &:after { clear: both; }
11
+ &:last-child { float: none; }
12
+ }
13
+ }
@@ -1,27 +1,3 @@
1
- // Font size mixin to include px and rem
2
-
3
- @mixin font-size($size, $is-important: false) {
4
- @if $is-important {
5
- font-size: $size + px !important;
6
- font-size: ($size / 10) + rem !important;
7
- } @else {
8
- font-size: $size + px;
9
- font-size: ($size / 10) + rem;
10
- }
11
- }
12
-
13
- // Grid Calculation for Percentages
14
-
15
- @function gridCalc($colNumber, $totalColumns) {
16
- @return percentage(($colNumber / $totalColumns));
17
- }
18
-
19
- // Default Font Stack
20
-
21
- @mixin defaultFontFamily {
22
- font-family: "Helvetica Neue", "HelveticaNeue", Helvetica, Arial, "Lucida Grande", sans-serif;
23
- }
24
-
25
1
  // Create CSS Triangles in a Breeze
26
2
 
27
3
  @mixin cssTriangle($triangleSize, $triangleColor, $triangleDirection) {
@@ -43,4 +19,4 @@
43
19
  border-color: transparent $triangleColor transparent transparent;
44
20
  }
45
21
  // .example { @include css-triangle(5px, #fff, bottom); }
46
- }
22
+ }
@@ -0,0 +1,11 @@
1
+ // Font size mixin to include px and rem
2
+
3
+ @mixin font-size($size, $is-important: false) {
4
+ @if $is-important {
5
+ font-size: $size + px !important;
6
+ font-size: ($size / 10) + rem !important;
7
+ } @else {
8
+ font-size: $size + px;
9
+ font-size: ($size / 10) + rem;
10
+ }
11
+ }
@@ -0,0 +1,11 @@
1
+ // Mixin for Semantic Grid reponsiveness
2
+
3
+ @mixin respondTo($media) {
4
+ @if $media == smallScreen {
5
+ @media only screen and (max-width: $screenSmall - 1) { @content; }
6
+ } @else if $media == mediumScreen {
7
+ @media only screen and (max-width: $screenMedium) and (min-width: $screenSmall) { @content; }
8
+ } @else if $media == largeScreen {
9
+ @media only screen and (min-width: $screenXlarge) { @content; }
10
+ }
11
+ }
@@ -1,30 +1,5 @@
1
1
  // Inspired by https://github.com/twigkit/semantic.gs/blob/master/stylesheets/scss/grid.scss
2
2
 
3
- // Mixin for Semantic Grid reponsiveness
4
-
5
- @mixin respondTo($media) {
6
- @if $media == smallScreen {
7
- @media only screen and (max-width: $screenSmall - 1) { @content; }
8
- } @else if $media == mediumScreen {
9
- @media only screen and (max-width: $screenMedium) and (min-width: $screenSmall) { @content; }
10
- } @else if $media == largeScreen {
11
- @media only screen and (min-width: $screenXlarge) { @content; }
12
- }
13
- }
14
-
15
- // The micro clearfix http://nicolasgallagher.com/micro-clearfix-hack/
16
-
17
- @mixin clearfix() { *zoom:1;
18
- &:before, &:after { content: ""; display: table; }
19
- &:after { clear: both; }
20
- }
21
- @mixin mobileClearfix() {
22
- @include respondTo(smallScreen) { &:before, &:after { content: ""; display: table; }
23
- &:after { clear: both; }
24
- &:last-child { float: none; }
25
- }
26
- }
27
-
28
3
  // Outer row mixin for container rows
29
4
 
30
5
  @mixin outerRow() { width: $rowWidth; max-width: 100%; min-width: $screenSmall; margin: 0 auto; @include clearfix(); }
@@ -0,0 +1,16 @@
1
+ @charset "UTF-8";
2
+
3
+ // Foundation Features
4
+ // =============
5
+
6
+ @import "compass/css3";
7
+
8
+ @import "foundation/function/all";
9
+
10
+ @import "foundation/mixins/all";
11
+
12
+ @import "foundation/settings";
13
+
14
+ @import "foundation/common/base";
15
+
16
+ @import "foundation/components/grid", "foundation/components/modules/all";
@@ -14,16 +14,6 @@
14
14
  <title>Welcome to Foundation</title>
15
15
 
16
16
  <!-- Included CSS Files -->
17
- <link rel="stylesheet" href="stylesheets/foundation-style/globals.css">
18
- <link rel="stylesheet" href="stylesheets/foundation-style/typography.css">
19
- <link rel="stylesheet" href="stylesheets/foundation-style/grid.css">
20
- <link rel="stylesheet" href="stylesheets/foundation-style/ui.css">
21
- <link rel="stylesheet" href="stylesheets/foundation-style/buttons.css">
22
- <link rel="stylesheet" href="stylesheets/foundation-style/tabs.css">
23
- <link rel="stylesheet" href="stylesheets/foundation-style/navbar.css">
24
- <link rel="stylesheet" href="stylesheets/foundation-style/forms.css">
25
- <link rel="stylesheet" href="stylesheets/foundation-style/orbit.css">
26
- <link rel="stylesheet" href="stylesheets/foundation-style/reveal.css">
27
17
  <link rel="stylesheet" href="stylesheets/app.css">
28
18
 
29
19
  <script src="javascripts/foundation/modernizr.foundation.js"></script>
@@ -1,18 +1,8 @@
1
1
  description 'Foundation Compass Gem'
2
2
 
3
3
  # Sass Files
4
- stylesheet 'sass/_settings.scss', :to => '_settings.scss'
5
- stylesheet 'sass/foundation/globals.scss', :to => 'foundation-style/globals.scss', :media => "screen, projector, print"
6
- stylesheet 'sass/foundation/typography.scss', :to => 'foundation-style/typography.scss', :media => "screen, projector, print"
7
- stylesheet 'sass/foundation/grid.scss', :to => 'foundation-style/grid.scss', :media => "screen, projector, print"
8
- stylesheet 'sass/foundation/ui.scss', :to => 'foundation-style/ui.scss', :media => "screen, projector, print"
9
- stylesheet 'sass/foundation/buttons.scss', :to => 'foundation-style/buttons.scss', :media => "screen, projector, print"
10
- stylesheet 'sass/foundation/tabs.scss', :to => 'foundation-style/tabs.scss', :media => "screen, projector, print"
11
- stylesheet 'sass/foundation/navbar.scss', :to => 'foundation-style/navbar.scss', :media => "screen, projector, print"
12
- stylesheet 'sass/foundation/forms.scss', :to => 'foundation-style/forms.scss', :media => "screen, projector, print"
13
- stylesheet 'sass/foundation/orbit.scss', :to => 'foundation-style/orbit.scss', :media => "screen, projector, print"
14
- stylesheet 'sass/foundation/reveal.scss', :to => 'foundation-style/reveal.scss', :media => "screen, projector, print"
15
- stylesheet 'sass/app.scss', :to => 'app.scss', :media => "screen, projector, print"
4
+ stylesheet 'sass/_settings.scss', :to => '_settings.scss'
5
+ stylesheet 'sass/app.scss', :to => 'app.scss', :media => "screen, projector, print"
16
6
 
17
7
  # Relative asset paths
18
8
  js_path = "/../../vendor/assets/javascripts/foundation"
@@ -1,4 +1,4 @@
1
- @import "foundation/modular-scale";
1
+ @import "foundation/function/modular-scale";
2
2
 
3
3
  // Settings file containing Foundation defaults
4
4
 
@@ -22,6 +22,15 @@
22
22
  // $shinyEdge: rgba(#fff, .5);
23
23
  // $darkEdge: rgba(#000, .2);
24
24
 
25
+ // Typography Settings
26
+
27
+ // $headerFontFamily: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
28
+ // $headerFontWeight: bold;
29
+ // $headerFontColor: #222;
30
+ // $bodyFontFamily: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-ser;
31
+ // $bodyFontWeight: normal;
32
+ // $bodyFontColor: #222;
33
+
25
34
  // Button Settings
26
35
 
27
36
  // $buttonRadius: 3px;
@@ -1,27 +1,46 @@
1
- @import "foundation/base";
2
- /* --------------------------------------------------
3
- Table of Contents
4
- -----------------------------------------------------
5
- :: Shared Styles
6
- :: Page Name 1
7
- :: Page Name 2
8
- */
1
+ // You custom settings file to override Foundation defaults
2
+ @import "settings";
9
3
 
4
+ // Comment out this import if you are customizing you imports below
5
+ @import "foundation";
10
6
 
11
- /* -----------------------------------------
12
- Shared Styles
13
- ----------------------------------------- */
7
+ // ----------------------------------------
8
+ // Import specific parts of Foundation by commenting the import "foundation"
9
+ // and uncommenting what you want below. You must uncomment the following if customizing
14
10
 
11
+ // @import "compass/css3";
12
+ // @import "foundation/settings";
13
+ // @import "foundation/function/all";
14
+ // @import "foundation/common/globals";
15
+ // @import "foundation/mixins/clearfix";
15
16
 
17
+ // Control which mixins you have access too
16
18
 
17
- /* -----------------------------------------
18
- Page Name 1
19
- ----------------------------------------- */
19
+ // @import "foundation/mixins/css-triangle";
20
+ // @import "foundation/mixins/font-size";
20
21
 
22
+ // Must include next three for semantic grid to work
21
23
 
24
+ // @import "foundation/mixins/respond-to";
22
25
 
26
+ // @import "foundation/mixins/semantic-grid";
23
27
 
24
- /* -----------------------------------------
25
- Page Name 2
26
- ----------------------------------------- */
28
+ // Must include the grid for any responsiveness
29
+
30
+ // @import "foundation/components/grid";
31
+
32
+ // Control which common styles get compiled
33
+
34
+ // @import "foundation/common/typography";
35
+ // @import "foundation/common/forms";
36
+
37
+ // Control which components you get if customizing
38
+
39
+ // @import "foundation/components/modules/buttons";
40
+ // @import "foundation/components/modules/tabs";
41
+ // @import "foundation/components/modules/ui";
42
+ // @import "foundation/components/modules/navbar";
43
+ // @import "foundation/components/modules/orbit";
44
+ // @import "foundation/components/modules/reveal";
45
+ // @import "foundation/components/modules/offcanvas";
27
46
 
data/type.html CHANGED
@@ -13,22 +13,7 @@
13
13
 
14
14
  <title>Welcome to Foundation Typography with Vertical Rhythm</title>
15
15
 
16
- <!-- Included CSS Files -->
17
- <!-- Combine and Compress These CSS Files -->
18
- <link rel="stylesheet" href="css/normalize.css">
19
- <link rel="stylesheet" href="css/globals.css">
20
- <link rel="stylesheet" href="css/typography.css">
21
- <link rel="stylesheet" href="css/grid.css">
22
- <link rel="stylesheet" href="css/ui.css">
23
- <link rel="stylesheet" href="css/buttons.css">
24
- <link rel="stylesheet" href="css/tabs.css">
25
- <link rel="stylesheet" href="css/navbar.css">
26
- <link rel="stylesheet" href="css/forms.css">
27
- <link rel="stylesheet" href="css/orbit.css">
28
- <link rel="stylesheet" href="css/reveal.css">
29
- <link rel="stylesheet" href="css/mobile.css">
30
- <!-- End Combine and Compress These CSS Files -->
31
- <link rel="stylesheet" href="css/app.css">
16
+ <link rel="stylesheet" href="marketing/stylesheets/index.css">
32
17
 
33
18
  <script src="js/modernizr.foundation.js"></script>
34
19
 
@@ -1,4 +1,4 @@
1
- (function($){
1
+ (function ($) {
2
2
 
3
3
  $(function(){
4
4
  $(document).foundationAlerts();
@@ -1,11 +1,11 @@
1
- (function( $ ){
1
+ (function ($){
2
2
 
3
- $.fn.foundationAccordion = function(options) {
3
+ $.fn.foundationAccordion = function (options) {
4
4
 
5
- $('.accordion li', this).on('click.fndtn', function() {
5
+ $('.accordion li', this).on('click.fndtn', function () {
6
6
  var flyout = $(this).children('.content').first();
7
7
  $('.accordion .content').not(flyout).hide().parent('li').removeClass('active');
8
- flyout.show(0, function() {
8
+ flyout.show(0, function () {
9
9
  flyout.parent('li').addClass('active');
10
10
  });
11
11
  });
@@ -1,13 +1,13 @@
1
- (function( $ ){
1
+ (function ($) {
2
2
 
3
- $.fn.foundationAlerts = function(options) {
3
+ $.fn.foundationAlerts = function (options) {
4
4
  var settings = $.extend({
5
5
  callback: $.noop
6
6
  }, options);
7
7
 
8
- $(".alert-box", this).delegate("a.close", "click", function(event) {
8
+ $(".alert-box", this).delegate("a.close", "click", function (event) {
9
9
  event.preventDefault();
10
- $(this).closest(".alert-box").fadeOut(function(event){
10
+ $(this).closest(".alert-box").fadeOut(function (event) {
11
11
  $(this).remove();
12
12
  // Do something else after the alert closes
13
13
  settings.callback();
@@ -16,4 +16,4 @@
16
16
 
17
17
  };
18
18
 
19
- })( jQuery );
19
+ })(jQuery);
@@ -1,4 +1,4 @@
1
- (function( $ ){
1
+ (function ($) {
2
2
 
3
3
  $.fn.foundationButtons = function(options) {
4
4
  // Prevent event propagation on disabled buttons
@@ -21,9 +21,6 @@
21
21
  * @function hiddenFix
22
22
  */
23
23
  var hiddenFix = function() {
24
- // We'll use this to temporarily store style properties.
25
- var tmp = [],
26
- hidden = null; // We'll use this to set hidden parent elements.
27
24
 
28
25
  return {
29
26
  /**
@@ -32,6 +29,13 @@
32
29
  * @method adjust
33
30
  * @param {jQuery Object} $child
34
31
  */
32
+
33
+ // We'll use this to temporarily store style properties.
34
+ tmp : [],
35
+
36
+ // We'll use this to set hidden parent elements.
37
+ hidden : null,
38
+
35
39
  adjust : function( $child ) {
36
40
  // Internal reference.
37
41
  var _self = this;
@@ -1,16 +1,16 @@
1
- (function( $ ){
1
+ (function ($){
2
2
 
3
- $.fn.foundationNavigation = function(options) {
3
+ $.fn.foundationNavigation = function (options) {
4
4
 
5
5
  var lockNavBar = false;
6
6
  // Windows Phone, sadly, does not register touch events :(
7
7
  if (Modernizr.touch || navigator.userAgent.match(/Windows Phone/i)) {
8
- $('.nav-bar a.flyout-toggle', this).on('click.fndtn touchstart.fndtn', function(e) {
8
+ $('.nav-bar a.flyout-toggle', this).on('click.fndtn touchstart.fndtn', function (e) {
9
9
  e.preventDefault();
10
10
  var flyout = $(this).siblings('.flyout').first();
11
11
  if (lockNavBar === false) {
12
12
  $('.nav-bar .flyout').not(flyout).slideUp(500);
13
- flyout.slideToggle(500, function(){
13
+ flyout.slideToggle(500, function () {
14
14
  lockNavBar = false;
15
15
  });
16
16
  }
@@ -18,9 +18,9 @@
18
18
  });
19
19
  $('.nav-bar>li.has-flyout', this).addClass('is-touch');
20
20
  } else {
21
- $('.nav-bar>li.has-flyout', this).hover(function() {
21
+ $('.nav-bar>li.has-flyout', this).hover(function () {
22
22
  $(this).children('.flyout').show();
23
- }, function() {
23
+ }, function () {
24
24
  $(this).children('.flyout').hide();
25
25
  });
26
26
  }
@@ -7,7 +7,7 @@
7
7
  */
8
8
 
9
9
 
10
- (function($) {
10
+ (function ($) {
11
11
  'use strict';
12
12
  $.fn.findFirstImage = function () {
13
13
  return this.first()
@@ -7,7 +7,7 @@
7
7
  */
8
8
  /*globals jQuery */
9
9
 
10
- ( function ( $ ) {
10
+ (function ($) {
11
11
  'use strict';
12
12
  //
13
13
  // Global variable.
@@ -1,12 +1,12 @@
1
- (function( $ ){
1
+ (function ($) {
2
2
 
3
- $.fn.foundationTabs = function(options) {
3
+ $.fn.foundationTabs = function (options) {
4
4
 
5
5
  var settings = $.extend({
6
6
  callback: $.noop
7
7
  }, options);
8
8
 
9
- var activateTab = function($tab) {
9
+ var activateTab = function ($tab) {
10
10
  var $activeTab = $tab.closest('dl').find('dd.active'),
11
11
  contentLocation = $tab.children('a').attr("href") + 'Tab';
12
12
 
@@ -22,7 +22,7 @@
22
22
  $(contentLocation).css('display', 'block').addClass('active');
23
23
  };
24
24
 
25
- $('dl.tabs dd a', this).on('click.fndtn', function(event){
25
+ $('dl.tabs dd a', this).on('click.fndtn', function (event){
26
26
  activateTab($(this).parent('dd'));
27
27
  });
28
28
 
@@ -33,4 +33,4 @@
33
33
 
34
34
  };
35
35
 
36
- })( jQuery );
36
+ })(jQuery);
@@ -8,7 +8,7 @@
8
8
 
9
9
  /*jslint unparam: true, browser: true, indent: 2 */
10
10
 
11
- (function ($) {
11
+ ;(function ($) {
12
12
  'use strict';
13
13
  var settings = {
14
14
  bodyHeight : 0,
@@ -174,7 +174,7 @@
174
174
  $.fn.tooltips = function (method) {
175
175
  if (methods[method]) {
176
176
  return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
177
- } else if (typeof method === 'object' || ! method) {
177
+ } else if (typeof method === 'object' || !method) {
178
178
  return methods.init.apply(this, arguments);
179
179
  } else {
180
180
  $.error('Method ' + method + ' does not exist on jQuery.tooltips');
@@ -1,4 +1,4 @@
1
- $(function() {
1
+ (function ($) {
2
2
  // Set the negative margin on the top menu for slide-menu pages
3
3
  var $selector1 = $('#topMenu'),
4
4
  events = 'click.fndtn';
@@ -7,7 +7,7 @@ $(function() {
7
7
  // Watch for clicks to show the sidebar
8
8
  var $selector2 = $('#sidebarButton');
9
9
  if ($selector2.length > 0) {
10
- $('#sidebarButton').on(events, function(e) {
10
+ $('#sidebarButton').on(events, function (e) {
11
11
  e.preventDefault();
12
12
  $('body').toggleClass('active');
13
13
  });
@@ -16,7 +16,7 @@ $(function() {
16
16
  // Watch for clicks to show the menu for slide-menu pages
17
17
  var $selector3 = $('#menuButton');
18
18
  if ($selector3.length > 0) {
19
- $('#menuButton').on(events, function(e) {
19
+ $('#menuButton').on(events, function (e) {
20
20
  e.preventDefault();
21
21
  $('body').toggleClass('active-menu');
22
22
  });
@@ -32,7 +32,7 @@ $(function() {
32
32
  // Switch panels for the paneled nav on mobile
33
33
  var $selector5 = $('#switchPanels');
34
34
  if ($selector5.length > 0) {
35
- $('#switchPanels dd').on(events, function(e) {
35
+ $('#switchPanels dd').on(events, function (e) {
36
36
  e.preventDefault();
37
37
  var switchToPanel = $(this).children('a').attr('href'),
38
38
  switchToIndex = $(switchToPanel).index();
@@ -41,7 +41,7 @@ $(function() {
41
41
  });
42
42
  }
43
43
 
44
- $('#nav li a').on(events, function(e) {
44
+ $('#nav li a').on(events, function (e) {
45
45
  e.preventDefault();
46
46
  var href = $(this).attr('href'),
47
47
  $target = $(href);
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zurb-foundation
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.6
5
- prerelease:
4
+ version: 3.0.7.rc10
5
+ prerelease: 6
6
6
  platform: ruby
7
7
  authors:
8
8
  - ZURB
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-07-23 00:00:00.000000000 Z
12
+ date: 2012-07-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: compass
@@ -110,29 +110,40 @@ files:
110
110
  - foundation.gemspec
111
111
  - index.html
112
112
  - lib/foundation/engine.rb
113
+ - lib/foundation/generators/USAGE
114
+ - lib/foundation/generators/install_generator.rb
115
+ - lib/foundation/generators/layout_generator.rb
116
+ - lib/foundation/generators/templates/application.html.erb
117
+ - lib/foundation/generators/templates/application.html.haml
113
118
  - lib/foundation/version.rb
114
119
  - lib/zurb-foundation.rb
115
120
  - public/assets/foundation.js
116
121
  - public/assets/jquery.js
117
- - stylesheets/_foundation.scss
118
- - stylesheets/foundation/_base.scss
119
- - stylesheets/foundation/_functions.scss
120
- - stylesheets/foundation/_mixins.scss
121
- - stylesheets/foundation/_modular-scale.sass
122
- - stylesheets/foundation/_semantic-grid.scss
122
+ - stylesheets/foundation.scss
123
123
  - stylesheets/foundation/_settings.scss
124
- - stylesheets/foundation/app.scss
125
- - stylesheets/foundation/buttons.scss
126
- - stylesheets/foundation/forms.scss
127
- - stylesheets/foundation/globals.scss
128
- - stylesheets/foundation/grid.scss
129
- - stylesheets/foundation/navbar.scss
130
- - stylesheets/foundation/offcanvas.scss
131
- - stylesheets/foundation/orbit.scss
132
- - stylesheets/foundation/reveal.scss
133
- - stylesheets/foundation/tabs.scss
134
- - stylesheets/foundation/typography.scss
135
- - stylesheets/foundation/ui.scss
124
+ - stylesheets/foundation/common/_base.scss
125
+ - stylesheets/foundation/common/_forms.scss
126
+ - stylesheets/foundation/common/_globals.scss
127
+ - stylesheets/foundation/common/_typography.scss
128
+ - stylesheets/foundation/components/_grid.scss
129
+ - stylesheets/foundation/components/modules/_all.scss
130
+ - stylesheets/foundation/components/modules/_buttons.scss
131
+ - stylesheets/foundation/components/modules/_navbar.scss
132
+ - stylesheets/foundation/components/modules/_offcanvas.scss
133
+ - stylesheets/foundation/components/modules/_orbit.scss
134
+ - stylesheets/foundation/components/modules/_reveal.scss
135
+ - stylesheets/foundation/components/modules/_tabs.scss
136
+ - stylesheets/foundation/components/modules/_ui.scss
137
+ - stylesheets/foundation/function/_all.scss
138
+ - stylesheets/foundation/function/_convert-number-to-word.scss
139
+ - stylesheets/foundation/function/_grid-calc.scss
140
+ - stylesheets/foundation/function/_modular-scale.sass
141
+ - stylesheets/foundation/mixins/_all.scss
142
+ - stylesheets/foundation/mixins/_clearfix.scss
143
+ - stylesheets/foundation/mixins/_css-triangle.scss
144
+ - stylesheets/foundation/mixins/_font-size.scss
145
+ - stylesheets/foundation/mixins/_respond-to.scss
146
+ - stylesheets/foundation/mixins/_semantic-grid.scss
136
147
  - templates/project/.gitignore
137
148
  - templates/project/MIT-LICENSE.txt
138
149
  - templates/project/humans.txt
@@ -141,16 +152,6 @@ files:
141
152
  - templates/project/robots.txt
142
153
  - templates/project/sass/_settings.scss
143
154
  - templates/project/sass/app.scss
144
- - templates/project/sass/foundation/buttons.scss
145
- - templates/project/sass/foundation/forms.scss
146
- - templates/project/sass/foundation/globals.scss
147
- - templates/project/sass/foundation/grid.scss
148
- - templates/project/sass/foundation/navbar.scss
149
- - templates/project/sass/foundation/orbit.scss
150
- - templates/project/sass/foundation/reveal.scss
151
- - templates/project/sass/foundation/tabs.scss
152
- - templates/project/sass/foundation/typography.scss
153
- - templates/project/sass/foundation/ui.scss
154
155
  - test.html
155
156
  - test2.html
156
157
  - type.html
@@ -193,16 +194,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
193
194
  version: '0'
194
195
  segments:
195
196
  - 0
196
- hash: 2092228326367884049
197
+ hash: 775601719286300877
197
198
  required_rubygems_version: !ruby/object:Gem::Requirement
198
199
  none: false
199
200
  requirements:
200
- - - ! '>='
201
+ - - ! '>'
201
202
  - !ruby/object:Gem::Version
202
- version: '0'
203
- segments:
204
- - 0
205
- hash: 2092228326367884049
203
+ version: 1.3.1
206
204
  requirements: []
207
205
  rubyforge_project:
208
206
  rubygems_version: 1.8.23
@@ -1,13 +0,0 @@
1
- @import "foundation/base";
2
- @import "foundation/globals";
3
- @import "foundation/typography";
4
- @import "foundation/grid";
5
- @import "foundation/ui";
6
- @import "foundation/buttons";
7
- @import "foundation/tabs";
8
- @import "foundation/navbar";
9
- @import "foundation/forms";
10
- @import "foundation/orbit";
11
- @import "foundation/reveal";
12
- @import "foundation/app";
13
-
@@ -1,6 +0,0 @@
1
- @import "compass/css3";
2
- @import "foundation/functions";
3
- @import "foundation/modular-scale";
4
- @import "foundation/settings";
5
- @import "foundation/semantic-grid";
6
- @import "foundation/mixins";
@@ -1,26 +0,0 @@
1
- /* --------------------------------------------------
2
- Table of Contents
3
- -----------------------------------------------------
4
- :: Shared Styles
5
- :: Page Name 1
6
- :: Page Name 2
7
- */
8
-
9
-
10
- /* -----------------------------------------
11
- Shared Styles
12
- ----------------------------------------- */
13
-
14
-
15
-
16
- /* -----------------------------------------
17
- Page Name 1
18
- ----------------------------------------- */
19
-
20
-
21
-
22
-
23
- /* -----------------------------------------
24
- Page Name 2
25
- ----------------------------------------- */
26
-
@@ -1,5 +0,0 @@
1
- @import "../settings";
2
- @import "foundation/base";
3
- @import "foundation/buttons";
4
-
5
-
@@ -1,3 +0,0 @@
1
- @import "../settings";
2
- @import "foundation/base";
3
- @import "foundation/forms";
@@ -1,3 +0,0 @@
1
- @import "../settings";
2
- @import "foundation/base";
3
- @import "foundation/globals";
@@ -1,3 +0,0 @@
1
- @import "../settings";
2
- @import "foundation/base";
3
- @import "foundation/grid";
@@ -1,3 +0,0 @@
1
- @import "../settings";
2
- @import "foundation/base";
3
- @import "foundation/navbar";
@@ -1,3 +0,0 @@
1
- @import "../settings";
2
- @import "foundation/base";
3
- @import "foundation/orbit";
@@ -1,3 +0,0 @@
1
- @import "../settings";
2
- @import "foundation/base";
3
- @import "foundation/reveal";
@@ -1,3 +0,0 @@
1
- @import "../settings";
2
- @import "foundation/base";
3
- @import "foundation/tabs";
@@ -1,3 +0,0 @@
1
- @import "../settings";
2
- @import "foundation/base";
3
- @import "foundation/typography";
@@ -1,3 +0,0 @@
1
- @import "../settings";
2
- @import "foundation/base";
3
- @import "foundation/ui";