zurb-foundation 4.0.3 → 4.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (92) hide show
  1. data/CHANGELOG.md +11 -0
  2. data/Gemfile.lock +1 -1
  3. data/README.md +5 -0
  4. data/docs/Gemfile +2 -1
  5. data/docs/Gemfile.lock +1 -1
  6. data/docs/_sidebar-components.html.erb +40 -40
  7. data/docs/_sidebar.html.erb +9 -9
  8. data/docs/changelog.html.erb +30 -6
  9. data/docs/components/alert-boxes.html.erb +1 -1
  10. data/docs/components/block-grid.html.erb +10 -10
  11. data/docs/components/breadcrumbs.html.erb +1 -1
  12. data/docs/components/button-groups.html.erb +57 -3
  13. data/docs/components/buttons.html.erb +1 -1
  14. data/docs/components/clearing.html.erb +12 -14
  15. data/docs/components/custom-forms.html.erb +3 -3
  16. data/docs/components/dropdown-buttons.html.erb +1 -1
  17. data/docs/components/dropdown.html.erb +2 -2
  18. data/docs/components/flex-video.html.erb +1 -1
  19. data/docs/components/forms.html.erb +4 -3
  20. data/docs/components/grid.html.erb +2 -2
  21. data/docs/components/inline-lists.html.erb +1 -1
  22. data/docs/components/keystrokes.html.erb +1 -1
  23. data/docs/components/labels.html.erb +1 -1
  24. data/docs/components/orbit.html.erb +11 -11
  25. data/docs/components/pagination.html.erb +1 -1
  26. data/docs/components/panels.html.erb +1 -1
  27. data/docs/components/pricing-tables.html.erb +1 -1
  28. data/docs/components/progress-bars.html.erb +1 -1
  29. data/docs/components/reveal.html.erb +8 -0
  30. data/docs/components/section.html.erb +29 -3
  31. data/docs/components/side-nav.html.erb +1 -1
  32. data/docs/components/split-buttons.html.erb +1 -1
  33. data/docs/components/sub-nav.html.erb +1 -1
  34. data/docs/components/switch.html.erb +1 -1
  35. data/docs/components/thumbnails.html.erb +5 -5
  36. data/docs/components/top-bar.html.erb +65 -2
  37. data/docs/components/type.html.erb +1 -1
  38. data/docs/css/docs.scss +2 -0
  39. data/docs/faq.html.erb +2 -0
  40. data/docs/img/demos/demo1-th.jpg +0 -0
  41. data/docs/img/demos/demo1.jpg +0 -0
  42. data/docs/img/demos/demo2-th.jpg +0 -0
  43. data/docs/img/demos/demo2.jpg +0 -0
  44. data/docs/img/demos/demo3-th.jpg +0 -0
  45. data/docs/img/demos/demo3.jpg +0 -0
  46. data/docs/img/demos/demo4-th.jpg +0 -0
  47. data/docs/img/demos/demo4.jpg +0 -0
  48. data/docs/img/demos/demo5-th.jpg +0 -0
  49. data/docs/img/demos/demo5.jpg +0 -0
  50. data/docs/index.html.erb +1 -1
  51. data/docs/javascript.html.erb +2 -2
  52. data/docs/layout.html.erb +18 -2
  53. data/docs/rails.html.erb +10 -2
  54. data/docs/sass.html.erb +49 -19
  55. data/docs/support.html.erb +1 -1
  56. data/js/foundation/foundation.forms.js +1 -1
  57. data/js/foundation/foundation.js +1 -1
  58. data/js/foundation/foundation.reveal.js +9 -3
  59. data/js/foundation/foundation.topbar.js +7 -5
  60. data/lib/foundation/engine.rb +12 -4
  61. data/lib/foundation/version.rb +1 -1
  62. data/scss/foundation.scss +1 -2
  63. data/scss/foundation/_foundation-global.scss +25 -74
  64. data/scss/foundation/components/_block-grid.scss +2 -2
  65. data/scss/foundation/components/_button-groups.scss +17 -2
  66. data/scss/foundation/components/_buttons.scss +2 -2
  67. data/scss/foundation/components/_custom-forms.scss +10 -7
  68. data/scss/foundation/components/_forms.scss +28 -0
  69. data/scss/foundation/components/_global.scss +62 -0
  70. data/scss/foundation/components/_orbit.scss +1 -1
  71. data/scss/foundation/components/_section.scss +4 -4
  72. data/scss/foundation/components/_switch.scss +17 -9
  73. data/scss/foundation/components/_tooltips.scss +1 -2
  74. data/scss/foundation/components/_top-bar.scss +11 -2
  75. data/scss/foundation/components/_type.scss +3 -2
  76. data/scss/foundation/components/_visibility.scss +2 -2
  77. data/templates/project/config.rb +4 -4
  78. data/templates/project/index.html +9 -9
  79. data/templates/project/manifest.rb +8 -8
  80. data/templates/project/scss/_settings.scss +11 -10
  81. data/templates/project/scss/app.scss +1 -0
  82. metadata +15 -14
  83. data/docs/img/demos/demo1-th.png +0 -0
  84. data/docs/img/demos/demo1.png +0 -0
  85. data/docs/img/demos/demo2-th.png +0 -0
  86. data/docs/img/demos/demo2.png +0 -0
  87. data/docs/img/demos/demo3-th.png +0 -0
  88. data/docs/img/demos/demo3.png +0 -0
  89. data/docs/img/demos/demo4-th.png +0 -0
  90. data/docs/img/demos/demo4.png +0 -0
  91. data/docs/img/demos/demo5-th.png +0 -0
  92. data/docs/img/demos/demo5.png +0 -0
