flashgrid 1.2.0 → 1.3.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a4447d9fda69f15f9ddf0107784f3e783950e43b
4
- data.tar.gz: b40ecbed3d1af08060c506248850a186d170127f
3
+ metadata.gz: 34247f90580e7bf8a087eafe6690e8c63d19e1b2
4
+ data.tar.gz: 407ebac546e27b9a5783e5edc57dffc9410781d8
5
5
  SHA512:
6
- metadata.gz: 635d39162a5933a9c6761c6e25e2bef154dcf17689dd545d9f8a65d63a5425f5d15bb755cc1cb63ec52dbedfca9a98d8949c96c9d447eae3587c21f4321cf1a0
7
- data.tar.gz: f8923146e786e62542711a2ffc9a3f1fc7c94a2f41c6a418664bfbc4e8660eea22d5139bfa3353835eaa3054ca37ba4d90ee650725c4b96c641b3c918be26027
6
+ metadata.gz: 5bb4cf5ccb161846689ec89c799675be3135b652d54b9a3e56558ccc63ac5d31be32a7e425f32a2a433a06206196698d3ad526815dd231f1c0cab6dc4f31d577
7
+ data.tar.gz: 7f3183f8d4e6fcdc42279a0cefed5719869f7d93b8f15a6e6ef59194dbd4e833e22af683a0a670a54b35de5fece0252dc97c0e1b1597e9c77e4a7087b95a21dd
@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
19
  spec.require_paths = ["lib"]
20
20
 
21
- spec.add_development_dependency "bundler", "~> 1.3"
22
- spec.add_development_dependency "rake", "~> 10.1"
21
+ spec.add_development_dependency "bundler", "~> 1.5"
22
+ spec.add_development_dependency "rake"
23
23
  end
@@ -1,3 +1,3 @@
1
1
  module Flashgrid
2
- VERSION = "1.2.0"
2
+ VERSION = "1.3.0"
3
3
  end
@@ -81,9 +81,7 @@
81
81
  // AFFIX PLUGIN DEFINITION
82
82
  // =======================
83
83
 
84
- var old = $.fn.affix
85
-
86
- $.fn.affix = function (option) {
84
+ function Plugin(option) {
87
85
  return this.each(function () {
88
86
  var $this = $(this)
89
87
  var data = $this.data('bs.affix')
@@ -94,6 +92,9 @@
94
92
  })
95
93
  }
96
94
 
95
+ var old = $.fn.affix
96
+
97
+ $.fn.affix = Plugin
97
98
  $.fn.affix.Constructor = Affix
98
99
 
99
100
 
@@ -119,7 +120,7 @@
119
120
  if (data.offsetBottom) data.offset.bottom = data.offsetBottom
120
121
  if (data.offsetTop) data.offset.top = data.offsetTop
121
122
 
122
- $spy.affix(data)
123
+ Plugin.call($spy, data)
123
124
  })
124
125
  })
125
126
 
@@ -47,9 +47,7 @@
47
47
  // ALERT PLUGIN DEFINITION
48
48
  // =======================
49
49
 
50
- var old = $.fn.alert
51
-
52
- $.fn.alert = function (option) {
50
+ function Plugin(option) {
53
51
  return this.each(function () {
54
52
  var $this = $(this)
55
53
  var data = $this.data('bs.alert')
@@ -59,6 +57,9 @@
59
57
  })
60
58
  }
61
59
 
60
+ var old = $.fn.alert
61
+
62
+ $.fn.alert = Plugin
62
63
  $.fn.alert.Constructor = Alert
63
64
 
64
65
 
@@ -34,7 +34,7 @@
34
34
  if (actives && actives.length) {
35
35
  var hasData = actives.data('bs.collapse')
36
36
  if (hasData && hasData.transitioning) return
37
- actives.collapse('hide')
37
+ Plugin.call(actives, 'hide')
38
38
  hasData || actives.data('bs.collapse', null)
39
39
  }
40
40
 
@@ -56,7 +56,9 @@
56
56
  .removeClass('collapsing')
57
57
  .addClass('collapse in')[dimension]('')
58
58
  this.transitioning = 0
59
- this.$element.trigger('shown.bs.collapse')
59
+ this.$element
60
+ .off($.support.transition.end + '.bs.collapse')
61
+ .trigger('shown.bs.collapse')
60
62
  }
