zurb-foundation 2.2.1.1 → 2.2.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/lib/foundation/version.rb +2 -2
  2. data/vendor/assets/javascripts/foundation/app.js +3 -7
  3. data/vendor/assets/javascripts/foundation/jquery.tooltips.js +66 -58
  4. data/vendor/assets/stylesheets/foundation/grid.css.scss +55 -55
  5. metadata +9 -9
data/lib/foundation/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Foundation
2
- COMMIT = "e9d5d8f5267b5d2db23cb74fb307fe149913ca14"
3
- VERSION = "2.2.1.1"
2
+ COMMIT = "1215de455fc08d63b795502970e0c77a7183c35d"
3
+ VERSION = "2.2.1.2"
4
4
  end
data/vendor/assets/javascripts/foundation/app.js CHANGED
@@ -21,13 +21,9 @@ jQuery(document).ready(function ($) {
21
21
  $(contentLocation).css('display', 'block');
22
22
  }
23
23
 
24
- $('dl.tabs').each(function () {
25
- //Get all tabs
26
- var tabs = $(this).children('dd').children('a');
27
- tabs.click(function (e) {
28
- activateTab($(this));
29
- });
30
- });
24
+ $('dl.tabs dd a').live('click', function (event) {
25
+ activateTab($(this));
26
+ });
31
27
 
32
28
  if (window.location.hash) {
33
29
  activateTab($('a[href="' + window.location.hash + '"]'));
data/vendor/assets/javascripts/foundation/jquery.tooltips.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /*
2
- * jQuery Foundation Tooltip Plugin 1.0
2
+ * jQuery Foundation Tooltip Plugin 1.0.1
3
3
  * http://foundation.zurb.com
4
4
  * Copyright 2012, ZURB
5
5
  * Free to use under the MIT license.
@@ -10,40 +10,45 @@
10
10
  var attributes = {
11
11
  bodyHeight : 0,
12
12
  pollInterval : 1000
13
- };
14
-
15
- var methods = {
16
- init : function( options ) {
13
+ },
14
+ methods = {
15
+ init : function(options) {
17
16
 
18
17
  return this.each(function() {
19
- var targets = $('.has-tip'),
20
- tips = $('.tooltip'),
18
+ var targets, tips, tipTemplate, poll;
19
+
20
+ $(window).data('tooltips', 'init');
21
+
22
+ targets = $('.has-tip');
23
+ tips = $('.tooltip');
21
24
  tipTemplate = function(target, content) {
22
25
  return '<span data-id="' + target + '" class="tooltip">' + content + '<span class="nub"></span></span>';
23
- },
26
+ };
24
27
  poll = setInterval(methods.isDomResized, attributes.pollInterval);
25
28
  if (tips.length < 1) {
26
29
  targets.each(function(i){
27
- var target = $(this),
28
- id = 'foundationTooltip' + i,
29
- content = target.attr('title'),
30
+ var target, tip, id, content, classes;
31
+
32
+ target = $(this);
33
+ id = 'foundationTooltip' + i;
34
+ content = target.attr('title');
30
35
  classes = target.attr('class');
31
36
  target.data('id', id);
32
- var tip = $(tipTemplate(id, content));
37
+ tip = $(tipTemplate(id, content));
33
38
  tip.addClass(classes).removeClass('has-tip').appendTo('body');
34
- if (Modernizr.touch) {
35
- tip.append('<span class="tap-to-close">tap to close </span>');
36
- }
39
+ if (Modernizr.touch) tip.append('<span class="tap-to-close">tap to close </span>');
37
40
  methods.reposition(target, tip, classes);
38
41
  tip.fadeOut(150);
39
42
  });
40
43
  }
41
- $(window).resize(function() {
44
+ $(window).on('resize.tooltip', function() {
42
45
  var tips = $('.tooltip');
43
46
  tips.each(function() {
44
- var data = $(this).data();
45
- target = targets = $('.has-tip'),
46
- tip = $(this),
47
+ var data, target, tip, classes;
48
+
49
+ data = $(this).data();
50
+ target = targets = $('.has-tip');
51
+ tip = $(this);
47
52
  classes = tip.attr('class');
48
53
  targets.each(function() {
49
54
  ($(this).data().id == data.id) ? target = $(this) : target = target;
@@ -54,17 +59,16 @@
54
59
  });
55
60
 
56
61
  if (Modernizr.touch) {
57
- $('.tooltip').live('click touchstart touchend', function(e) {
62
+ $('.tooltip').on('click.tooltip touchstart.tooltip touchend.tooltip', function(e) {
58
63
  e.preventDefault();
59
64
  $(this).fadeOut(150);
60
65
  });
61
- targets.live('click touchstart touchend', function(e){
66
+ targets.on('click.tooltip touchstart.tooltip touchend.tooltip', function(e){
62
67
  e.preventDefault();
63
68
  $('.tooltip').hide();
64
69
  $('span[data-id=' + $(this).data('id') + '].tooltip').fadeIn(150);
65
70
  targets.attr('title', "");
66
71
  });
67
-
68
72
  } else {
69
73
  targets.hover(function() {
70
74
  $('span[data-id=' + $(this).data('id') + '].tooltip').fadeIn(150);
@@ -76,54 +80,58 @@
76
80
 
77
81
  });
78
82
  },
83
+ reload : function() {
84
+ var $self = $(this);
85
+ return ($self.data('tooltips')) ? $self.tooltips('destroy').tooltips('init') : $self.tooltips('init');
86
+ },
87
+ destroy : function() {
88
+ return this.each(function(){
89
+ $(window).unbind('.tooltip');
90
+ $('.has-tip').unbind('.tooltip');
91
+ $('.tooltip').each(function(i){
92
+ $($('.has-tip').get(i)).attr('title', $(this).text());
93
+ }).remove();
94
+ });
95
+ },
79
96
  reposition : function(target, tip, classes) {
80
- var width = target.data('width'),
81
- nub = tip.children('.nub'),
82
- nubHeight = nub.outerHeight(),
97
+ var width, nub, nubHeight, nubWidth, row, objPos;
98
+
99
+ width = target.data('width');
100
+ nub = tip.children('.nub');
101
+ nubHeight = nub.outerHeight();
83
102
  nubWidth = nub.outerWidth();
84
103
 
85
- function nubPos(nub, top, right, bottom, left) {
86
- nub.css({
104
+ objPos = function(obj, top, right, bottom, left, width) {
105
+ return obj.css({
87
106
  'top' : top,
88
107
  'bottom' : bottom,
89
108
  'left' : left,
90
- 'right' : right
91
- });
92
- }
109
+ 'right' : right,
110
+ 'width' : (width) ? width : 'auto'
111
+ }).end();
112
+ };
93
113
 
94
- tip.css({
95
- 'top' : (target.offset().top + target.outerHeight() + 10),
96
- 'left' : target.offset().left,
97
- 'width' : width
98
- });
99
- nubPos(nub, -nubHeight, 'auto', 'auto', 10);
114
+
115
+ objPos(tip, (target.offset().top + target.outerHeight() + 10), 'auto', 'auto', target.offset().left, width);
116
+ objPos(nub, -nubHeight, 'auto', 'auto', 10);
100
117
 
101
118
  if ($(window).width() < 767) {
102
- var row = target.parents('.row');
119
+ row = target.parents('.row');
103
120
  tip.width(row.outerWidth() - 20).css('left', row.offset().left).addClass('tip-override');
104
- nubPos(nub, -nubHeight, 'auto', 'auto', target.offset().left);
121
+ objPos(nub, -nubHeight, 'auto', 'auto', target.offset().left);
105
122
  } else {
106
123
  if (classes.indexOf('tip-top') > -1) {
107
- tip.css({
108
- 'top' : target.offset().top - tip.outerHeight() - nubHeight,
109
- 'left' : target.offset().left,
110
- 'width' : width
111
- }).removeClass('tip-override');
112
- nubPos(nub, 'auto', 'auto', -nubHeight, 'auto');
124
+ objPos(tip, (target.offset().top - tip.outerHeight() - nubHeight), 'auto', 'auto', target.offset().left, width)
125
+ .removeClass('tip-override');
126
+ objPos(nub, 'auto', 'auto', -nubHeight, 'auto');
113
127
  } else if (classes.indexOf('tip-left') > -1) {
114
- tip.css({
115
- 'top' : target.offset().top + (target.outerHeight() / 2) - nubHeight,
116
- 'left' : target.offset().left - tip.outerWidth() - 10,
117
- 'width' : width
118
- }).removeClass('tip-override');
119
- nubPos(nub, (tip.outerHeight() / 2) - (nubHeight / 2), -nubHeight, 'auto', 'auto');
120
- } else if (classes.indexOf('tip-right') > -1){
121
- tip.css({
122
- 'top' : target.offset().top + (target.outerHeight() / 2) - nubHeight,
123
- 'left' : target.offset().left + target.outerWidth() + 10,
124
- 'width' : width
125
- }).removeClass('tip-override');
126
- nubPos(nub, (tip.outerHeight() / 2) - (nubHeight / 2), 'auto', 'auto', -nubHeight);
128
+ objPos(tip, (target.offset().top + (target.outerHeight() / 2) - nubHeight), 'auto', 'auto', (target.offset().left - tip.outerWidth() - 10), width)
129
+ .removeClass('tip-override');
130
+ objPos(nub, (tip.outerHeight() / 2) - (nubHeight / 2), -nubHeight, 'auto', 'auto');
131
+ } else if (classes.indexOf('tip-right') > -1) {
132
+ objPos(tip, (target.offset().top + (target.outerHeight() / 2) - nubHeight), 'auto', 'auto', (target.offset().left + target.outerWidth() + 10), width)
133
+ .removeClass('tip-override');
134
+ objPos(nub, (tip.outerHeight() / 2) - (nubHeight / 2), 'auto', 'auto', -nubHeight);
127
135
  }
128
136
  }
129
137
  },
@@ -147,6 +155,6 @@
147
155
  }
148
156
 
149
157
  };
150
- })(jQuery);;
158
+ })(jQuery);
151
159
 
152
160
 
data/vendor/assets/stylesheets/foundation/grid.css.scss CHANGED
@@ -19,64 +19,64 @@
19
19
  [class*="column"] + [class*="column"]:last-child { float: right; }
20
20
  [class*="column"] + [class*="column"].end { float: left; }
21
21
 
22
- .row .one { width: 4.3%; }
23
- .row .two { width: 13%; }
24
- .row .three { width: 21.679%; }
25
- .row .four { width: 30.37%; }
26
- .row .five { width: 39.1%; }
27
- .row .six { width: 47.8%; }
28
- .row .seven { width: 56.5%; }
29
- .row .eight { width: 65.2%; }
30
- .row .nine { width: 73.9%; }
31
- .row .ten { width: 82.6%; }
32
- .row .eleven { width: 91.3%; }
33
- .row .twelve { width: 100%; }
34
-
35
- .row .offset-by-one { margin-left: 13.1%; }
36
- .row .offset-by-two { margin-left: 21.8%; }
37
- .row .offset-by-three { margin-left: 30.5%; }
38
- .row .offset-by-four { margin-left: 39.2%; }
39
- .row .offset-by-five { margin-left: 47.9%; }
40
- .row .offset-by-six { margin-left: 56.6%; }
41
- .row .offset-by-seven { margin-left: 65.3%; }
42
- .row .offset-by-eight { margin-left: 74.0%; }
43
- .row .offset-by-nine { margin-left: 82.7%; }
44
- .row .offset-by-ten { margin-left: 91.4%; }
22
+ .row .one { width: 4.27503%; }
23
+ .row .two { width: 12.97730%; }
24
+ .row .three { width: 21.67957%; }
25
+ .row .four { width: 30.37999%; }
26
+ .row .five { width: 39.08411%; }
27
+ .row .six { width: 47.78638%; }
28
+ .row .seven { width: 56.48865%; }
29
+ .row .eight { width: 65.19092%; }
30
+ .row .nine { width: 73.89319%; }
31
+ .row .ten { width: 82.59546%; }
32
+ .row .eleven { width: 91.29773%; }
33
+ .row .twelve { width: 100%; }
34
+
35
+ .row .offset-by-one { margin-left: 12.97730%; }
36
+ .row .offset-by-two { margin-left: 21.67957%; }
37
+ .row .offset-by-three { margin-left: 30.38184%; }
38
+ .row .offset-by-four { margin-left: 39.08226%; }
39
+ .row .offset-by-five { margin-left: 47.78638%; }
40
+ .row .offset-by-six { margin-left: 56.48865%; }
41
+ .row .offset-by-seven { margin-left: 65.19092%; }
42
+ .row .offset-by-eight { margin-left: 73.89319%; }
43
+ .row .offset-by-nine { margin-left: 82.59546%; }
44
+ .row .offset-by-ten { margin-left: 91.29773%; }
45
45
 
46
46
  .row .centered { float: none; margin: 0 auto; }
47
-
48
- .row .offset-by-one:first-child { margin-left: 8.7%; }
49
- .row .offset-by-two:first-child { margin-left: 17.4%; }
50
- .row .offset-by-three:first-child { margin-left: 26.1%; }
51
- .row .offset-by-four:first-child { margin-left: 34.8%; }
52
- .row .offset-by-five:first-child { margin-left: 43.5%; }
53
- .row .offset-by-six:first-child { margin-left: 52.2%; }
54
- .row .offset-by-seven:first-child { margin-left: 60.9%; }
55
- .row .offset-by-eight:first-child { margin-left: 69.6%; }
56
- .row .offset-by-nine:first-child { margin-left: 78.3%; }
57
- .row .offset-by-ten:first-child { margin-left: 87%; }
58
- .row .offset-by-eleven:first-child { margin-left: 95.7%; }
47
+
48
+ .row .offset-by-one:first-child { margin-left: 8.626165%; }
49
+ .row .offset-by-two:first-child { margin-left: 17.328435%; }
50
+ .row .offset-by-three:first-child { margin-left: 26.030705%; }
51
+ .row .offset-by-four:first-child { margin-left: 34.731125%; }
52
+ .row .offset-by-five:first-child { margin-left: 43.435245%; }
53
+ .row .offset-by-six:first-child { margin-left: 52.137515%; }
54
+ .row .offset-by-seven:first-child { margin-left: 60.839785%; }
55
+ .row .offset-by-eight:first-child { margin-left: 69.542055%; }
56
+ .row .offset-by-nine:first-child { margin-left: 78.244325%; }
57
+ .row .offset-by-ten:first-child { margin-left: 86.946595%; }
58
+ .row .offset-by-eleven:first-child { margin-left: 95.648865%; }
59
59
 
60
60
  /* Source Ordering */
61
- .push-two { left: 17.4% }
62
- .push-three { left: 26.1%; }
63
- .push-four { left: 34.8%; }
64
- .push-five { left: 43.5%; }
65
- .push-six { left: 52.2%; }
66
- .push-seven { left: 60.9%; }
67
- .push-eight { left: 69.6%; }
68
- .push-nine { left: 78.3%; }
69
- .push-ten { left: 87%; }
70
-
71
- .pull-two { right: 17.4% }
72
- .pull-three { right: 26.1%; }
73
- .pull-four { right: 34.8%; }
74
- .pull-five { right: 43.5%; }
75
- .pull-six { right: 52.2%; }
76
- .pull-seven { right: 60.9%; }
77
- .pull-eight { right: 69.6%; }
78
- .pull-nine { right: 78.3%; }
79
- .pull-ten { right: 87%; }
61
+ .push-two { left: 17.328435%; }
62
+ .push-three { left: 26.030705%; }
63
+ .push-four { left: 34.731125%; }
64
+ .push-five { left: 43.435245%; }
65
+ .push-six { left: 52.137515%; }
66
+ .push-seven { left: 60.839785%; }
67
+ .push-eight { left: 69.542055%; }
68
+ .push-nine { left: 78.244325%; }
69
+ .push-ten { left: 86.946595%; }
70
+
71
+ .pull-two { right: 17.328435%; }
72
+ .pull-three { right: 26.030705%; }
73
+ .pull-four { right: 34.731125%; }
74
+ .pull-five { right: 43.435245%; }
75
+ .pull-six { right: 52.137515%; }
76
+ .pull-seven { right: 60.839785%; }
77
+ .pull-eight { right: 69.542055%; }
78
+ .pull-nine { right: 78.244325%; }
79
+ .pull-ten { right: 86.946595%; }
80
80
 
81
81
 
82
82
 
@@ -114,7 +114,7 @@
114
114
  /* .block-grid.two-up>li:nth-child(2n+1) {clear: left;} */
115
115
 
116
116
  .block-grid.three-up { margin-left: -2% }
117
- .block-grid.three-up>li { margin-left: 2%; width: 31.3%; margin-bottom: 2%;}
117
+ .block-grid.three-up>li { margin-left: 2%; width: 31.2%; margin-bottom: 2%;}
118
118
  /* .block-grid.three-up>li:nth-child(3n+1) {clear: left;} */
119
119
 
120
120
  .block-grid.four-up { margin-left: -2% }
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.2.1.1
4
+ version: 2.2.1.2
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-04-16 00:00:00.000000000 Z
12
+ date: 2012-05-19 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &70192212347320 !ruby/object:Gem::Requirement
16
+ requirement: &70219855347800 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
24
24
  version: '4.0'
25
25
  type: :runtime
26
26
  prerelease: false
27
- version_requirements: *70192212347320
27
+ version_requirements: *70219855347800
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: jquery-rails
30
- requirement: &70192212346180 !ruby/object:Gem::Requirement
30
+ requirement: &70219855339800 !ruby/object:Gem::Requirement
31
31
  none: false
32
32
  requirements:
33
33
  - - ! '>='
@@ -35,7 +35,7 @@ dependencies:
35
35
  version: '1.0'
36
36
  type: :runtime
37
37
  prerelease: false
38
- version_requirements: *70192212346180
38
+ version_requirements: *70219855339800
39
39
  description: An easy to use, powerful, and flexible framework for building prototypes
40
40
  and production code on any kind of device.
41
41
  email:
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
108
108
  version: '0'
109
109
  segments:
110
110
  - 0
111
- hash: 3199139998876471409
111
+ hash: 1610463681209950274
112
112
  required_rubygems_version: !ruby/object:Gem::Requirement
113
113
  none: false
114
114
  requirements:
@@ -117,10 +117,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
117
117
  version: '0'
118
118
  segments:
119
119
  - 0
120
- hash: 3199139998876471409
120
+ hash: 1610463681209950274
121
121
  requirements: []
122
122
  rubyforge_project: foundation
123
- rubygems_version: 1.8.11
123
+ rubygems_version: 1.8.10
124
124
  signing_key:
125
125
  specification_version: 3
126
126
  summary: Get up and running with Foundation in seconds