data/scss/foundation/components/_top-bar.scss CHANGED
@@ -27,6 +27,7 @@ $topbar-dropdown-link-color: #fff !default;
27
27
  $topbar-dropdown-toggle-size: 5px !default;
28
28
  $topbar-dropdown-toggle-color: #fff !default;
29
29
  $topbar-dropdown-toggle-alpha: 0.5 !default;
30
+ $dropdown-label-color: #555 !default;
30
31
 
31
32
  // Top menu icon styles
32
33
  $topbar-menu-link-transform: uppercase !default;
@@ -286,13 +287,21 @@ $topbar-media-query: "only screen and (min-width:"#{$topbar-breakpoint}")" !defa
286
287
  font-weight: normal;
287
288
  padding: 8px $topbar-height / 3;
288
289
  }
290
+
291
+ &.title h5 { margin-bottom: 0;
292
+ a {
293
+ color: $topbar-link-color;
294
+ line-height: $topbar-height / 2;
295
+ display: block;
296
+ }
297
+ }
289
298
  }
290
299
 
291
300
  label {
292
301
  padding: 8px $topbar-height / 3 2px;
293
302
  margin-bottom: 0;
294
303
  text-transform: uppercase;
295
- color: #555;
304
+ color: $dropdown-label-color;
296
305
  font-weight: bold;
297
306
  font-size: emCalc(10px);
298
307
  }
@@ -350,7 +359,7 @@ $topbar-media-query: "only screen and (min-width:"#{$topbar-breakpoint}")" !defa
350
359
  padding: 0 $topbar-height / 3;
351
360
  line-height: $topbar-height;
352
361
  background: $topbar-bg;
353
- &:hover { background: darken($topbar-dropdown-bg, 3%); }
362
+ &:hover { background: darken($topbar-dropdown-bg, 30%); }
354
363
  }
355
364
  }
356
365
 
data/scss/foundation/components/_type.scss CHANGED
@@ -111,8 +111,8 @@ $microformat-abbr-font-decoration: none !default;
111
111
  line-height: $subheader-line-height;
112
112
  color: $subheader-font-color;
113
113
  font-weight: $subheader-font-weight;
114
- margin-top: $header-top-margin;
115
- margin-bottom: $header-bottom-margin;
114
+ margin-top: $subheader-top-margin;
115
+ margin-bottom: $subheader-bottom-margin;
116
116
  }
117
117
 
118
118
 
@@ -237,6 +237,7 @@ dl {
237
237
  line-height: $paragraph-line-height;
238
238
  margin-bottom: $paragraph-margin-bottom;
239
239
  list-style-position: $list-style-position;
240
+ font-family: $paragraph-font-family;
240
241
  }
241
242
 
242
243
  /* Unordered Lists */
data/scss/foundation/components/_visibility.scss CHANGED
@@ -70,13 +70,13 @@
70
70
 
71
71
  /* X-Large Displays: 1400px and up */
72
72
  @media #{$large} {
73
- .show-for-medium-down,
74
73
  .show-for-medium-up,
75
- .show-for-large-down,
76
74
  .show-for-large-up { display: inherit !important; }
77
75
 
78
76
  .show-for-small,
79
77
  .show-for-medium,
78
+ .show-for-medium-down,
79
+ .show-for-large-down,
80
80
  .show-for-large { display: none !important; }
81
81
 
82
82
  .hide-for-small,
data/templates/project/config.rb CHANGED
@@ -4,10 +4,10 @@ require 'zurb-foundation'
4
4
 
5
5
  # Set this to the root of your project when deployed:
6
6
  http_path = "/"
7
- css_dir = "css"
8
- sass_dir = "scss"
9
- images_dir = "img"
10
- javascripts_dir = "js"
7
+ css_dir = "stylesheets"
8
+ sass_dir = "sass"
9
+ images_dir = "images"
10
+ javascripts_dir = "javascripts"
11
11
 
12
12
  # You can select your preferred output style here (can be overridden via the command line):
13
13
  # output_style = :expanded or :nested or :compact or :compressed
data/templates/project/index.html CHANGED
@@ -8,14 +8,14 @@
8
8
  <meta name="viewport" content="width=device-width" />
9
9
  <title>Foundation 4</title>
10
10
 
11
- <link rel="stylesheet" href="css/normalize.css" />
11
+ <link rel="stylesheet" href="<%= css_dir %>/normalize.css" />
12
12
  <% if template[:options][:customizer_used] %>
13
- <link rel="stylesheet" href="css/foundation.css" />
13
+ <link rel="stylesheet" href="<%= css_dir %>/foundation.css" />
14
14
  <% else %>
15
- <link rel="stylesheet" href="css/app.css" />
15
+ <link rel="stylesheet" href="<%= css_dir %>/app.css" />
16
16
  <% end %>
17
17
 
18
- <script src="js/vendor/custom.modernizr.js"></script>
18
+ <script src="<%= javascripts_dir %>/vendor/custom.modernizr.js"></script>
19
19
 
20
20
  </head>
21
21
  <body>
@@ -102,20 +102,20 @@
102
102
 
103
103
  <script>
104
104
  document.write('<script src=' +
105
- ('__proto__' in {} ? 'js/vendor/zepto' : 'js/vendor/jquery') +
105
+ ('__proto__' in {} ? '<%= javascripts_dir %>/vendor/zepto' : '<%= javascripts_dir %>/vendor/jquery') +
106
106
  '.js><\/script>')
107
107
  </script>
108
108
  <% if template[:options][:customizer_used] %>
109
- <script src="js/foundation.min.js"></script>
109
+ <script src="<%= javascripts_dir %>/foundation.min.js"></script>
110
110
  <!--
111
111
  <% template[:options][:javascripts].each do |f| %>
112
- <script src="js/foundation/<%= f %>"></script>
112
+ <script src="<%= javascripts_dir %>/foundation/<%= f %>"></script>
113
113
  <% end %>
114
114
  -->
115
115
  <% else %>
116
- <script src="js/foundation/foundation.js"></script>
116
+ <script src="<%= javascripts_dir %>/foundation/foundation.js"></script>
117
117
  <% template[:options][:javascripts].each do |f| %>
118
- <script src="js/<%= f %>"></script>
118
+ <script src="<%= javascripts_dir %>/<%= f %>"></script>
119
119
  <% end %>
120
120
  <% end %>
121
121
  <script>
data/templates/project/manifest.rb CHANGED
@@ -1,9 +1,9 @@
1
1
  description 'Foundation Compass Gem'
2
2
 
3
3
  # Sass Files
4
- file 'scss/_settings.scss', :to => 'scss/_settings.scss'
5
- file 'scss/normalize.scss', :to => 'scss/normalize.scss', :media => "screen, projector, print"
6
- file 'scss/app.scss', :to => 'scss/app.scss', :media => "screen, projector, print"
4
+ stylesheet 'scss/_settings.scss', :to => '_settings.scss'
5
+ stylesheet 'scss/normalize.scss', :to => 'normalize.scss', :media => "screen, projector, print"
6
+ stylesheet 'scss/app.scss', :to => 'app.scss', :media => "screen, projector, print"
7
7
 
8
8
  # Make sure you list all the project template files here in the manifest.
9
9
  file 'humans.txt'
@@ -15,8 +15,8 @@ def copy_js_from(relative_path, prefix_path, excludes=[])
15
15
  js_files = Dir.glob("#{absolute_path}/*.js")
16
16
  js_files.reject! {|f| excludes.include? File.basename(f)}
17
17
  js_files.each do |js|
18
- file "#{relative_path}/#{prefix_path}/#{File.basename(js)}",
19
- :to => "js/#{prefix_path}/#{File.basename(js)}"
18
+ javascript "#{relative_path}/#{prefix_path}/#{File.basename(js)}",
19
+ :to => "#{prefix_path}/#{File.basename(js)}"
20
20
  end
21
21
  return js_files.map {|f| "#{prefix_path}/#{File.basename(f)}"}
22
22
  end
@@ -24,7 +24,7 @@ end
24
24
  javascripts = copy_js_from("../../js", "foundation", ["foundation.js", "index.js"])
25
25
  vendor_javascripts = copy_js_from("../../js", "vendor")
26
26
 
27
- file "../../js/foundation/foundation.js", :to => "js/foundation/foundation.js"
27
+ javascript "../../js/foundation/foundation.js", :to => "foundation/foundation.js"
28
28
 
29
29
  # javascripts.reject! do |f|
30
30
  # [
@@ -49,6 +49,6 @@ w00t! You're using ZURB Foundation, now go forth and rock 'n roll!
49
49
 
50
50
  }
51
51
 
52
- file 'config.rb'
52
+ # file 'config.rb'
53
53
 
54
- no_configuration_file!
54
+ # no_configuration_file!
data/templates/project/scss/_settings.scss CHANGED
@@ -70,13 +70,13 @@
70
70
  //
71
71
 
72
72
  // We use these to control header font styles
73
- // $header-font-family "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
73
+ // $header-font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
74
74
  // $header-font-weight: bold;
75
75
  // $header-font-style: normal;
76
- // $header-font-color #222;
76
+ // $header-font-color: #222;
77
77
  // $header-line-height: 1.4;
78
- // $header-top-margin .2em;
79
- // $header-bottom-margin .5em;
78
+ // $header-top-margin: .2em;
79
+ // $header-bottom-margin: .5em;
80
80
  // $header-text-rendering: optimizeLegibility;
81
81
 
82
82
  // We use these to control header font sizes
@@ -91,8 +91,8 @@
91
91
  // $subheader-line-height: 1.4;
92
92
  // $subheader-font-color: lighten($header-font-color, 30%);
93
93
  // $subheader-font-weight: 300;
94
- // $subheader-top-margin .2em;
95
- // $subheader-bottom-margin .5em;
94
+ // $subheader-top-margin: .2em;
95
+ // $subheader-bottom-margin: .5em;
96
96
 
97
97
  // A general <small> styling
98
98
  // $small-font-size: 60%;
@@ -115,7 +115,7 @@
115
115
 
116
116
  // We use these to style anchors
117
117
  // $anchor-text-decoration: none;
118
- // $anchor-font-color $primary-color;
118
+ // $anchor-font-color: $primary-color;
119
119
  // $anchor-font-color-hover: darken($primary-color, 5%);
120
120
 
121
121
  // We use these to style the <hr> element
@@ -137,7 +137,7 @@
137
137
  // $blockquote-border: 1px solid #ddd;
138
138
  // $blockquote-cite-font-size: emCalc(13px);
139
139
  // $blockquote-cite-font-color: lighten($header-font-color, 20%);
140
- // $blockquote-cite-link-color $blockquote-cite-font-color;
140
+ // $blockquote-cite-link-color: $blockquote-cite-font-color;
141
141
 
142
142
  // Acronym styles
143
143
  // $acronym-underline: 1px dotted #ddd;
@@ -149,7 +149,7 @@
149
149
  // We use these to control the border styles
150
150
  // $microformat-border-width: 1px;
151
151
  // $microformat-border-style: solid;
152
- // $microformat-border-color #ddd;
152
+ // $microformat-border-color: #ddd;
153
153
 
154
154
  // We use these to control full name font styles
155
155
  // $microformat-fullname-font-weight: bold;
@@ -180,7 +180,7 @@
180
180
  // $label-bottom-margin: emCalc(3px);
181
181
  // $input-font-color: rgba(0,0,0,0.75);
182
182
  // $input-font-size: emCalc(14px);
183
- // $input-bg-color #fff;
183
+ // $input-bg-color: #fff;
184
184
  // $input-focus-bg-color: darken(#fff, 2%);
185
185
  // $input-border-color: darken(#fff, 20%);
186
186
  // $input-focus-border-color: darken(#fff, 40%);
@@ -970,6 +970,7 @@
970
970
  // $topbar-dropdown-toggle-size: 5px;
971
971
  // $topbar-dropdown-toggle-color: #fff;
972
972
  // $topbar-dropdown-toggle-alpha: 0.5;
973
+ // $dropdown-label-color: #555;
973
974
 
974
975
  // Top menu icon styles
975
976
  // $topbar-menu-link-transform: uppercase;
data/templates/project/scss/app.scss CHANGED
@@ -8,6 +8,7 @@
8
8
  // and uncommenting what you want below. You must uncomment the following if customizing
9
9
 
10
10
  // @import "foundation/foundation-global";
11
+ // @import "foundation/components/global";
11
12
  // @import "foundation/components/grid";
12
13
  // @import "foundation/components/visibility";
13
14
  // @import "foundation/components/block-grid";
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zurb-foundation
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.3
4
+ version: 4.0.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-03-02 00:00:00.000000000 Z
12
+ date: 2013-03-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sass
@@ -114,16 +114,16 @@ files:
114
114
  - docs/css/qunit-composite.css
115
115
  - docs/css/qunit.css
116
116
  - docs/faq.html.erb
117
- - docs/img/demos/demo1-th.png
118
- - docs/img/demos/demo1.png
119
- - docs/img/demos/demo2-th.png
120
- - docs/img/demos/demo2.png
121
- - docs/img/demos/demo3-th.png
122
- - docs/img/demos/demo3.png
123
- - docs/img/demos/demo4-th.png
124
- - docs/img/demos/demo4.png
125
- - docs/img/demos/demo5-th.png
126
- - docs/img/demos/demo5.png
117
+ - docs/img/demos/demo1-th.jpg
118
+ - docs/img/demos/demo1.jpg
119
+ - docs/img/demos/demo2-th.jpg
120
+ - docs/img/demos/demo2.jpg
121
+ - docs/img/demos/demo3-th.jpg
122
+ - docs/img/demos/demo3.jpg
123
+ - docs/img/demos/demo4-th.jpg
124
+ - docs/img/demos/demo4.jpg
125
+ - docs/img/demos/demo5-th.jpg
126
+ - docs/img/demos/demo5.jpg
127
127
  - docs/index.html.erb
128
128
  - docs/javascript.html.erb
129
129
  - docs/js/docs.js
@@ -179,6 +179,7 @@ files:
179
179
  - scss/foundation/components/_dropdown.scss
180
180
  - scss/foundation/components/_flex-video.scss
181
181
  - scss/foundation/components/_forms.scss
182
+ - scss/foundation/components/_global.scss
182
183
  - scss/foundation/components/_grid.scss
183
184
  - scss/foundation/components/_inline-lists.scss
184
185
  - scss/foundation/components/_joyride.scss
@@ -228,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
228
229
  version: '0'
229
230
  segments:
230
231
  - 0
231
- hash: 450139252530981531
232
+ hash: 2233190354478831862
232
233
  required_rubygems_version: !ruby/object:Gem::Requirement
233
234
  none: false
234
235
  requirements:
@@ -237,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
237
238
  version: '0'
238
239
  segments:
239
240
  - 0
240
- hash: 450139252530981531
241
+ hash: 2233190354478831862
241
242
  requirements: []
242
243
  rubyforge_project:
243
244
  rubygems_version: 1.8.23
data/docs/img/demos/demo1-th.png DELETED
Binary file
data/docs/img/demos/demo1.png DELETED
Binary file
data/docs/img/demos/demo2-th.png DELETED
Binary file
data/docs/img/demos/demo2.png DELETED
Binary file
data/docs/img/demos/demo3-th.png DELETED
Binary file
data/docs/img/demos/demo3.png DELETED
Binary file
data/docs/img/demos/demo4-th.png DELETED
Binary file
data/docs/img/demos/demo4.png DELETED
Binary file
data/docs/img/demos/demo5-th.png DELETED
Binary file
data/docs/img/demos/demo5.png DELETED
Binary file