61
63
 
62
64
  if (!$.support.transition) return complete.call(this)
@@ -64,7 +66,7 @@
64
66
  var scrollSize = $.camelCase(['scroll', dimension].join('-'))
65
67
 
66
68
  this.$element
67
- .one($.support.transition.end, $.proxy(complete, this))
69
+ .on($.support.transition.end + '.bs.collapse', $.proxy(complete, this))
68
70
  .emulateTransitionEnd(350)[dimension](this.$element[0][scrollSize])
69
71
  }
70
72
 
@@ -115,9 +117,7 @@
115
117
  // COLLAPSE PLUGIN DEFINITION
116
118
  // ==========================
117
119
 
118
- var old = $.fn.collapse
119
-
120
- $.fn.collapse = function (option) {
120
+ function Plugin(option) {
121
121
  return this.each(function () {
122
122
  var $this = $(this)
123
123
  var data = $this.data('bs.collapse')
@@ -129,6 +129,9 @@
129
129
  })
130
130
  }
131
131
 
132
+ var old = $.fn.collapse
133
+
134
+ $.fn.collapse = Plugin
132
135
  $.fn.collapse.Constructor = Collapse
133
136
 
134
137
 
@@ -160,7 +163,7 @@
160
163
  $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
161
164
  }
162
165
 
163
- $target.collapse(option)
166
+ Plugin.call($target, option)
164
167
  })
165
168
 
166
169
  }(jQuery);
@@ -103,9 +103,7 @@
103
103
  // DROPDOWN PLUGIN DEFINITION
104
104
  // ==========================
105
105
 
106
- var old = $.fn.dropdown
107
-
108
- $.fn.dropdown = function (option) {
106
+ function Plugin(option) {
109
107
  return this.each(function () {
110
108
  var $this = $(this)
111
109
  var data = $this.data('bs.dropdown')
@@ -115,6 +113,9 @@
115
113
  })
116
114
  }
117
115
 
116
+ var old = $.fn.dropdown
117
+
118
+ $.fn.dropdown = Plugin
118
119
  $.fn.dropdown.Constructor = Dropdown
119
120
 
120
121
 
@@ -760,6 +760,12 @@ GMaps.prototype.drawOverlay = function(options) {
760
760
  })(el, stop_overlay_events[ev]);
761
761
  }
762
762
 
763
+ if (options.click) {
764
+ google.maps.event.addDomListener(overlay.el, 'click', function() {
765
+ options.click.apply(overlay, [overlay]);
766
+ });
767
+ }
768
+
763
769
  google.maps.event.trigger(this, 'ready');
764
770
  };
765
771
 
@@ -219,9 +219,7 @@
219
219
  // MODAL PLUGIN DEFINITION
220
220
  // =======================
221
221
 
222
- var old = $.fn.modal
223
-
224
- $.fn.modal = function (option, _relatedTarget) {
222
+ function Plugin(option, _relatedTarget) {
225
223
  return this.each(function () {
226
224
  var $this = $(this)
227
225
  var data = $this.data('bs.modal')
@@ -233,6 +231,9 @@
233
231
  })
234
232
  }
235
233
 
234
+ var old = $.fn.modal
235
+
236
+ $.fn.modal = Plugin
236
237
  $.fn.modal.Constructor = Modal
237
238
 
238
239
 
@@ -256,11 +257,10 @@
256
257
 
257
258
  if ($this.is('a')) e.preventDefault()
258
259
 
259
- $target
260
- .modal(option, this)
261
- .one('hide', function () {
262
- $this.is(':visible') && $this.trigger('focus')
263
- })
260
+ Plugin.call($target, option, this)
261
+ $target.one('hide', function () {
262
+ $this.is(':visible') && $this.trigger('focus')
263
+ })
264
264
  })
265
265
 
266
266
  }(jQuery);
@@ -14,7 +14,7 @@
14
14
  placement: 'right',
15
15
  trigger: 'click',
16
16
  content: '',
