flashgrid 1.1.2 → 1.2.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: b16b9036a908ae212121eb9dad79b27519764e63
4
- data.tar.gz: 81b9630f195dccab23f65f7be955e7930815c988
3
+ metadata.gz: a4447d9fda69f15f9ddf0107784f3e783950e43b
4
+ data.tar.gz: b40ecbed3d1af08060c506248850a186d170127f
5
5
  SHA512:
6
- metadata.gz: 455238cdb433cc683a43dcae06fa27565a0eeff94ada015aafe30f6d4a120ca2e875d3abdfd7f10613a65e354fbec7405fdc06cfb3df2dcf77709919e43e8a29
7
- data.tar.gz: e2bdd5b580e4f63e8e0c4a8b437edc98d8f9220499b98c77109f95d5f70f5dca863672aef88916445d3ef7d046eefe4fd6d3e4d026c2aa66c39eb00d9ed7ea56
6
+ metadata.gz: 635d39162a5933a9c6761c6e25e2bef154dcf17689dd545d9f8a65d63a5425f5d15bb755cc1cb63ec52dbedfca9a98d8949c96c9d447eae3587c21f4321cf1a0
7
+ data.tar.gz: f8923146e786e62542711a2ffc9a3f1fc7c94a2f41c6a418664bfbc4e8660eea22d5139bfa3353835eaa3054ca37ba4d90ee650725c4b96c641b3c918be26027
@@ -1,3 +1,3 @@
1
1
  module Flashgrid
2
- VERSION = "1.1.2"
2
+ VERSION = "1.2.0"
3
3
  end
@@ -42,17 +42,19 @@
42
42
 
43
43
  this.$element
44
44
  .removeClass('collapse')
45
- .addClass('collapsing')
46
- [dimension](0)
45
+ .addClass('collapsing')[dimension](0)
47
46
 
48
47
  this.transitioning = 1
49
48
 
50
49
  var complete = function (e) {
51
- if (e && e.target != this.$element[0]) return
50
+ if (e && e.target != this.$element[0]) {
51
+ this.$element
52
+ .one($.support.transition.end, $.proxy(complete, this))
53
+ return
54
+ }
52
55
  this.$element
53
56
  .removeClass('collapsing')
54
- .addClass('collapse in')
55
- [dimension]('auto')
57
+ .addClass('collapse in')[dimension]('')
56
58
  this.transitioning = 0
57
59
  this.$element.trigger('shown.bs.collapse')
58
60
  }
@@ -63,8 +65,7 @@
63
65
 
64
66
  this.$element
65
67
  .one($.support.transition.end, $.proxy(complete, this))
66
- .emulateTransitionEnd(350)
67
- [dimension](this.$element[0][scrollSize])
68
+ .emulateTransitionEnd(350)[dimension](this.$element[0][scrollSize])
68
69
  }
69
70
 
70
71
  Collapse.prototype.hide = function () {
@@ -76,9 +77,7 @@
76
77
 
77
78
  var dimension = this.dimension()
78
79
 
79
- this.$element
80
- [dimension](this.$element[dimension]())
81
- [0].offsetHeight
80
+ this.$element[dimension](this.$element[dimension]())[0].offsetHeight
82
81
 
83
82
  this.$element
84
83
  .addClass('collapsing')
@@ -88,7 +87,11 @@
88
87
  this.transitioning = 1
89
88
 
90
89
  var complete = function (e) {
91
- if (e && e.target != this.$element[0]) return
90
+ if (e && e.target != this.$element[0]) {
91
+ this.$element
92
+ .one($.support.transition.end, $.proxy(complete, this))
93
+ return
94
+ }
92
95
  this.transitioning = 0
93
96
  this.$element
94
97
  .trigger('hidden.bs.collapse')
@@ -31,11 +31,11 @@
31
31
 
32
32
  if (e.isDefaultPrevented()) return
33
33
 
34
+ $this.trigger('focus')
35
+
34
36
  $parent
35
37
  .toggleClass('open')
36
38
  .trigger('shown.bs.dropdown', relatedTarget)
37
-
38
- $this.trigger('focus')
39
39
  }
40
40
 
41
41
  return false
@@ -74,6 +74,7 @@
74
74
  }
75
75
 
76
76
  function clearMenus(e) {
77
+ if (e && e.which === 3) return
77
78
  $(backdrop).remove()
78
79
  $(toggle).each(function () {
79
80
  var $parent = getParent($(this))
@@ -5,11 +5,12 @@
5
5
  // ======================
6
6
 
7
7
  var Modal = function (element, options) {
8
- this.options = options
9
- this.$body = $(document.body)
10
- this.$element = $(element)
11
- this.$backdrop =
12
- this.isShown = null
8
+ this.options = options
9
+ this.$body = $(document.body)
10
+ this.$element = $(element)
11
+ this.$backdrop =
12
+ this.isShown = null
13
+ this.scrollbarWidth = 0
13
14
 
14
15
  if (this.options.remote) {
15
16
  this.$element
@@ -40,6 +41,7 @@
40
41
 
41
42
  this.isShown = true
42
43
 
44
+ this.checkScrollbar()
43
45
  this.$body.addClass('modal-open')
44
46
 
45
47
  this.setScrollbar()
@@ -134,7 +136,6 @@
134
136
  var that = this
135
137
  this.$element.hide()
136
138
  this.backdrop(function () {
137
- that.removeBackdrop()
138
139
  that.$element.trigger('hidden.bs.modal')
139
140
  })
140
141
  }
@@ -145,6 +146,7 @@
145
146
  }
146
147
 
147
148
  Modal.prototype.backdrop = function (callback) {
149
+ var that = this
148
150
  var animate = this.$element.hasClass('fade') ? 'fade' : ''
149
151
 
150
152
  if (this.isShown && this.options.backdrop) {
@@ -175,22 +177,29 @@
175
177
  } else if (!this.isShown && this.$backdrop) {
176
178
  this.$backdrop.removeClass('in')
177
179
 
180
+ var callbackRemove = function() {
181
+ that.removeBackdrop()
182
+ callback && callback()
183
+ }
178
184
  $.support.transition && this.$element.hasClass('fade') ?
179
185
  this.$backdrop
180
- .one($.support.transition.end, callback)
186
+ .one($.support.transition.end, callbackRemove)
181
187
  .emulateTransitionEnd(150) :
182
- callback()
188
+ callbackRemove()
183
189
 
184
190
  } else if (callback) {
185
191
  callback()
186
192
  }
187
193
  }
188
194
 
195
+ Modal.prototype.checkScrollbar = function () {
196
+ if (document.body.clientWidth >= window.innerWidth) return
197
+ this.scrollbarWidth = this.scrollbarWidth || this.measureScrollbar()
198
+ }
199
+
189
200
  Modal.prototype.setScrollbar = function () {
190
- if (document.body.clientHeight <= window.innerHeight) return
191
- var scrollbarWidth = this.measureScrollbar()
192
- var bodyPad = parseInt(this.$body.css('padding-right') || 0)
193
- if (scrollbarWidth) this.$body.css('padding-right', bodyPad + scrollbarWidth)
201
+ var bodyPad = parseInt(this.$body.css('padding-right') || 0)
202
+ if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
194
203
  }
195
204
 
196
205
  Modal.prototype.resetScrollbar = function () {
@@ -13,8 +13,8 @@
13
13
  readonly: false,
14
14
  onColor: null,
15
15
  offColor: null,
16
- onText: "On",
17
- offText: "Off",
16
+ onText: "",
17
+ offText: "",
18
18
  labelText: "&nbsp;"
19
19
  };
20
20
 
@@ -185,7 +185,6 @@
185
185
  }
186
186
 
187
187
  Tooltip.prototype.applyPlacement = function (offset, placement) {
188
- var replace
189
188
  var $tip = this.tip()
190
189
  var width = $tip[0].offsetWidth
191
190
  var height = $tip[0].offsetHeight
@@ -17,7 +17,7 @@
17
17
  -moz-appearance: none;
18
18
  background: rgba(236,238,241,1);
19
19
  border: none;
20
- border-bottom: 1px solid rgba(196,198,201,1);
20
+ border-bottom: 2px solid rgba(196,198,201,1);
21
21
  border-radius: 2px;
22
22
  -moz-box-sizing: border-box;
23
23
  box-sizing: border-box;
@@ -33,6 +33,8 @@
33
33
  text-align: center;
34
34
  text-decoration: none;
35
35
  text-rendering: geometricPrecision;
36
+ -webkit-transition: all 0.3s linear;
37
+ transition: all 0.3s linear;
36
38
  vertical-align: middle;
37
39
  }
38
40
  .btn:hover,
@@ -40,14 +42,23 @@
40
42
  .btn[disabled]:hover {
41
43
  background: rgba(226,228,231,1);
42
44
  text-decoration: none;
43
- -webkit-transition: all 0.3s linear;
44
- transition: all 0.3s linear;
45
45
  }
46
46
  .btn[disabled],
47
47
  .btn[disabled]:hover {
48
48
  color: rgba(71,74,84,1);
49
49
  cursor: not-allowed;
50
50
  }
51
+ .btn:active,
52
+ .btn[disabled]:active {
53
+ border-bottom-width: 0;
54
+ -webkit-transform: translateY(2px);
55
+ -moz-transform: translateY(2px);
56
+ -ms-transform: translateY(2px);
57
+ -o-transform: translateY(2px);
58
+ transform: translateY(2px);
59
+ -webkit-transition: all 0.1s linear;
60
+ transition: all 0.1s linear;
61
+ }
51
62
 
52
63
  /* #Button Sizes
53
64
  ================================================== */
@@ -60,7 +71,7 @@
60
71
  .btn-small {
61
72
  font-size: 11px;
62
73
  line-height: 11px;
63
- padding: 7px 15px 9px 15px;
74
+ padding: 7px 15px 8px 15px;
64
75
  }
65
76
  .btn-mini {
66
77
  font-size: 9px;
@@ -176,6 +187,16 @@ input.btn-block {
176
187
  border-color: rgba(199,200,204,1);
177
188
  color: rgba(71,74,84,1);
178
189
  }
190
+ .btn-outline:active {
191
+ border-bottom-width: 1px;
192
+ -webkit-transform: translateY(0px);
193
+ -moz-transform: translateY(0px);
194
+ -ms-transform: translateY(0px);
195
+ -o-transform: translateY(0px);
196
+ transform: translateY(0px);
197
+ -webkit-transition: all 0.3s linear;
198
+ transition: all 0.3s linear;
199
+ }
179
200
  .btn-large.btn-outline { padding: 14px 29px 16px 29px; }
180
201
  .btn-small.btn-outline { padding: 7px 14px 8px 14px; }
181
202
  .btn-mini.btn-outline { padding: 5px 14px 6px 14px; }
@@ -48,7 +48,7 @@ pre {
48
48
  font-style: italic;
49
49
  } /* Comment */
50
50
  .err {
51
- color: rgba(254,79,50,1);
51
+ color: rgba(255,50,50,1);
52
52
  background: rgba(71,74,84,1);
53
53
  } /* Error */
54
54
  .k { color: rgba(58,144,216,1); } /* Keyword */
@@ -65,9 +65,9 @@ pre {
65
65
  color: rgba(58,144,216,1);
66
66
  font-style: italic;
67
67
  } /* Comment.Special */
68
- .gd { color: rgba(254,79,50,1); } /* Generic.Deleted */
68
+ .gd { color: rgba(255,50,50,1); } /* Generic.Deleted */
69
69
  .ge { font-style: italic; } /* Generic.Emph */
70
- .gr { color: rgba(254,79,50,1) } /* Generic.Error */
70
+ .gr { color: rgba(255,50,50,1) } /* Generic.Error */
71
71
  .gh {
72
72
  color: rgba(58,144,216,1);
73
73
  font-weight: bold;
@@ -80,7 +80,7 @@ pre {
80
80
  color: rgba(71,74,84,1);
81
81
  font-weight: bold;
82
82
  } /* Generic.Subheading */
83
- .gt { color: rgba(254,79,50,1); } /* Generic.Traceback */
83
+ .gt { color: rgba(255,50,50,1); } /* Generic.Traceback */
84
84
  .kc { color: rgba(58,144,216,1); } /* Keyword.Constant */
85
85
  .kd { color: rgba(58,144,216,1); } /* Keyword.Declaration */
86
86
  .kn { color: rgba(58,144,216,1); } /* Keyword.Namespace */
@@ -96,10 +96,10 @@ pre {
96
96
  color: rgba(122,179,23,1);
97
97
  text-decoration: underline;
98
98
  } /* Name.Class */
99
- .no { color: rgba(254,79,50,1); } /* Name.Constant */
99
+ .no { color: rgba(255,50,50,1); } /* Name.Constant */
100
100
  .nd { color: rgba(158,171,179,1); } /* Name.Decorator */
101
101
  .ni {
102
- color: rgba(254,79,50,1);
102
+ color: rgba(255,50,50,1);
103
103
  font-weight: bold;
104
104
  } /* Name.Entity */
105
105
  .nf { color: rgba(122,179,23,1); } /* Name.Function */
@@ -111,7 +111,7 @@ pre {
111
111
  color: rgba(58,144,216,1);
112
112
  font-weight: bold;
113
113
  } /* Name.Tag */
114
- .nv { color: rgba(254,79,50,1); } /* Name.Variable */
114
+ .nv { color: rgba(255,50,50,1); } /* Name.Variable */
115
115
  .ow { color: rgba(58,144,216,1); } /* Operator.Word */
116
116
  .w { color: rgba(158,171,179,1); } /* Text.Whitespace */
117
117
  .mf { color: rgba(122,179,23,1); } /* Literal.Number.Float */
@@ -130,7 +130,7 @@ pre {
130
130
  .s1 { color: rgba(58,144,216,1); } /* Literal.String.Single */
131
131
  .ss { color: rgba(58,144,216,1); } /* Literal.String.Symbol */
132
132
  .bp { color: rgba(122,179,23,1); } /* Name.Builtin.Pseudo */
133
- .vc { color: rgba(254,79,50,1); } /* Name.Variable.Class */
134
- .vg { color: rgba(254,79,50,1); } /* Name.Variable.Global */
135
- .vi { color: rgba(254,79,50,1); } /* Name.Variable.Instance */
133
+ .vc { color: rgba(255,50,50,1); } /* Name.Variable.Class */
134
+ .vg { color: rgba(255,50,50,1); } /* Name.Variable.Global */
135
+ .vi { color: rgba(255,50,50,1); } /* Name.Variable.Instance */
136
136
  .il { color: rgba(122,179,23,1); } /* Literal.Number.Integer.Long */
@@ -153,12 +153,12 @@ textarea::-webkit-input-placeholder {
153
153
  input:focus:invalid,
154
154
  textarea:focus:invalid,
155
155
  select:focus:invalid {
156
- border-color: rgba(254,79,50,1);
157
- color: rgba(254,79,50,1);
156
+ border-color: rgba(255,50,50,1);
157
+ color: rgba(255,50,50,1);
158
158
  }
159
159
  input:focus:invalid:focus,
160
160
  textarea:focus:invalid:focus,
161
- select:focus:invalid:focus { border-color: rgba(254,79,50,1); }
161
+ select:focus:invalid:focus { border-color: rgba(255,50,50,1); }
162
162
  input[disabled],
163
163
  textarea[disabled],
164
164
  select[disabled],
@@ -17,5 +17,5 @@ a {
17
17
  .link-blue { color: rgba(58,144,216,1); }
18
18
  .link-gray { color: rgba(158,171,179,1); }
19
19
  .link-green { color: rgba(122,179,23,1); }
20
- .link-red { color: rgba(254,79,50,1); }
20
+ .link-red { color: rgba(255,50,50,1); }
21
21
  .link-white { color: rgba(255,255,255,1); }
@@ -14,7 +14,7 @@ table {
14
14
  border-collapse: collapse;
15
15
  border-spacing: 0;
16
16
  }
17
- fieldset, img { border: 0 }
17
+ fieldset, img { border: 0; }
18
18
  address, caption, cite, code, dfn, th, var {
19
19
  font-style: normal;
20
20
  font-weight: normal;
@@ -24,7 +24,7 @@ h1, h2, h3, h4, h5, h6 {
24
24
  font-size: 100%;
25
25
  font-weight: normal;
26
26
  }
27
- q:before, q:after { content: '';}
27
+ q:before, q:after { content: ''; }
28
28
  abbr, acronym {
29
29
  border-bottom: 1px dotted rgba(0,0,0,1);
30
30
  font-variant: normal;
@@ -39,7 +39,7 @@ button, input, textarea, select {
39
39
  }
40
40
  html,
41
41
  body {
42
- color: rgba(43,50,53,1);
42
+ color: rgba(41,44,54,1);
43
43
  font-family: 'Gotham', 'Helvetica', Helvetica, Arial, sans-serif;
44
44
  -webkit-font-smoothing: antialiased;
45
45
  font-smooth: always;
@@ -14,12 +14,13 @@ table {
14
14
  .table { width: 100%; }
15
15
  .table th,
16
16
  .table td {
17
+ background: rgba(255,255,255,1);
17
18
  border-top: 1px solid rgba(217,222,225,1);
18
19
  font-size: 16px;
19
20
  line-height: 25px;
20
21
  padding: 9px 10px 6px 10px;
21
22
  text-align: left;
22
- vertical-align: top;
23
+ vertical-align: middle;
23
24
  }
24
25
  .table th {
25
26
  background: rgba(236,238,241,1);
@@ -145,7 +145,7 @@ blockquote small { color: rgba(158,171,179,1); }
145
145
  .text-blue { color: rgba(58,144,216,1); }
146
146
  .text-gray { color: rgba(158,171,179,1); }
147
147
  .text-green { color: rgba(122,179,23,1); }
148
- .text-red { color: rgba(254,79,50,1); }
148
+ .text-red { color: rgba(255,50,50,1); }
149
149
  .text-white { color: rgba(255,255,255,1); }
150
150
 
151
151
  /* #Scripts
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.1.2
4
+ version: 1.2.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-04 00:00:00.000000000 Z
11
+ date: 2014-04-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler