zurb-foundation 2.1.2 → 2.1.3

Sign up to get free protection for your applications and to get access to all the features.
@@ -12,7 +12,9 @@ Foundation is MIT-licensed and absolutely free to use. Foundation wouldn't be po
12
12
 
13
13
  Inside your Gemfile add the following line:
14
14
 
15
- `gem "zurb-foundation", :group => :assets`
15
+ ```ruby
16
+ gem "zurb-foundation", :group => :assets
17
+ ```
16
18
 
17
19
  Then run `bundle install` to install the gem.
18
20
 
@@ -20,11 +22,13 @@ Then run `bundle install` to install the gem.
20
22
 
21
23
  If you want to include Foundation on all of your application pages (and why wouldn't you!) then run the following to append `foundation` to your application sprockets files:
22
24
 
23
- `rails g foundation:install`
25
+ ```bash
26
+ rails g foundation:install
27
+ ```
24
28
 
25
29
  You can also manually include `foundation` on specific pages using:
26
30
 
27
- ```
31
+ ```ruby
28
32
  stylesheet_link_tag "foundation"
29
33
  javascript_include_tag "foundation"
30
34
  ```
@@ -32,20 +36,72 @@ javascript_include_tag "foundation"
32
36
  Or add `require "foundation"` to your sprockets files like so:
33
37
 
34
38
  **in application.css**
35
- `/*= require "foundation" */`
39
+
40
+ ```css
41
+ /*= require "foundation" */
42
+ ```
36
43
 
37
44
  **in application.js**
38
- `//= require "foundation"`
45
+
46
+ ```javascript
47
+ //= require "foundation"
48
+ ```
49
+
50
+ ### Advanced
51
+
52
+ If you wish to be more selective about which Foundation files you'd like to use in your project that's possible too! So instead of using `require "foundation"` you can selectively add stylesheets and javascripts to your project like so:
53
+
54
+ **in application.css**
55
+
56
+ ```css
57
+ /*
58
+ *= require "foundation/globals"
59
+ *= require "foundation/typography"
60
+ */
61
+ ```
62
+
63
+ **in application.js**
64
+
65
+ ```javascript
66
+ //= require "foundation/forms.jquery"
67
+ //= require "foundation/jquery.customforms"
68
+ //= require "foundation/app"
69
+ ```
70
+ This gem contains the same files as the corresponding Foundation release, which currently is:
71
+
72
+ **Stylesheets**
73
+
74
+ * globals
75
+ * typography
76
+ * grid
77
+ * ui
78
+ * forms
79
+ * orbit
80
+ * reveal
81
+ * mobile
82
+
83
+ **JavaScripts**
84
+
85
+ * jquery.reveal
86
+ * jquery.orbit-1.3.0
87
+ * forms.jquery
88
+ * jquery.customforms
89
+ * jquery.placeholder.min
90
+ * app
39
91
 
40
92
  ### Set the viewport
41
93
 
42
94
  Finally you'll also want to add the following line to the `<head>` section in your layout file (i.e. `app/views/layouts/application.html.erb`) so the design will scale for mobile devices:
43
95
 
44
- `<meta name="viewport" content="width=device-width, initial-scale=1.0" />`
96
+ ```html
97
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
98
+ ```
45
99
 
46
100
  You can also use the included generator to accomplish the same thing:
47
101
 
48
- `rails g foundation:layout`
102
+ ```bash
103
+ rails g foundation:layout
104
+ ```
49
105
 
50
106
  # Using foundation in production
51
107
 
@@ -55,15 +111,21 @@ Before pushing your application to production, you'll need to determine how you
55
111
 
56
112
  In your Rails application edit `config/application.rb` and change:
57
113
 
58
- `Bundler.require(*Rails.groups(:assets => %w(development test)))`
114
+ ```ruby
115
+ Bundler.require(*Rails.groups(:assets => %w(development test)))
116
+ ```
59
117
 
60
118
  to:
61
119
 
62
- `Bundler.require(:default, :assets, Rails.env)`
120
+ ```ruby
121
+ Bundler.require(:default, :assets, Rails.env)
122
+ ```
63
123
 
64
124
  Then in `config/environments/production.rb` make sure the following setting exists:
65
125
 
66
- `config.assets.compile = true`
126
+ ```ruby
127
+ config.assets.compile = true
128
+ ```
67
129
 
68
130
  Now all your assets will be compiled the first time someone visits your site, which can cause some delay. Kind of like the first time Passenger spins up your application after it has been idle for some time.
69
131
 
@@ -71,7 +133,9 @@ Now all your assets will be compiled the first time someone visits your site, wh
71
133
 
72
134
  In your Rails application edit `Capfile` and add the following line after `load 'deploy'`:
73
135
 
74
- `load 'deploy/assets'`
136
+ ```ruby
137
+ load 'deploy/assets'
138
+ ```
75
139
 
76
140
  Now when you run `cap deploy` the `deploy:assets:precompile` task will be run which takes care of running `bundle exec rake assets:precompile` for you.
77
141
 
@@ -1,4 +1,4 @@
1
1
  module Foundation
2
- COMMIT = "e24518ce9b5ae1904cae0755650c3233af5a4f2e"
3
- VERSION = "2.1.2"
2
+ COMMIT = "4a2e5db0b583b376d2ee256b361ff755beab62bb"
3
+ VERSION = "2.1.3"
4
4
  end
@@ -37,6 +37,7 @@ $(document).ready(function () {
37
37
  $('input, textarea').placeholder();
38
38
 
39
39
  /* DROPDOWN NAV ------------- */
40
+ /*
40
41
  $('.nav-bar li a, .nav-bar li a:after').each(function() {
41
42
  $(this).data('clicks', 0);
42
43
  });
@@ -68,6 +69,7 @@ $(document).ready(function () {
68
69
  $('.nav-bar li .flyout').hide();
69
70
  }
70
71
  });
72
+ */
71
73
 
72
74
  /* DISABLED BUTTONS ------------- */
73
75
  /* Gives elements with a class of 'disabled' a return: false; */
@@ -93,7 +93,6 @@
93
93
  ul.square { list-style: square outside; }
94
94
  ul.circle { list-style: circle outside; }
95
95
  ul.disc { list-style: disc outside; }
96
- ul ul, ol ol { margin: 4px 0 5px 30px; }
97
96
  li { margin-bottom: 12px; }
98
97
  ul.large li { line-height: 21px; }
99
98
 
@@ -101,12 +100,13 @@
101
100
  /* --------------------------------------------------
102
101
  :: Tables
103
102
  -------------------------------------------------- */
104
- table { background: #fff; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; display: block; margin: 0 0 18px; border: 1px solid #ddd; }
103
+ table { background: #fff; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; margin: 0 0 18px; border: 1px solid #ddd; }
105
104
 
106
105
  table thead, table tfoot { background: #f5f5f5; }
107
106
  table thead tr th,
108
- table tfoot tr th
107
+ table tfoot tr th,
109
108
  table tbody tr td,
109
+ table tr td,
110
110
  table tfoot tr td { font-size: 12px; line-height: 18px; text-align: left; }
111
111
  table thead tr th,
112
112
  table tfoot tr td { padding: 8px 10px 9px; font-size: 14px; font-weight: bold; color: #222; }
@@ -166,14 +166,15 @@
166
166
 
167
167
  @media only screen and (max-width: 767px) {
168
168
  .nav-bar { height: auto; }
169
- .nav-bar li { float: none; display: block; }
170
- .nav-bar li a { text-align: left; border-top: 1px solid #ddd; border-right: none; }
171
- .nav-bar li:first-child a { border-top: none; }
172
- .nav-bar li.has-flyout a:after { content: ""; width: 0; height: 0; border-left: 4px solid transparent;border-right: 4px solid transparent; border-top: 4px solid #2a85e8; display: block; }
173
- .nav-bar li:hover a { font-weight: bold; }
174
- .nav-bar li:hover ul { position: relative; }
169
+ .nav-bar>li { float: none; display: block; border-right: none; }
170
+ .nav-bar>li>a { text-align: left; border-top: 1px solid #ddd; border-right: none; }
171
+ .nav-bar>li:first-child>a { border-top: none; }
172
+ .nav-bar>li.has-flyout>a:after { content: ""; width: 0; height: 0; border-left: 4px solid transparent;border-right: 4px solid transparent; border-top: 4px solid #2a85e8; display: block; }
173
+ .nav-bar>li:hover>a { font-weight: bold; }
174
+ .nav-bar>li:hover ul { position: relative; }
175
175
 
176
176
  .flyout { position: relative; width: auto; top: auto; margin-right: -2px; border-width: 1px 1px 0px 1px; }
177
+ .flyout.right { float: none; right: auto; left: -1px; }
177
178
  .flyout.small, .flyout.large { width: auto; }
178
179
  .flyout p:last-child { margin-bottom: 18px; }
179
180
  }
@@ -197,20 +197,23 @@
197
197
  -------------------------------------------------- */
198
198
 
199
199
  .nav-bar { height: 45px; background: #fff; margin-top: 20px; border: 1px solid #ddd; }
200
- .nav-bar li { float: left; display: block; position: relative; padding: 0; margin: 0; border: none; }
201
- .nav-bar li a { position: relative; font-size: 14px; padding: 14px 20px 13px 20px; display: block; text-decoration: none; font-size: 15px; font-size: 1.5rem; border-right: 1px solid #ddd; }
202
- .nav-bar li.has-flyout a { padding-right: 36px; }
203
- .nav-bar li.has-flyout a:after { content: ""; width: 0; height: 0; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 4px solid #2a85e8; display: block; position: absolute; right: 18px; bottom: 20px; }
204
- .nav-bar li:hover a { color: #141414; z-index: 2; }
205
- .nav-bar li:hover a:after { border-top-color: #141414; }
200
+ .nav-bar>li { float: left; display: block; position: relative; padding: 0; margin: 0; border-right: 1px solid #ddd; line-height: 45px; }
201
+ .nav-bar>li>a { position: relative; font-size: 14px; padding: 0 20px; display: block; text-decoration: none; font-size: 15px; font-size: 1.5rem; }
202
+ .nav-bar>li>input { margin: 0 16px; }
203
+ .nav-bar>li ul { margin-bottom: 0; }
204
+ .nav-bar>li li { line-height: 1.3; }
205
+ .nav-bar>li.has-flyout>a { padding-right: 36px; }
206
+ .nav-bar>li.has-flyout>a:after { content: ""; width: 0; height: 0; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 4px solid #2a85e8; display: block; position: absolute; right: 18px; bottom: 20px; }
207
+ .nav-bar>li:hover>a { color: #141414; z-index: 2; }
208
+ .nav-bar>li:hover>a:after { border-top-color: #141414; }
206
209
 
207
210
  .flyout { background: #fff; margin: 0; padding: 20px; border: 1px solid #ddd; position: absolute; top: 45px; left: -1px; width: 400px; z-index: 10; }
208
211
  .flyout.small { width: 200px; }
209
212
  .flyout.large { width: 600px; }
210
213
  .flyout.right { left: auto; right: 0; }
211
214
  .flyout p:last-child { margin-bottom: 0; }
212
- .nav-bar li .flyout { display: none; }
213
- .nav-bar li:hover .flyout { display: block; }
215
+ .nav-bar>li .flyout { display: none; }
216
+ .nav-bar>li:hover .flyout { display: block; }
214
217
 
215
218
 
216
219
 
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: 2.1.2
4
+ version: 2.1.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,12 +9,12 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-12-07 00:00:00.000000000 -08:00
12
+ date: 2011-12-10 00:00:00.000000000 -08:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &2156352100 !ruby/object:Gem::Requirement
17
+ requirement: &2158771740 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: 3.1.0
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *2156352100
25
+ version_requirements: *2158771740
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: jquery-rails
28
- requirement: &2156351060 !ruby/object:Gem::Requirement
28
+ requirement: &2158764100 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
@@ -33,7 +33,7 @@ dependencies:
33
33
  version: '1.0'
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *2156351060
36
+ version_requirements: *2158764100
37
37
  description: An easy to use, powerful, and flexible framework for building prototypes
38
38
  and production code on any kind of device.
39
39
  email:
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
104
104
  version: '0'
105
105
  segments:
106
106
  - 0
107
- hash: -4157674815071257165
107
+ hash: -3981466462999743391
108
108
  required_rubygems_version: !ruby/object:Gem::Requirement
109
109
  none: false
110
110
  requirements:
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
113
113
  version: '0'
114
114
  segments:
115
115
  - 0
116
- hash: -4157674815071257165
116
+ hash: -3981466462999743391
117
117
  requirements: []
118
118
  rubyforge_project: foundation
119
119
  rubygems_version: 1.6.2