17
- template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
17
+ template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
18
18
  })
19
19
 
20
20
 
@@ -73,9 +73,7 @@
73
73
  // POPOVER PLUGIN DEFINITION
74
74
  // =========================
75
75
 
76
- var old = $.fn.popover
77
-
78
- $.fn.popover = function (option) {
76
+ function Plugin(option) {
79
77
  return this.each(function () {
80
78
  var $this = $(this)
81
79
  var data = $this.data('bs.popover')
@@ -87,6 +85,9 @@
87
85
  })
88
86
  }
89
87
 
88
+ var old = $.fn.popover
89
+
90
+ $.fn.popover = Plugin
90
91
  $.fn.popover.Constructor = Popover
91
92
 
92
93
 
@@ -81,9 +81,7 @@
81
81
  // TAB PLUGIN DEFINITION
82
82
  // =====================
83
83
 
84
- var old = $.fn.tab
85
-
86
- $.fn.tab = function ( option ) {
84
+ function Plugin( option ) {
87
85
  return this.each(function () {
88
86
  var $this = $(this)
89
87
  var data = $this.data('bs.tab')
@@ -93,6 +91,9 @@
93
91
  })
94
92
  }
95
93
 
94
+ var old = $.fn.tab
95
+
96
+ $.fn.tab = Plugin
96
97
  $.fn.tab.Constructor = Tab
97
98
 
98
99
 
@@ -110,7 +111,7 @@
110
111
 
111
112
  $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
112
113
  e.preventDefault()
113
- $(this).tab('show')
114
+ Plugin.call($(this), 'show')
114
115
  })
115
116
 
116
117
  }(jQuery);
@@ -89,7 +89,12 @@
89
89
 
90
90
  Tooltip.prototype.enter = function (obj) {
91
91
  var self = obj instanceof this.constructor ?
92
- obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
92
+ obj : $(obj.currentTarget).data('bs.' + this.type)
93
+
94
+ if (!self) {
95
+ self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
96
+ $(obj.currentTarget).data('bs.' + this.type, self)
97
+ }
93
98
 
94
99
  clearTimeout(self.timeout)
95
100
 
@@ -104,7 +109,12 @@
104
109
 
105
110
  Tooltip.prototype.leave = function (obj) {
106
111
  var self = obj instanceof this.constructor ?
107
- obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
112
+ obj : $(obj.currentTarget).data('bs.' + this.type)
113
+
114
+ if (!self) {
115
+ self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
116
+ $(obj.currentTarget).data('bs.' + this.type, self)
117
+ }
108
118
 
109
119
  clearTimeout(self.timeout)
110
120
 
@@ -371,7 +381,15 @@
371
381
  }
372
382
 
373
383
  Tooltip.prototype.toggle = function (e) {
374
- var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this
384
+ var self = this
385
+ if (e) {
386
+ self = $(e.currentTarget).data('bs.' + this.type)
387
+ if (!self) {
388
+ self = new this.constructor(e.currentTarget, this.getDelegateOptions())
389
+ $(e.currentTarget).data('bs.' + this.type, self)
390
+ }
391
+ }
392
+
375
393
  self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
376
394
  }
377
395
 
@@ -384,9 +402,7 @@
384
402
  // TOOLTIP PLUGIN DEFINITION
385
403
  // =========================
386
404
 
387
- var old = $.fn.tooltip
388
-
389
- $.fn.tooltip = function (option) {
405
+ function Plugin(option) {
390
406
  return this.each(function () {
391
407
  var $this = $(this)
392
408
  var data = $this.data('bs.tooltip')
@@ -398,6 +414,9 @@
398
414
  })
399
415
  }
400
416
 
417
+ var old = $.fn.tooltip
418
+
419
+ $.fn.tooltip = Plugin
401
420
  $.fn.tooltip.Constructor = Tooltip
402
421
 
403
422
 
@@ -9,6 +9,7 @@
9
9
  height: 220px;
10
10
  width: 220px;
11
11
  }
12
+ .ad-center { margin: 0 auto; }
12
13
  .ad-large-rectangle {
13
14
  height: 280px;
14
15
  width: 336px;
@@ -68,5 +69,4 @@
68
69
  .ad-skyscrapper {
69
70
  height: 600px;
70
71
  width: 120px;
71
- }
72
- .ad-center { margin: 0 auto; }
72
+ }
@@ -12,9 +12,10 @@
12
12
  margin: -40px 0 40px 0;
13
13
  padding: 11px 20px 11px 20px;
14
14
  }
