zurb-foundation 3.0.3 → 3.0.4

Sign up to get free protection for your applications and to get access to all the features.
data/index.html CHANGED
@@ -16,10 +16,6 @@
16
16
  <!-- Included CSS Files -->
17
17
  <link rel="stylesheet" href="marketing/stylesheets/index.css">
18
18
 
19
- <!--[if lt IE 9]>
20
- <link rel="stylesheet" href="marketing/stylesheets/ie.css">
21
- <![endif]-->
22
-
23
19
  <script src="vendor/assets/javascripts/foundation/modernizr.foundation.js"></script>
24
20
 
25
21
  <!-- IE Fix for HTML5 Tags -->
@@ -1,3 +1,3 @@
1
1
  module Foundation
2
- VERSION = "3.0.3"
2
+ VERSION = "3.0.4"
3
3
  end
@@ -3,7 +3,6 @@ require "compass"
3
3
  extension_path = File.expand_path(File.dirname(File.dirname(__FILE__)))
4
4
  config = {:path => extension_path}
5
5
  Compass::Frameworks.register("foundation", config)
6
- require "foundation/sass_script_functions"
7
6
 
8
7
  module Foundation
9
8
  require "foundation/engine" if defined?(Rails)
@@ -9,6 +9,5 @@
9
9
  @import "foundation/forms";
10
10
  @import "foundation/orbit";
11
11
  @import "foundation/reveal";
12
- @import "foundation/ie";
13
12
  @import "foundation/app";
14
13
 
@@ -1,6 +1,6 @@
1
1
  @import "compass";
2
+ @import "foundation/functions";
2
3
  @import "foundation/modular-scale";
3
4
  @import "foundation/settings";
4
5
  @import "foundation/semantic-grid";
5
6
  @import "foundation/mixins";
6
-
@@ -0,0 +1,10 @@
1
+ @function convert-number-to-word($num) {
2
+ $count:1;
3
+ @each $word in one,two,three,four,five,six,seven,eight,nine,ten,eleven,
4
+ twelve,thirteen,fourteen,fifteen,sixteen,seventeen,eighteen,nineteen,
5
+ twenty,twentyone,twentytwo,twentythree,twentyfour{
6
+ @if ($count == $num) { @return $word; }
7
+ $count: $count + 1;
8
+ }
9
+ @return "invalid";
10
+ }
@@ -91,6 +91,8 @@
91
91
  }
92
92
  }
93
93
 
94
+ &.up>ul { border-top: 1px solid darken($white, 20%); border-bottom: none; }
95
+
94
96
  ul.no-hover.show-dropdown { display: block !important; }
95
97
  &:hover {
96
98
  &>ul.no-hover {
@@ -18,7 +18,8 @@
18
18
 
19
19
  label { font-size: ms(0); color: lighten($black, 30%); cursor: pointer; display: block; font-weight: 500; margin-bottom: 3px;
20
20
 
21
- &.right { float: none; text-align: right; padding-top: ($formSpacing / 2); }
21
+ &.right { float: none; text-align: right; }
22
+ &.inline { line-height: (ms(0) + ($formSpacing * 1.5)); margin: 0 0 $formSpacing 0; }
22
23
  }
23
24
 
24
25
  @media only screen and (max-width: $screenSmall - 1) {
@@ -50,13 +51,10 @@
50
51
  legend { font-weight: bold; background: $white; padding: 0 3px; margin: 0 0 0 -3px; }
51
52
  }
52
53
 
53
- /* Inlined Radio & Checkbox */
54
- .form-field input[type=radio], div.form-field input[type=checkbox] { display: inline; width: auto; margin-bottom: 0; }
55
-
56
54
  /* Errors */
57
- .form-field.error input, input.input-text.alert { border-color: $alertColor; background-color: rgba(255,0,0,0.15); }
58
- .form-field.error label, label.alert { color: $alertColor; }
59
- .form-field.error small, small.error { padding: 6px 4px; border: solid 0 #C00000; border-width: 0 1px 1px 1px; margin-top: -10px; background: $alertColor; color: #fff; @include font-size(12); font-weight: bold; @include border-top-left-radius(2px); @include box-sizing(border-box); }
55
+ .error input, input.error { border-color: $alertColor; background-color: rgba($alertColor, 0.1); }
56
+ .error label, label.error { color: $alertColor; }
57
+ .error small, small.error { display: block; padding: 6px 4px; margin-top: -($formSpacing) - 1; margin-bottom: $formSpacing; background: $alertColor; color: #fff; @include font-size(12); font-weight: bold; @include border-bottom-left-radius(2px); @include border-bottom-right-radius(2px); }
60
58
 
61
59
  @media only screen and (max-width: $screenSmall - 1) {
62
60
  @for $i from 1 through $totalColumns {
@@ -56,7 +56,9 @@
56
56
 
57
57
  &.small { width: $navFlyoutBaseWidth / 1.5; }
58
58
  &.large { width: $navFlyoutBaseWidth * 1.75; }
59
+
59
60
  &.right { left: auto; right: -2px; }
61
+ &.up { top: auto; bottom: $navBarHeight - 1; }
60
62
 
61
63
  }
62
64
 
@@ -17,7 +17,8 @@
17
17
  width: 1px;
18
18
  height: 1px;
19
19
  position: relative;
20
- overflow: hidden }
20
+ overflow: hidden;
21
+ margin-bottom: ms(1); }
21
22
 
22
23
  div.orbit.with-bullets {
23
24
  margin-bottom: 40px; }
@@ -2,7 +2,6 @@ description 'Foundation Compass Gem'
2
2
 
3
3
  # Sass Files
4
4
  stylesheet 'sass/app.scss', :to => 'app.scss', :media => "screen, projector, print"
5
- stylesheet 'sass/ie.scss', :to => 'ie.scss', :condition => "IE lt 9"
6
5
  stylesheet 'sass/_settings.scss', :to => '_settings.scss'
7
6
 
8
7
  # Relative asset paths
@@ -14,7 +14,6 @@
14
14
  // @import "foundation/forms";
15
15
  // @import "foundation/orbit";
16
16
  // @import "foundation/reveal";
17
- // @import "foundation/ie";
18
17
  // @import "foundation/app";
19
18
 
20
19
 
data/test.html CHANGED
@@ -16,9 +16,6 @@
16
16
  <!-- Included CSS Files -->
17
17
  <link rel="stylesheet" href="marketing/stylesheets/index.css">
18
18
 
19
- <!--[if lt IE 9]>
20
- <link rel="stylesheet" href="marketing/stylesheets/ie.css">
21
- <![endif]-->
22
19
 
23
20
  <script src="vendor/assets/javascripts/foundation/modernizr.foundation.js"></script>
24
21
 
@@ -109,6 +106,13 @@
109
106
  <div class="row">
110
107
  <div class="eight columns">
111
108
 
109
+ <div id="orbitTest">
110
+ <div><a href="http://www.zurb.com"><img src="marketing/images/orbit-demo/demo1.jpg" /></a></div>
111
+ <div><a href="http://www.zurb.com"><img src="marketing/images/orbit-demo/demo2.jpg" /></a></div>
112
+ <div><a href="http://www.zurb.com"><img src="marketing/images/orbit-demo/demo3.jpg" /></a></div>
113
+ </div>
114
+
115
+
112
116
  <div class="button-bar">
113
117
  <ul class="button-group">
114
118
  <li><a href="#" class="secondary button">Button 1</a></li>
@@ -141,7 +145,7 @@
141
145
  <li><a href="#" class="small button">Button 3</a></li>
142
146
  </ul>
143
147
 
144
- <div href="#" class="large button dropdown">
148
+ <div href="#" class="large button dropdown up">
145
149
  Dropdown Button
146
150
  <ul>
147
151
  <li><a href="#">Dropdown Item</a></li>
@@ -724,17 +728,21 @@
724
728
 
725
729
 
726
730
  <!-- Included JS Files -->
727
- <script src="js/jquery.min.js"></script>
728
- <!-- Combine and Compress These JS Files -->
729
- <script src="js/jquery.reveal.js"></script>
730
- <script src="js/jquery.orbit-1.4.0.js"></script>
731
- <script src="js/jquery.customforms.js"></script>
732
- <script src="js/jquery.placeholder.min.js"></script>
733
- <script src="js/jquery.tooltips.js"></script>
734
- <!-- End Combine and Compress These JS Files -->
735
- <script src="js/app.js"></script>
731
+ <script src="vendor/assets/javascripts/foundation/jquery.min.js"></script>
732
+ <script src="vendor/assets/javascripts/foundation/jquery.reveal.js"></script>
733
+ <script src="vendor/assets/javascripts/foundation/jquery.orbit-1.4.0.js"></script>
734
+ <script src="vendor/assets/javascripts/foundation/jquery.customforms.js"></script>
735
+ <script src="vendor/assets/javascripts/foundation/jquery.placeholder.min.js"></script>
736
+ <script src="vendor/assets/javascripts/foundation/jquery.tooltips.js"></script>
737
+ <script src="vendor/assets/javascripts/foundation/app.js"></script>
736
738
 
737
739
  <script>
740
+ $(window).load(function() {
741
+ $('#orbitTest').orbit({
742
+ fluid: '16x9'
743
+ });
744
+ });
745
+
738
746
  $('#testModal').bind('reveal:open reveal:opened reveal:close reveal:closed', function (event) {
739
747
  console.log(event);
740
748
  });
data/type.html CHANGED
@@ -30,10 +30,6 @@
30
30
  <!-- End Combine and Compress These CSS Files -->
31
31
  <link rel="stylesheet" href="css/app.css">
32
32
 
33
- <!--[if lt IE 9]>
34
- <link rel="stylesheet" href="css/ie.css">
35
- <![endif]-->
36
-
37
33
  <script src="js/modernizr.foundation.js"></script>
38
34
 
39
35
  <!-- IE Fix for HTML5 Tags -->
@@ -79,6 +79,10 @@ jQuery(document).ready(function ($) {
79
79
 
80
80
  /* DISABLED BUTTONS ------------- */
81
81
  /* Gives elements with a class of 'disabled' a return: false; */
82
+ $('.button.disabled').on('click.fndtn', function (event) {
83
+ event.preventDefault();
84
+ });
85
+
82
86
 
83
87
  /* SPLIT BUTTONS/DROPDOWNS */
84
88
  $('.button.dropdown > ul').addClass('no-hover');
@@ -109,6 +113,11 @@ jQuery(document).ready(function ($) {
109
113
  $('.button.dropdown.large > ul').css('top', largeButtonHeight);
110
114
  $('.button.dropdown.small > ul').css('top', smallButtonHeight);
111
115
  $('.button.dropdown.tiny > ul').css('top', tinyButtonHeight);
116
+
117
+ $('.button.dropdown.up:not(.large):not(.small):not(.tiny) > ul').css('top', 'auto').css('bottom', normalButtonHeight - 2);
118
+ $('.button.dropdown.up.large > ul').css('top', 'auto').css('bottom', largeButtonHeight - 2);
119
+ $('.button.dropdown.up.small > ul').css('top', 'auto').css('bottom', smallButtonHeight - 2);
120
+ $('.button.dropdown.up.tiny > ul').css('top', 'auto').css('bottom', tinyButtonHeight - 2);
112
121
 
113
122
  /* CUSTOM FORMS */
114
123
  $.foundation.customForms.appendCustomMarkup();
@@ -1,2 +1,2 @@
1
- /*! http://mths.be/placeholder v1.8.7 by @mathias */
2
- (function(f,h,c){var a='placeholder' in h.createElement('input'),d='placeholder' in h.createElement('textarea'),i=c.fn,j;if(a&&d){j=i.placeholder=function(){return this};j.input=j.textarea=true}else{j=i.placeholder=function(){return this.filter((a?'textarea':':input')+'[placeholder]').not('.placeholder').bind('focus.placeholder',b).bind('blur.placeholder',e).trigger('blur.placeholder').end()};j.input=a;j.textarea=d;c(function(){c(h).delegate('form','submit.placeholder',function(){var k=c('.placeholder',this).each(b);setTimeout(function(){k.each(e)},10)})});c(f).bind('unload.placeholder',function(){c('.placeholder').val('')})}function g(l){var k={},m=/^jQuery\d+$/;c.each(l.attributes,function(o,n){if(n.specified&&!m.test(n.name)){k[n.name]=n.value}});return k}function b(){var k=c(this);if(k.val()===k.attr('placeholder')&&k.hasClass('placeholder')){if(k.data('placeholder-password')){k.hide().next().show().focus().attr('id',k.removeAttr('id').data('placeholder-id'))}else{k.val('').removeClass('placeholder')}}}function e(){var o,n=c(this),k=n,m=this.id;if(n.val()===''){if(n.is(':password')){if(!n.data('placeholder-textinput')){try{o=n.clone().attr({type:'text'})}catch(l){o=c('<input>').attr(c.extend(g(this),{type:'text'}))}o.removeAttr('name').data('placeholder-password',true).data('placeholder-id',m).bind('focus.placeholder',b);n.data('placeholder-textinput',o).data('placeholder-id',m).before(o)}n=n.removeAttr('id').hide().prev().attr('id',m).show()}n.addClass('placeholder').val(n.attr('placeholder'))}else{n.removeClass('placeholder')}}}(this,document,jQuery));
1
+ /*! http://mths.be/placeholder v2.0.7 by @mathias */
2
+ ;(function(f,h,$){var a='placeholder' in h.createElement('input'),d='placeholder' in h.createElement('textarea'),i=$.fn,c=$.valHooks,k,j;if(a&&d){j=i.placeholder=function(){return this};j.input=j.textarea=true}else{j=i.placeholder=function(){var l=this;l.filter((a?'textarea':':input')+'[placeholder]').not('.placeholder').bind({'focus.placeholder':b,'blur.placeholder':e}).data('placeholder-enabled',true).trigger('blur.placeholder');return l};j.input=a;j.textarea=d;k={get:function(m){var l=$(m);return l.data('placeholder-enabled')&&l.hasClass('placeholder')?'':m.value},set:function(m,n){var l=$(m);if(!l.data('placeholder-enabled')){return m.value=n}if(n==''){m.value=n;if(m!=h.activeElement){e.call(m)}}else{if(l.hasClass('placeholder')){b.call(m,true,n)||(m.value=n)}else{m.value=n}}return l}};a||(c.input=k);d||(c.textarea=k);$(function(){$(h).delegate('form','submit.placeholder',function(){var l=$('.placeholder',this).each(b);setTimeout(function(){l.each(e)},10)})});$(f).bind('beforeunload.placeholder',function(){$('.placeholder').each(function(){this.value=''})})}function g(m){var l={},n=/^jQuery\d+$/;$.each(m.attributes,function(p,o){if(o.specified&&!n.test(o.name)){l[o.name]=o.value}});return l}function b(m,n){var l=this,o=$(l);if(l.value==o.attr('placeholder')&&o.hasClass('placeholder')){if(o.data('placeholder-password')){o=o.hide().next().show().attr('id',o.removeAttr('id').data('placeholder-id'));if(m===true){return o[0].value=n}o.focus()}else{l.value='';o.removeClass('placeholder');l==h.activeElement&&l.select()}}}function e(){var q,l=this,p=$(l),m=p,o=this.id;if(l.value==''){if(l.type=='password'){if(!p.data('placeholder-textinput')){try{q=p.clone().attr({type:'text'})}catch(n){q=$('<input>').attr($.extend(g(this),{type:'text'}))}q.removeAttr('name').data({'placeholder-password':true,'placeholder-id':o}).bind('focus.placeholder',b);p.data({'placeholder-textinput':q,'placeholder-id':o}).before(q)}p=p.removeAttr('id').hide().prev().attr('id',o).show()}p.addClass('placeholder');p[0].value=p.attr('placeholder')}else{p.removeClass('placeholder')}}}(this,document,jQuery));
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: 3.0.3
4
+ version: 3.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: 2012-07-05 00:00:00.000000000 Z
12
+ date: 2012-07-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: compass
@@ -93,11 +93,11 @@ files:
93
93
  - foundation.gemspec
94
94
  - index.html
95
95
  - lib/foundation/engine.rb
96
- - lib/foundation/sass_script_functions.rb
97
96
  - lib/foundation/version.rb
98
97
  - lib/zurb-foundation.rb
99
98
  - stylesheets/_foundation.scss
100
99
  - stylesheets/foundation/_base.scss
100
+ - stylesheets/foundation/_functions.scss
101
101
  - stylesheets/foundation/_mixins.scss
102
102
  - stylesheets/foundation/_modular-scale.sass
103
103
  - stylesheets/foundation/_semantic-grid.scss
@@ -107,8 +107,6 @@ files:
107
107
  - stylesheets/foundation/forms.scss
108
108
  - stylesheets/foundation/globals.scss
109
109
  - stylesheets/foundation/grid.scss
110
- - stylesheets/foundation/ie.scss
111
- - stylesheets/foundation/mobile.scss
112
110
  - stylesheets/foundation/navbar.scss
113
111
  - stylesheets/foundation/offcanvas.scss
114
112
  - stylesheets/foundation/orbit.scss
@@ -124,9 +122,7 @@ files:
124
122
  - templates/project/robots.txt
125
123
  - templates/project/sass/_settings.scss
126
124
  - templates/project/sass/app.scss
127
- - templates/project/sass/ie.scss
128
125
  - templates/project/stylesheets/app.css
129
- - templates/project/stylesheets/ie.css
130
126
  - test.html
131
127
  - type.html
132
128
  - vendor/assets/images/foundation/orbit/bullets.jpg
@@ -163,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
163
159
  version: '0'
164
160
  segments:
165
161
  - 0
166
- hash: 1822227411815873171
162
+ hash: 4223158456212372300
167
163
  required_rubygems_version: !ruby/object:Gem::Requirement
168
164
  none: false
169
165
  requirements:
@@ -172,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
172
168
  version: '0'
173
169
  segments:
174
170
  - 0
175
- hash: 1822227411815873171
171
+ hash: 4223158456212372300
176
172
  requirements: []
177
173
  rubyforge_project:
178
174
  rubygems_version: 1.8.23
@@ -1,29 +0,0 @@
1
- module Foundation
2
- module Sass::Script::Functions
3
- def convert_number_to_word(number)
4
- val = case number.to_i
5
- when 1 then "one"
6
- when 2 then "two"
7
- when 3 then "three"
8
- when 4 then "four"
9
- when 5 then "five"
10
- when 6 then "six"
11
- when 7 then "seven"
12
- when 8 then "eight"
13
- when 9 then "nine"
14
- when 10 then "ten"
15
- when 11 then "eleven"
16
- when 12 then "twelve"
17
- when 13 then "thirteen"
18
- when 14 then "fourteen"
19
- when 15 then "fifteen"
20
- when 16 then "sixteen"
21
- else
22
- "invalid"
23
- end
24
- # Sass::Script::String.new(number.value.en.numwords)
25
- Sass::Script::String.new(val)
26
- end
27
- declare :convert_number_to_word, :args => [:number]
28
- end
29
- end
@@ -1,16 +0,0 @@
1
- /* This is for all IE specfific style less than IE9. We hate IE. */
2
-
3
- @import "base";
4
-
5
- .lt-ie8 .row { max-width: 1000px; }
6
-
7
- div.panel { border: 1px solid #ccc; }
8
- .lt-ie8 .nav-bar li.has-flyout a { padding-right: 20px; }
9
- .lt-ie8 .nav-bar li.has-flyout a:after { border-top: none; }
10
-
11
- /* Correct IE7 button padding */
12
- .lt-ie8 input[type=submit].nice.button { filter:chroma(color=#000000); position: relative; top: -2px; }
13
- .lt-ie8 input[type=submit].tiny.button { padding: 5px 5px 7px; }
14
- .lt-ie8 input[type=submit].small.button { padding: 8px 7px 9px; }
15
- .lt-ie8 input[type=submit].medium.button { padding: 9px 13px 9px; }
16
- .lt-ie8 input[type=submit].large.button { padding: 9px 18px 10px; }
@@ -1,32 +0,0 @@
1
- /* Requires:
2
- buttons.css
3
- forms.css
4
- grid.css
5
- tabs.css
6
- typography.css
7
- ui.css
8
- modernizr
9
- */
10
-
11
- @import "base";
12
-
13
-
14
-
15
- /* Forms ---------------------- */
16
-
17
-
18
-
19
- /* UI ---------------------- */
20
-
21
- /* Buttons */
22
-
23
-
24
- /* Tabs */
25
-
26
-
27
- /* Tooltips */
28
-
29
-
30
-
31
- /* Video */
32
-
@@ -1,4 +0,0 @@
1
- // IE styles
2
- //----------------------------------------------
3
- //
4
- // IE specific styles less than IE9. We hate IE.
File without changes