ZURB-foundation 2.1.4 → 2.1.4.1

Sign up to get free protection for your applications and to get access to all the features.
data/README.mkdn CHANGED
@@ -18,7 +18,7 @@ In Terminal:
18
18
  * `git clone git://github.com/zurb/foundation-sass.git`
19
19
  * `cd foundation-sass`
20
20
  * `sudo gem build ZURB-foundation.gemspec`
21
- * `sudo gem install ZURB-foundation-2.1.4.gem`
21
+ * `sudo gem install ZURB-foundation-2.1.4.1.gem`
22
22
 
23
23
  To create your first project
24
24
  ----------------------------
@@ -36,7 +36,6 @@ To Add ZURB-foundation to an existing project
36
36
  * run: `compass install ZURB-foundation`
37
37
 
38
38
 
39
-
40
39
  Welcome to Foundation
41
40
  =====================
42
41
 
@@ -67,7 +66,11 @@ WordPress
67
66
 
68
67
  .NET
69
68
 
70
- * [NuGet Package for ASP.Net MVC](http://nuget.org/List/Packages/Zurb_Foundation_MPC3) by Edward Charbeneau
69
+ * [NuGet Package for ASP.Net MVC](http://nuget.org/List/Packages/Zurb_Foundation_MPC3) by Edward Charbeneau, @EdCharbeneau
70
+
71
+ Editors
72
+
73
+ * [Textmate/Sublime Text2 Bundle](https://github.com/liamr/Zurb-Foundation-Textmate-Bundle) by Liam R, @liamr
71
74
 
72
75
  MIT Open Source License
73
76
  =======================
@@ -3,7 +3,7 @@ Compass::Frameworks.register("ZURB-foundation", :path => File.join(File.dirname(
3
3
 
4
4
  module ZURBfoundation
5
5
 
6
- VERSION = "2.1.4"
7
- DATE = "2012-01-07"
6
+ VERSION = "2.1.4.1"
7
+ DATE = "2012-01-23"
8
8
 
9
9
  end
@@ -97,5 +97,5 @@
97
97
  //----------------------------------------------------
98
98
 
99
99
  // Don't use native buttons on iOS
100
- input[type=submit].button
100
+ input[type=submit].button, button.button
101
101
  -webkit-appearance: none
@@ -32,6 +32,10 @@ input.input-text, textarea
32
32
  &:focus
33
33
  outline: none !important
34
34
 
35
+ // Text input and textarea, disabled
36
+ input.input-text[disabled], textarea[disabled]
37
+ background-color: #ddd
38
+
35
39
  // Inlined Label Style
36
40
  //-----------------------------------------
37
41
 
@@ -109,6 +113,8 @@ form.nice
109
113
  background-color: #f9f9f9
110
114
  fieldset
111
115
  +border-radius(3px)
116
+ .form-field input[disabled], input.input-text[disabled], textarea[disabled]
117
+ background: #ccc
112
118
  small.error
113
119
  padding: 6px 4px
114
120
  border: solid 0 #c00000
@@ -203,4 +209,21 @@ form.custom
203
209
  display: block
204
210
  a.selector
205
211
  background-position: -14px -26px
206
-
212
+ .custom.disabled
213
+ background-color: #ddd
214
+ // Nicer Customer Forms
215
+ &.nice
216
+ span.custom.checkbox
217
+ +border-radius(2px)
218
+ div.custom.dropdown
219
+ a.current
220
+ +border-radius(2px)
221
+ background-image: image-url('misc/input-bg-outset.png')
222
+ background-position: bottom right
223
+ a.selector
224
+ height: 27px
225
+ border-width: 0 0 0 1px
226
+ ul
227
+ +border-bottom-left-radius(2px)
228
+ +border-bottom-right-radius(2px)
229
+
@@ -155,6 +155,12 @@ table
155
155
  float: left
156
156
  .right
157
157
  float: right
158
+ .text-left
159
+ text-align: left
160
+ .text-right
161
+ text-align: right
162
+ .text-center
163
+ text-align: center
158
164
  .hide
159
165
  display: none
160
166
  .highlight
@@ -7,7 +7,6 @@
7
7
  max-width: $grid-max-width
8
8
  min-width: $grid-min-width
9
9
  margin: 0 auto
10
- // .row .row
11
10
  .row
12
11
  min-width: 0
13
12
 
@@ -44,6 +43,10 @@
44
43
  .twelve.columns
45
44
  width: 100%
46
45
 
46
+ .centered
47
+ float: none
48
+ margin: 0 auto
49
+
47
50
  .offset-by-one
48
51
  margin-left: 13.1%
49
52
  &:first-child
@@ -27,12 +27,6 @@
27
27
  +font-size(15)
28
28
  line-height: 1.4
29
29
 
30
- // Tablet
31
- //---------------------------------------------------
32
-
33
- // Currently unused
34
- // @media only screen and (device-width: 768px), (device-width: 800)
35
-
36
30
  @media only screen and (max-width: 767px)
37
31
  body
38
32
  -webkit-text-size-adjust: none
@@ -66,7 +66,7 @@ div.timer
66
66
  right: 10px
67
67
  +opacity(0.6)
68
68
  cursor: pointer
69
- z-index: 1001
69
+ z-index: 31
70
70
  span.rotator
71
71
  display: block
72
72
  width: 40px
@@ -115,7 +115,7 @@ div.timer:hover span.pause, span.pause.active
115
115
  .orbit-wrapper .orbit-caption
116
116
  background: #000
117
117
  background: rgba(0,0,0,0.6)
118
- z-index: 1000
118
+ z-index: 30
119
119
  color: #fff
120
120
  text-align: center
121
121
  padding: 7px 0
@@ -135,7 +135,7 @@ div.slider-nav
135
135
  height: 100px
136
136
  text-indent: -99999px
137
137
  position: absolute
138
- z-index: 1000
138
+ z-index: 30
139
139
  top: 50%
140
140
  margin-top: -50px
141
141
  cursor: pointer
@@ -151,7 +151,7 @@ div.slider-nav
151
151
 
152
152
  .orbit-bullets
153
153
  position: absolute
154
- z-index: 1000
154
+ z-index: 30
155
155
  list-style: none
156
156
  bottom: -40px
157
157
  left: 50%
@@ -192,7 +192,7 @@ div.slider-nav
192
192
 
193
193
  .orbit-bullets
194
194
  position: absolute
195
- z-index: 1000
195
+ z-index: 30
196
196
  list-style: none
197
197
  bottom: -50px
198
198
  left: 50%
@@ -20,7 +20,7 @@
20
20
  width: 100%
21
21
  background: #000
22
22
  background: rgba(0,0,0,0.8)
23
- z-index: 100
23
+ z-index: 40
24
24
  display: none
25
25
  top: 0
26
26
  left: 0
@@ -31,12 +31,12 @@
31
31
  left: 50%
32
32
  margin-left: -300px
33
33
  width: 520px
34
- background: #eee image-url('misc/modal-gloss.png') no-repeat -200 -80
34
+ background: #eee image-url('misc/modal-gloss.png') no-repeat -200px -80px
35
35
  position: absolute
36
- z-index: 101
37
- padding: 30 40 34px
36
+ z-index: 41
37
+ padding: 30px 40px 34px
38
38
  +border-radius(5px)
39
- +box-shadow(0 0 10 rgba(0,0,0,0.4))
39
+ +box-shadow(0 0 10px rgba(0,0,0,0.4))
40
40
  &.small
41
41
  width: 200px
42
42
  margin-left: -140px
@@ -0,0 +1,3 @@
1
+ @import shared/settings
2
+ @import shared/colors
3
+ @import shared/mixins
@@ -36,13 +36,14 @@ h6
36
36
  margin-bottom: 24px
37
37
 
38
38
  p
39
- line-height: 17px
39
+ +font-size(13)
40
+ line-height: 1.25
40
41
  margin: 0 0 18px
41
42
  img
42
43
  margin: 0
43
44
  &.lead
44
45
  +font-size(18)
45
- line-height: 24px
46
+ line-height: 1.5
46
47
 
47
48
  em, i
48
49
  font-style: italic
@@ -1,6 +1,7 @@
1
1
  // Table of Contents:
2
2
  //
3
- // Notices and Alerts
3
+ // Alerts
4
+ // Labels
4
5
  // Tabs
5
6
  // Pagination
6
7
  // Lists
@@ -46,12 +47,49 @@ div.alert-box
46
47
  &:hover, &:focus
47
48
  +opacity(0.4)
48
49
 
50
+
51
+
52
+ // Labels
53
+ //----------------------------------------------------------------------------------------------------
54
+ .label
55
+ padding: 0px 4px 2px
56
+ +font-size(11)
57
+ font-weight: bold
58
+ text-align: center
59
+ text-decoration: none
60
+ line-height: 1
61
+ white-space: nowrap
62
+ display: inline
63
+ position: relative
64
+ bottom: 1px
65
+ color: $white
66
+ background: $blue
67
+ &.radius
68
+ +border-radius(2px)
69
+ &.round
70
+ padding: 1px 7px 2px
71
+ +border-radius(8px)
72
+ // Colors
73
+ &.blue
74
+ background-color: $blue
75
+ &.red
76
+ background-color: $red
77
+ &.green
78
+ background-color: $green
79
+ &.white
80
+ background-color: #e9e9e9
81
+ color: #333
82
+ &.black
83
+ background-color: $black
84
+
85
+
86
+
49
87
  // Tabs
50
88
  //----------------------------------------------------------------------------------------------------
51
89
 
52
90
  dl.tabs
53
91
  display: block
54
- margin: 0 0 20px
92
+ margin: 0 0 20px 0
55
93
  padding: 0
56
94
  height: 30px
57
95
  border-bottom: solid 1px #ddd
File without changes
File without changes
@@ -1,5 +1,5 @@
1
1
  // Shared
2
- @import ZURB/includes
2
+ @import ZURB/shared
3
3
 
4
4
  // Foundation parts
5
5
  @import ZURB/globals
@@ -19,6 +19,7 @@ jQuery(document).ready(function ($) {
19
19
  }
20
20
 
21
21
  $span.toggleClass('checked', $this.is(':checked'));
22
+ $span.toggleClass('disabled', $this.is(':disabled'));
22
23
  });
23
24
  }
24
25
  appendCustomMarkup('checkbox');
@@ -51,6 +52,8 @@ jQuery(document).ready(function ($) {
51
52
  });
52
53
  }
53
54
 
55
+ $customSelect.toggleClass('disabled', $this.is(':disabled'));
56
+
54
57
  $options.each(function (index) {
55
58
  if (this.selected) {
56
59
  $customSelect.find('li').eq(index).addClass('selected');
@@ -116,10 +119,12 @@ jQuery(document).ready(function ($) {
116
119
  var $input = $element.prev(),
117
120
  input = $input[0];
118
121
 
119
- input.checked = ((input.checked) ? false : true);
120
- $element.toggleClass('checked');
121
-
122
- $input.trigger('change');
122
+ if (false == $input.is(':disabled')) {
123
+ input.checked = ((input.checked) ? false : true);
124
+ $element.toggleClass('checked');
125
+
126
+ $input.trigger('change');
127
+ }
123
128
  }
124
129
 
125
130
  function toggleRadio($element) {
@@ -172,18 +177,22 @@ jQuery(document).ready(function ($) {
172
177
 
173
178
  $('form.custom div.custom.dropdown a.current, form.custom div.custom.dropdown a.selector').live('click', function (event) {
174
179
  var $this = $(this),
175
- $dropdown = $this.closest('div.custom.dropdown');
180
+ $dropdown = $this.closest('div.custom.dropdown'),
181
+ $select = $dropdown.prev();
176
182
 
177
183
  event.preventDefault();
178
- $dropdown.toggleClass('open');
179
184
 
180
- if ($dropdown.hasClass('open')) {
181
- $(document).bind('click.customdropdown', function (event) {
182
- $dropdown.removeClass('open');
183
- $(document).unbind('.customdropdown');
184
- });
185
- } else {
186
- $(document).unbind('.customdropdown');
185
+ if (false == $select.is(':disabled')) {
186
+ $dropdown.toggleClass('open');
187
+
188
+ if ($dropdown.hasClass('open')) {
189
+ $(document).bind('click.customdropdown', function (event) {
190
+ $dropdown.removeClass('open');
191
+ $(document).unbind('.customdropdown');
192
+ });
193
+ } else {
194
+ $(document).unbind('.customdropdown');
195
+ }
187
196
  }
188
197
  });
189
198
 
@@ -1,2 +1,2 @@
1
- /*! http://mths.be/placeholder v1.8.5 by @mathias */
2
- (function(g,a,$){var f='placeholder' in a.createElement('input'),b='placeholder' in a.createElement('textarea');if(f&&b){$.fn.placeholder=function(){return this};$.fn.placeholder.input=$.fn.placeholder.textarea=true}else{$.fn.placeholder=function(){return this.filter((f?'textarea':':input')+'[placeholder]').bind('focus.placeholder',c).bind('blur.placeholder',e).trigger('blur.placeholder').end()};$.fn.placeholder.input=f;$.fn.placeholder.textarea=b;$(function(){$('form').bind('submit.placeholder',function(){var h=$('.placeholder',this).each(c);setTimeout(function(){h.each(e)},10)})});$(g).bind('unload.placeholder',function(){$('.placeholder').val('')})}function d(i){var h={},j=/^jQuery\d+$/;$.each(i.attributes,function(l,k){if(k.specified&&!j.test(k.name)){h[k.name]=k.value}});return h}function c(){var h=$(this);if(h.val()===h.attr('placeholder')&&h.hasClass('placeholder')){if(h.data('placeholder-password')){h.hide().next().show().focus().attr('id',h.removeAttr('id').data('placeholder-id'))}else{h.val('').removeClass('placeholder')}}}function e(){var l,k=$(this),h=k,j=this.id;if(k.val()===''){if(k.is(':password')){if(!k.data('placeholder-textinput')){try{l=k.clone().attr({type:'text'})}catch(i){l=$('<input>').attr($.extend(d(this),{type:'text'}))}l.removeAttr('name').data('placeholder-password',true).data('placeholder-id',j).bind('focus.placeholder',c);k.data('placeholder-textinput',l).data('placeholder-id',j).before(l)}k=k.removeAttr('id').hide().prev().attr('id',j).show()}k.addClass('placeholder').val(k.attr('placeholder'))}else{k.removeClass('placeholder')}}}(this,document,jQuery));
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));
@@ -25,6 +25,7 @@ image 'images/misc/button-gloss.png', :to => 'misc/button-gloss.png'
25
25
  image 'images/misc/button-overlay.png', :to => 'misc/button-overlay.png'
26
26
  image 'images/misc/custom-form-sprites.png', :to => 'misc/custom-form-sprites.png'
27
27
  image 'images/misc/input-bg.png', :to => 'misc/input-bg.png'
28
+ image 'images/misc/input-bg-outset.png', :to => 'misc/input-bg-outset.png'
28
29
  image 'images/misc/modal-gloss.png', :to => 'misc/modal-gloss.png'
29
30
  image 'images/misc/table-sorter.png', :to => 'misc/table-sorter.png'
30
31
  image 'images/orbit/bullets.jpg', :to => 'orbit/bullets.jpg'
@@ -1,4 +1,4 @@
1
- @import ZURB/includes
1
+ @import ZURB/shared
2
2
 
3
3
  // IE styles
4
4
  //----------------------------------------------
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.4
4
+ version: 2.1.4.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-01-07 00:00:00.000000000Z
12
+ date: 2012-01-23 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: compass
16
- requirement: &70273933999000 !ruby/object:Gem::Requirement
16
+ requirement: &70116249143380 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
21
21
  version: 0.11.5
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70273933999000
24
+ version_requirements: *70116249143380
25
25
  description: ZURB Foundation ported over to work with the power of Compass.
26
26
  email: foundation@zurb.com
27
27
  executables: []
@@ -35,19 +35,20 @@ files:
35
35
  - stylesheets/ZURB/_forms.sass
36
36
  - stylesheets/ZURB/_globals.sass
37
37
  - stylesheets/ZURB/_grid.sass
38
- - stylesheets/ZURB/_includes.sass
39
38
  - stylesheets/ZURB/_mobile.sass
40
39
  - stylesheets/ZURB/_orbit.sass
41
40
  - stylesheets/ZURB/_reveal.sass
41
+ - stylesheets/ZURB/_shared.sass
42
42
  - stylesheets/ZURB/_typography.sass
43
43
  - stylesheets/ZURB/_ui.sass
44
- - stylesheets/ZURB/includes/_colors.sass
45
- - stylesheets/ZURB/includes/_mixins.sass
46
- - stylesheets/ZURB/includes/_settings.sass
44
+ - stylesheets/ZURB/shared/_colors.sass
45
+ - stylesheets/ZURB/shared/_mixins.sass
46
+ - stylesheets/ZURB/shared/_settings.sass
47
47
  - templates/project/humans.txt
48
48
  - templates/project/images/misc/button-gloss.png
49
49
  - templates/project/images/misc/button-overlay.png
50
50
  - templates/project/images/misc/custom-form-sprites.png
51
+ - templates/project/images/misc/input-bg-outset.png
51
52
  - templates/project/images/misc/input-bg.png
52
53
  - templates/project/images/misc/modal-gloss.png
53
54
  - templates/project/images/misc/table-sorter.png
@@ -1,3 +0,0 @@
1
- @import includes/settings
2
- @import includes/colors
3
- @import includes/mixins