15
- .alert,
16
- .alert h4 { color: rgba(71,74,84,1); }
17
- .alert h4 { margin: 0; }
15
+ .alert h4 {
16
+ color: rgba(71,74,84,1);
17
+ margin: 0;
18
+ }
18
19
  .alert p {
19
20
  color: rgba(43,50,53,1);
20
21
  margin-bottom: 0;
@@ -197,33 +197,38 @@ input.btn-block {
197
197
  -webkit-transition: all 0.3s linear;
198
198
  transition: all 0.3s linear;
199
199
  }
200
- .btn-large.btn-outline { padding: 14px 29px 16px 29px; }
201
- .btn-small.btn-outline { padding: 7px 14px 8px 14px; }
202
- .btn-mini.btn-outline { padding: 5px 14px 6px 14px; }
200
+ .btn-outline.btn-large { padding: 14px 29px 16px 29px; }
201
+ .btn-outline.btn-small { padding: 7px 14px 8px 14px; }
202
+ .btn-outline.btn-mini { padding: 5px 14px 6px 14px; }
203
203
  .btn-outline.btn-icon { padding: 10px 12px 9px 12px; }
204
- .btn-large.btn-icon.btn-outline { padding: 11px 13px 11px 13px; }
205
- .btn-small.btn-icon.btn-outline { padding: 6px 7px 6px 6px; }
206
- .btn-mini.btn-icon.btn-outline { padding: 4px 6px 4px 6px; }
207
- .btn-outline-black {
204
+ .btn-outline.btn-large.btn-icon { padding: 11px 13px 11px 13px; }
205
+ .btn-outline.btn-small.btn-icon { padding: 6px 7px 6px 6px; }
206
+ .btn-outline.btn-mini.btn-icon { padding: 4px 6px 4px 6px; }
207
+ .btn-outline.btn-black {
208
208
  border-color: rgba(71,74,84,1);
209
209
  color: rgba(71,74,84,1);
210
210
  }
211
- .btn-outline-blue {
211
+ .btn-outline.btn-black:hover { color: rgba(61,64,74,1); }
212
+ .btn-outline.btn-blue {
212
213
  border-color: rgba(58,144,216,1);
213
214
  color: rgba(58,144,216,1);
214
215
  }
215
- .btn-outline-green {
216
+ .btn-outline.btn-blue:hover { color: rgba(48,134,206,1); }
217
+ .btn-outline.btn-green {
216
218
  border-color: rgba(122,179,23,1);
217
219
  color: rgba(122,179,23,1);
218
220
  }
219
- .btn-outline-red {
221
+ .btn-outline.btn-green:hover { color: rgba(102,159,3,1); }
222
+ .btn-outline.btn-red {
220
223
  border-color: rgba(220,74,56,1);
221
224
  color: rgba(220,74,56,1);
222
225
  }
223
- .btn-outline-white {
226
+ .btn-outline.btn-red:hover { color: rgba(210,64,46,1); }
227
+ .btn-outline.btn-white {
224
228
  border-color: rgba(255,255,255,1);
225
229
  color: rgba(225,255,255,1);
226
230
  }
231
+ .btn-outline.btn-white:hover { color: rgba(226,228,231,1); }
227
232
 
228
233
  /* #Button Styles
229
234
  ================================================== */
@@ -40,15 +40,15 @@
40
40
  margin: 29px 0 10px 0;
41
41
  padding: 0;
42
42
  }
43
- .header-nav li {
43
+ .header-nav > li {
44
44
  color: rgba(255,255,255,1);
45
45
  display: inline-block;
46
46
  font-size: 13px;
47
47
  font-weight: 500;
48
48
  margin-left: 25px;
49
49
  }
50
- .header-nav li:first-child { margin-left: 0; }
51
- .header-nav li a {
50
+ .header-nav > li:first-child { margin-left: 0; }
51
+ .header-nav > li > a {
52
52
  border: 1px solid transparent;
53
53
  border-radius: 2px;
54
54
  color: rgba(255,255,255,1);
@@ -56,25 +56,11 @@
56
56
  padding: 14px 0 13px 0;
57
57
  text-transform: uppercase;
58
58
  }
59
- .header-nav li.bordered a {
59
+ .header-nav > li.bordered > a {
60
60
  border-color: rgba(230,230,230,1);
61
61
  padding: 14px 20px 13px 20px;
62
62
  }
63
- .header-nav li.bordered a:hover { border-color: rgba(255,255,255,1); }
64
- .header-nav .dropdown-menu li {
65
- color: rgba(71,74,84,1);
66
- display: block;
67
- font-size: 12px;
68
- margin-left: 0;
69
- }
70
- .header-nav .dropdown-menu li a {
71
- border: none;
72
- color: rgba(71,74,84,1);
73
- letter-spacing: 0;
74
- padding: 5px 15px;
75
- text-transform: inherit;
76
- }
77
- .header-nav .dropdown-menu li a:hover { color: rgba(58,144,216,1); }
63
+ .header-nav > li.bordered > a:hover { border-color: rgba(255,255,255,1); }
78
64
  .header-user {
79
65
  float: right;
80
66
  margin: 23px 0 0 15px;
@@ -115,11 +101,11 @@
115
101
  .header-alt { background: none; }
116
102
  .header-alt .header-brand a { color: rgba(236,238,241,1); }
117
103
  .header-alt .header-brand a:hover { color: rgba(174,182,192,1); }
118
- .header-alt .header-nav li.bordered a {
104
+ .header-alt .header-nav > li.bordered > a {
119
105
  border-color: rgba(236,238,241,1);
120
106
  color: rgba(224,226,229,1);
121
107
  }
122
- .header-alt .header-nav li.bordered a:hover {
108
+ .header-alt .header-nav > li.bordered > a:hover {
123
109
  border-color: rgba(209,210,214,1);
124
110
  color: rgba(174,182,192,1);
125
111
  }
@@ -6,6 +6,15 @@
6
6
 
7
7
  /* #Image
8
8
  ================================================== */
9
+ img {
10
+ border-radius: 3px;
11
+ border: 0;
12
+ display: block;
13
+ height: auto;
14
+ max-width: 100%;
15
+ vertical-align: middle;
16
+ width: auto\9;
17
+ }
9
18
  .img-placeholder {
10
19
  background: rgba(236,238,241,1);
11
20
  border-radius: 4px;
@@ -27,15 +36,6 @@
27
36
  line-height: 72px;
28
37
  margin: -40px 0 5px 0;
29
38
  }
30
- img {
31
- border-radius: 3px;
32
- border: 0;
33
- display: block;
34
- height: auto;
35
- max-width: 100%;
36
- vertical-align: middle;
37
- width: auto\9;
38
- }
39
39
  .img-circle { border-radius: 500px; }
40
40
  .img-center { margin: 0 auto; }
41
41
 
@@ -23,7 +23,7 @@
23
23
  .badge {
24
24
  border-radius: 500px;
25
25
  padding-right: 6px;
26
- padding-left: 6px;
26
+ padding-left: 6px;
27
27
  }
28
28
  .label:empty,
29
29
  .badge:empty { display: none; }
@@ -10,7 +10,7 @@
10
10
  margin-left: 0;
11
11
  padding: 0;
12
12
  }
13
- .pagination ul li {
13
+ .pagination ul > li {
14
14
  display: inline-block ;
15
15
  font-size: 14px;
16
16
  line-height: 14px;
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flashgrid
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juan Gomez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-21 00:00:00.000000000 Z
11
+ date: 2014-05-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '1.3'
19
+ version: '1.5'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '1.3'
26
+ version: '1.5'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '10.1'
33
+ version: '0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '10.1'
40
+ version: '0'
41
41
  description: Flashgrid is a refreshingly modern responsive web framework for beautiful
42
42
  and faster project development.
43
43
  email: