less-rails-bootstrap 2.0.12 → 2.0.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) hide show
  1. data/.travis.yml +2 -0
  2. data/CHANGELOG.md +5 -0
  3. data/lib/less/rails/bootstrap/version.rb +1 -1
  4. data/vendor/assets/javascripts/twitter/bootstrap/alert.js +1 -1
  5. data/vendor/assets/javascripts/twitter/bootstrap/button.js +1 -1
  6. data/vendor/assets/javascripts/twitter/bootstrap/carousel.js +1 -1
  7. data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +2 -2
  8. data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +1 -1
  9. data/vendor/assets/javascripts/twitter/bootstrap/modal.js +1 -1
  10. data/vendor/assets/javascripts/twitter/bootstrap/popover.js +1 -1
  11. data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js +2 -2
  12. data/vendor/assets/javascripts/twitter/bootstrap/tab.js +1 -1
  13. data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js +3 -3
  14. data/vendor/assets/javascripts/twitter/bootstrap/transition.js +1 -1
  15. data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +2 -2
  16. data/vendor/frameworks/twitter/bootstrap/bootstrap.less +1 -1
  17. data/vendor/frameworks/twitter/bootstrap/close.less +2 -2
  18. data/vendor/frameworks/twitter/bootstrap/code.less +1 -1
  19. data/vendor/frameworks/twitter/bootstrap/component-animations.less +2 -2
  20. data/vendor/frameworks/twitter/bootstrap/dropdowns.less +3 -3
  21. data/vendor/frameworks/twitter/bootstrap/forms.less +91 -92
  22. data/vendor/frameworks/twitter/bootstrap/grid.less +1 -1
  23. data/vendor/frameworks/twitter/bootstrap/layouts.less +1 -1
  24. data/vendor/frameworks/twitter/bootstrap/mixins.less +20 -5
  25. data/vendor/frameworks/twitter/bootstrap/navbar.less +3 -9
  26. data/vendor/frameworks/twitter/bootstrap/pager.less +1 -1
  27. data/vendor/frameworks/twitter/bootstrap/reset.less +5 -0
  28. data/vendor/frameworks/twitter/bootstrap/responsive-1200px-min.less +3 -0
  29. data/vendor/frameworks/twitter/bootstrap/responsive-768px-979px.less +2 -0
  30. data/vendor/frameworks/twitter/bootstrap/responsive-navbar.less +10 -3
  31. data/vendor/frameworks/twitter/bootstrap/responsive.less +1 -1
  32. data/vendor/frameworks/twitter/bootstrap/thumbnails.less +3 -0
  33. data/vendor/frameworks/twitter/bootstrap/type.less +1 -4
  34. data/vendor/frameworks/twitter/bootstrap/variables.less +2 -1
  35. metadata +49 -82
data/.travis.yml CHANGED
@@ -3,3 +3,5 @@ rvm:
3
3
  - 1.9.2
4
4
  - 1.9.3
5
5
  - ree
6
+ - jruby-18mode
7
+ - jruby-19mode
data/CHANGELOG.md CHANGED
@@ -1,6 +1,11 @@
1
1
  CHANGELOG
2
2
  =========
3
3
 
4
+ 2.0.13 - 06/07/2012
5
+
6
+ * Update to bootstrap 2.0.4.
7
+
8
+
4
9
  2.0.12 - 04/25/2012
5
10
 
6
11
  * Work with latest less.rb v2.2.1.
@@ -1,7 +1,7 @@
1
1
  module Less
2
2
  module Rails
3
3
  module Bootstrap
4
- VERSION = "2.0.12"
4
+ VERSION = "2.0.13"
5
5
  end
6
6
  end
7
7
  end
@@ -1,5 +1,5 @@
1
1
  /* ==========================================================
2
- * bootstrap-alert.js v2.0.3
2
+ * bootstrap-alert.js v2.0.4
3
3
  * http://twitter.github.com/bootstrap/javascript.html#alerts
4
4
  * ==========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* ============================================================
2
- * bootstrap-button.js v2.0.3
2
+ * bootstrap-button.js v2.0.4
3
3
  * http://twitter.github.com/bootstrap/javascript.html#buttons
4
4
  * ============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* ==========================================================
2
- * bootstrap-carousel.js v2.0.3
2
+ * bootstrap-carousel.js v2.0.4
3
3
  * http://twitter.github.com/bootstrap/javascript.html#carousel
4
4
  * ==========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-collapse.js v2.0.3
2
+ * bootstrap-collapse.js v2.0.4
3
3
  * http://twitter.github.com/bootstrap/javascript.html#collapse
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -95,7 +95,7 @@
95
95
  , transition: function (method, startEvent, completeEvent) {
96
96
  var that = this
97
97
  , complete = function () {
98
- if (startEvent == 'show') that.reset()
98
+ if (startEvent.type == 'show') that.reset()
99
99
  that.transitioning = 0
100
100
  that.$element.trigger(completeEvent)
101
101
  }
@@ -1,5 +1,5 @@
1
1
  /* ============================================================
2
- * bootstrap-dropdown.js v2.0.3
2
+ * bootstrap-dropdown.js v2.0.4
3
3
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
4
4
  * ============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* =========================================================
2
- * bootstrap-modal.js v2.0.3
2
+ * bootstrap-modal.js v2.0.4
3
3
  * http://twitter.github.com/bootstrap/javascript.html#modals
4
4
  * =========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* ===========================================================
2
- * bootstrap-popover.js v2.0.3
2
+ * bootstrap-popover.js v2.0.4
3
3
  * http://twitter.github.com/bootstrap/javascript.html#popovers
4
4
  * ===========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-scrollspy.js v2.0.3
2
+ * bootstrap-scrollspy.js v2.0.4
3
3
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -35,7 +35,7 @@
35
35
  this.selector = (this.options.target
36
36
  || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
37
37
  || '') + ' .nav li > a'
38
- this.$body = $('body').on('click.scroll.data-api', this.selector, process)
38
+ this.$body = $('body')
39
39
  this.refresh()
40
40
  this.process()
41
41
  }
@@ -1,5 +1,5 @@
1
1
  /* ========================================================
2
- * bootstrap-tab.js v2.0.3
2
+ * bootstrap-tab.js v2.0.4
3
3
  * http://twitter.github.com/bootstrap/javascript.html#tabs
4
4
  * ========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* ===========================================================
2
- * bootstrap-tooltip.js v2.0.3
2
+ * bootstrap-tooltip.js v2.0.4
3
3
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
4
4
  * Inspired by the original jQuery.tipsy by Jason Frame
5
5
  * ===========================================================
@@ -84,9 +84,9 @@
84
84
  , leave: function (e) {
85
85
  var self = $(e.currentTarget)[this.type](this._options).data(this.type)
86
86
 
87
+ if (this.timeout) clearTimeout(this.timeout)
87
88
  if (!self.options.delay || !self.options.delay.hide) return self.hide()
88
89
 
89
- clearTimeout(this.timeout)
90
90
  self.hoverState = 'out'
91
91
  this.timeout = setTimeout(function() {
92
92
  if (self.hoverState == 'out') self.hide()
@@ -272,4 +272,4 @@
272
272
  , delay: 0
273
273
  }
274
274
 
275
- }(window.jQuery);
275
+ }(window.jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ===================================================
2
- * bootstrap-transition.js v2.0.3
2
+ * bootstrap-transition.js v2.0.4
3
3
  * http://twitter.github.com/bootstrap/javascript.html#transitions
4
4
  * ===================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-typeahead.js v2.0.3
2
+ * bootstrap-typeahead.js v2.0.4
3
3
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -56,7 +56,7 @@
56
56
  }
57
57
 
58
58
  , show: function () {
59
- var pos = $.extend({}, this.$element.position(), {
59
+ var pos = $.extend({}, this.$element.offset(), {
60
60
  height: this.$element[0].offsetHeight
61
61
  })
62
62
 
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap v2.0.3
2
+ * Bootstrap v2.0.4
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -23,7 +23,7 @@
23
23
  button.close {
24
24
  padding: 0;
25
25
  cursor: pointer;
26
- background-color: transparent;
26
+ background: transparent;
27
27
  border: 0;
28
28
  -webkit-appearance: none;
29
- }
29
+ }
@@ -54,4 +54,4 @@ pre {
54
54
  .pre-scrollable {
55
55
  max-height: 340px;
56
56
  overflow-y: scroll;
57
- }
57
+ }
@@ -10,9 +10,9 @@
10
10
  }
11
11
 
12
12
  .collapse {
13
- position:relative;
13
+ position: relative;
14
14
  height: 0;
15
- overflow:hidden;
15
+ overflow: hidden;
16
16
  .transition(height .35s ease);
17
17
  &.in {
18
18
  height: auto;
@@ -71,7 +71,7 @@
71
71
 
72
72
  // Dividers (basically an hr) within the dropdown
73
73
  .divider {
74
- .nav-divider();
74
+ .nav-divider(@dropdownDividerTop, @dropdownDividerBottom);
75
75
  }
76
76
 
77
77
  // Links within the dropdown menu
@@ -103,14 +103,14 @@
103
103
  // make the menu appear below buttons that appeared later on the page
104
104
  *z-index: @zindexDropdown;
105
105
 
106
- .dropdown-menu {
106
+ & > .dropdown-menu {
107
107
  display: block;
108
108
  }
109
109
  }
110
110
 
111
111
  // Right aligned dropdowns
112
112
  // ---------------------------
113
- .pull-right .dropdown-menu {
113
+ .pull-right > .dropdown-menu {
114
114
  right: 0;
115
115
  left: auto;
116
116
  }
@@ -27,7 +27,7 @@ legend {
27
27
  line-height: @baseLineHeight * 2;
28
28
  color: @grayDark;
29
29
  border: 0;
30
- border-bottom: 1px solid #eee;
30
+ border-bottom: 1px solid #e5e5e5;
31
31
 
32
32
  // Small
33
33
  small {
@@ -55,72 +55,101 @@ textarea {
55
55
  label {
56
56
  display: block;
57
57
  margin-bottom: 5px;
58
- color: @grayDark;
59
58
  }
60
59
 
61
- // Inputs, Textareas, Selects
62
- input,
63
- textarea,
60
+ // Form controls
61
+ // -------------------------
62
+
63
+ // Shared size and type resets
64
64
  select,
65
+ textarea,
66
+ input[type="text"],
67
+ input[type="password"],
68
+ input[type="datetime"],
69
+ input[type="datetime-local"],
70
+ input[type="date"],
71
+ input[type="month"],
72
+ input[type="time"],
73
+ input[type="week"],
74
+ input[type="number"],
75
+ input[type="email"],
76
+ input[type="url"],
77
+ input[type="search"],
78
+ input[type="tel"],
79
+ input[type="color"],
65
80
  .uneditable-input {
66
81
  display: inline-block;
67
- width: 210px;
68
82
  height: @baseLineHeight;
69
83
  padding: 4px;
70
84
  margin-bottom: 9px;
71
85
  font-size: @baseFontSize;
72
86
  line-height: @baseLineHeight;
73
87
  color: @gray;
74
- background-color: @inputBackground;
75
- border: 1px solid @inputBorder;
76
- .border-radius(@inputBorderRadius);
77
88
  }
78
- .uneditable-textarea {
79
- width: auto;
89
+
90
+ // Reset appearance properties for textual inputs and textarea
91
+ // Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
92
+ input,
93
+ textarea {
94
+ width: 210px;
95
+ }
96
+ // Reset height since textareas have rows
97
+ textarea {
80
98
  height: auto;
81
99
  }
100
+ // Everything else
101
+ textarea,
102
+ input[type="text"],
103
+ input[type="password"],
104
+ input[type="datetime"],
105
+ input[type="datetime-local"],
106
+ input[type="date"],
107
+ input[type="month"],
108
+ input[type="time"],
109
+ input[type="week"],
110
+ input[type="number"],
111
+ input[type="email"],
112
+ input[type="url"],
113
+ input[type="search"],
114
+ input[type="tel"],
115
+ input[type="color"],
116
+ .uneditable-input {
117
+ background-color: @inputBackground;
118
+ border: 1px solid @inputBorder;
119
+ .border-radius(@inputBorderRadius);
120
+ .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
121
+ @transition: border linear .2s, box-shadow linear .2s;
122
+ .transition(@transition);
82
123
 
83
- // Inputs within a label
84
- label input,
85
- label textarea,
86
- label select {
87
- display: block;
124
+ // Focus state
125
+ &:focus {
126
+ border-color: rgba(82,168,236,.8);
127
+ outline: 0;
128
+ outline: thin dotted \9; /* IE6-9 */
129
+ .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
130
+ }
88
131
  }
89
132
 
90
- // Mini reset for unique input types
91
- input[type="image"],
92
- input[type="checkbox"],
93
- input[type="radio"] {
94
- width: auto;
95
- height: auto;
96
- padding: 0;
133
+ // Position radios and checkboxes better
134
+ input[type="radio"],
135
+ input[type="checkbox"] {
97
136
  margin: 3px 0;
98
137
  *margin-top: 0; /* IE7 */
99
138
  line-height: normal;
100
139
  cursor: pointer;
101
- background-color: transparent;
102
- border: 0 \9; /* IE9 and down */
103
- .border-radius(0);
104
- }
105
- input[type="image"] {
106
- border: 0;
107
140
  }
108
141
 
109
- // Reset the file input to browser defaults
110
- input[type="file"] {
111
- width: auto;
112
- padding: initial;
113
- line-height: initial;
114
- background-color: @inputBackground;
115
- background-color: initial;
116
- border: initial;
117
- .box-shadow(none);
142
+ // Reset width of input buttons, radios, checkboxes
143
+ input[type="submit"],
144
+ input[type="reset"],
145
+ input[type="button"],
146
+ input[type="radio"],
147
+ input[type="checkbox"] {
148
+ width: auto; // Override of generic input selector
118
149
  }
119
150
 
120
- // Help out input buttons
121
- input[type="button"],
122
- input[type="reset"],
123
- input[type="submit"] {
151
+ // Make uneditable textareas behave like a textarea
152
+ .uneditable-textarea {
124
153
  width: auto;
125
154
  height: auto;
126
155
  }
@@ -133,15 +162,10 @@ input[type="file"] {
133
162
  line-height: 28px;
134
163
  }
135
164
 
136
- // Reset line-height for IE
137
- input[type="file"] {
138
- line-height: 18px \9;
139
- }
140
-
141
- // Chrome on Linux and Mobile Safari need background-color
165
+ // Make select elements obey height by applying a border
142
166
  select {
143
167
  width: 220px; // default input width + 10px of padding that doesn't get applied
144
- background-color: @inputBackground;
168
+ border: 1px solid #bbb;
145
169
  }
146
170
 
147
171
  // Make multiple select elements height not fixed
@@ -150,19 +174,12 @@ select[size] {
150
174
  height: auto;
151
175
  }
152
176
 
153
- // Remove shadow from image inputs
154
- input[type="image"] {
155
- .box-shadow(none);
156
- }
157
-
158
- // Make textarea height behave
159
- textarea {
160
- height: auto;
161
- }
162
-
163
- // Hidden inputs
164
- input[type="hidden"] {
165
- display: none;
177
+ // Focus for select, file, radio, and checkbox
178
+ select:focus,
179
+ input[type="file"]:focus,
180
+ input[type="radio"]:focus,
181
+ input[type="checkbox"]:focus {
182
+ .tab-focus();
166
183
  }
167
184
 
168
185
 
@@ -204,32 +221,6 @@ input[type="hidden"] {
204
221
 
205
222
 
206
223
 
207
- // FOCUS STATE
208
- // -----------
209
-
210
- input,
211
- textarea {
212
- .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
213
- @transition: border linear .2s, box-shadow linear .2s;
214
- .transition(@transition);
215
- }
216
- input:focus,
217
- textarea:focus {
218
- border-color: rgba(82,168,236,.8);
219
- outline: 0;
220
- outline: thin dotted \9; /* IE6-9 */
221
- .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
222
- }
223
- input[type="file"]:focus,
224
- input[type="radio"]:focus,
225
- input[type="checkbox"]:focus,
226
- select:focus {
227
- .tab-focus();
228
- .box-shadow(none); // override for file inputs
229
- }
230
-
231
-
232
-
233
224
  // INPUT SIZES
234
225
  // -----------
235
226
 
@@ -254,14 +245,22 @@ textarea[class*="span"],
254
245
  float: none;
255
246
  margin-left: 0;
256
247
  }
248
+ // Ensure input-prepend/append never wraps
249
+ .input-append input[class*="span"],
250
+ .input-append .uneditable-input[class*="span"],
251
+ .input-prepend input[class*="span"],
252
+ .input-prepend .uneditable-input[class*="span"],
253
+ .row-fluid .input-prepend [class*="span"],
254
+ .row-fluid .input-append [class*="span"] {
255
+ display: inline-block;
256
+ }
257
257
 
258
258
 
259
259
 
260
260
  // GRID SIZING FOR INPUTS
261
261
  // ----------------------
262
262
 
263
- #grid > .input (@gridColumnWidth, @gridGutterWidth);
264
-
263
+ #grid > .input(@gridColumnWidth, @gridGutterWidth);
265
264
 
266
265
 
267
266
 
@@ -329,7 +328,7 @@ select:focus:required:invalid {
329
328
  margin-top: @baseLineHeight;
330
329
  margin-bottom: @baseLineHeight;
331
330
  background-color: @formActionsBackground;
332
- border-top: 1px solid #ddd;
331
+ border-top: 1px solid #e5e5e5;
333
332
  .clearfix(); // Adding clearfix to allow for .pull-right button containers
334
333
  }
335
334
 
@@ -344,7 +343,7 @@ select:focus:required:invalid {
344
343
  }
345
344
 
346
345
  // Placeholder text gets special styles; can't be bundled together though for some reason
347
- .placeholder(@grayLight);
346
+ .placeholder();
348
347
 
349
348
 
350
349
 
@@ -2,4 +2,4 @@
2
2
  #grid > .core(@gridColumnWidth, @gridGutterWidth);
3
3
 
4
4
  // Fluid (940px)
5
- #grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
5
+ #grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
@@ -14,4 +14,4 @@
14
14
  padding-right: @gridGutterWidth;
15
15
  padding-left: @gridGutterWidth;
16
16
  .clearfix();
17
- }
17
+ }
@@ -81,10 +81,13 @@
81
81
  // Placeholder text
82
82
  // -------------------------
83
83
  .placeholder(@color: @placeholderText) {
84
- :-moz-placeholder {
84
+ &:-moz-placeholder {
85
85
  color: @color;
86
86
  }
87
- ::-webkit-input-placeholder {
87
+ &:-ms-input-placeholder {
88
+ color: @color;
89
+ }
90
+ &::-webkit-input-placeholder {
88
91
  color: @color;
89
92
  }
90
93
  }
@@ -166,6 +169,8 @@
166
169
  color: @textColor;
167
170
  }
168
171
  // Style inputs accordingly
172
+ .checkbox,
173
+ .radio,
169
174
  input,
170
175
  select,
171
176
  textarea {
@@ -312,6 +317,16 @@
312
317
  column-gap: @columnGap;
313
318
  }
314
319
 
320
+ // Optional hyphenation
321
+ .hyphens(@mode: auto) {
322
+ word-wrap: break-word;
323
+ -webkit-hyphens: @mode;
324
+ -moz-hyphens: @mode;
325
+ -ms-hyphens: @mode;
326
+ -o-hyphens: @mode;
327
+ hyphens: @mode;
328
+ }
329
+
315
330
  // Opacity
316
331
  .opacity(@opacity) {
317
332
  opacity: @opacity / 100;
@@ -417,7 +432,7 @@
417
432
  // Horizontal dividers
418
433
  // -------------------------
419
434
  // Dividers (basically an hr) within dropdowns and nav lists
420
- .nav-divider() {
435
+ .nav-divider(@top: #e5e5e5, @bottom: @white) {
421
436
  // IE7 needs a set width since we gave a height. Restricting just
422
437
  // to IE7 to keep the 1px left/right space in other browsers.
423
438
  // It is unclear where IE is getting the extra space that we need
@@ -427,8 +442,8 @@
427
442
  margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
428
443
  *margin: -5px 0 5px;
429
444
  overflow: hidden;
430
- background-color: #e5e5e5;
431
- border-bottom: 1px solid @white;
445
+ background-color: @top;
446
+ border-bottom: 1px solid @bottom;
432
447
  }
433
448
 
434
449
  // Button backgrounds
@@ -120,16 +120,10 @@
120
120
  color: @white;
121
121
  background-color: @navbarSearchBackground;
122
122
  border: 1px solid @navbarSearchBorder;
123
- .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15)");
123
+ .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
124
124
  .transition(none);
125
125
 
126
- // Placeholder text gets special styles; can't be a grouped selector
127
- &:-moz-placeholder {
128
- color: @navbarSearchPlaceholderColor;
129
- }
130
- &::-webkit-input-placeholder {
131
- color: @navbarSearchPlaceholderColor;
132
- }
126
+ .placeholder(@navbarSearchPlaceholderColor);
133
127
 
134
128
  // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
135
129
  &:focus,
@@ -361,4 +355,4 @@
361
355
  left: auto;
362
356
  right: 13px;
363
357
  }
364
- }
358
+ }
@@ -33,4 +33,4 @@
33
33
  color: @grayLight;
34
34
  background-color: #fff;
35
35
  cursor: default;
36
- }
36
+ }
@@ -81,6 +81,11 @@ img {
81
81
  -ms-interpolation-mode: bicubic;
82
82
  }
83
83
 
84
+ // Prevent max-width from affecting Google Maps
85
+ #map_canvas img {
86
+ max-width: none;
87
+ }
88
+
84
89
  // Forms
85
90
  // -------------------------
86
91
 
@@ -16,6 +16,9 @@
16
16
  .thumbnails {
17
17
  margin-left: -30px;
18
18
  }
19
+ .thumbnails > li {
20
+ margin-left: 30px;
21
+ }
19
22
  .row-fluid .thumbnails {
20
23
  margin-left: 0;
21
24
  }
@@ -12,4 +12,6 @@
12
12
  // Input grid
13
13
  #grid > .input(42px, 20px);
14
14
 
15
+ // No need to reset .thumbnails here since it's the same @gridGutterWidth
16
+
15
17
  }
@@ -9,11 +9,18 @@
9
9
  padding-top: 0;
10
10
  }
11
11
  // Unfix the navbar
12
- .navbar-fixed-top {
12
+ .navbar-fixed-top,
13
+ .navbar-fixed-bottom {
13
14
  position: static;
15
+ }
16
+ .navbar-fixed-top {
14
17
  margin-bottom: @baseLineHeight;
15
18
  }
16
- .navbar-fixed-top .navbar-inner {
19
+ .navbar-fixed-bottom {
20
+ margin-top: @baseLineHeight;
21
+ }
22
+ .navbar-fixed-top .navbar-inner,
23
+ .navbar-fixed-bottom .navbar-inner {
17
24
  padding: 5px;
18
25
  }
19
26
  .navbar .container {
@@ -143,4 +150,4 @@
143
150
  height: auto !important;
144
151
  overflow: visible !important;
145
152
  }
146
- }
153
+ }
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap Responsive v2.0.3
2
+ * Bootstrap Responsive v2.0.4
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -1,5 +1,6 @@
1
1
  // THUMBNAILS
2
2
  // ----------
3
+ // Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
3
4
 
4
5
  // Make wrapper ul behave like the grid
5
6
  .thumbnails {
@@ -14,7 +15,9 @@
14
15
 
15
16
  // Float li to make thumbnails appear in a row
16
17
  .thumbnails > li {
18
+ float: left; // Explicity set the float since we don't require .span* classes
17
19
  margin-bottom: @baseLineHeight;
20
+ margin-left: @gridGutterWidth;
18
21
  }
19
22
 
20
23
  // The actual thumbnail (can be `a` or `div`)
@@ -8,9 +8,6 @@
8
8
 
9
9
  p {
10
10
  margin: 0 0 @baseLineHeight / 2;
11
- font-family: @baseFontFamily;
12
- font-size: @baseFontSize;
13
- line-height: @baseLineHeight;
14
11
  small {
15
12
  font-size: @baseFontSize - 2;
16
13
  color: @grayLight;
@@ -171,7 +168,7 @@ em {
171
168
  // Abbreviations and acronyms
172
169
  abbr[title] {
173
170
  cursor: help;
174
- border-bottom: 1px dotted #ddd;
171
+ border-bottom: 1px dotted @grayLight;
175
172
  }
176
173
  abbr.initialism {
177
174
  font-size: 90%;
@@ -107,7 +107,8 @@
107
107
  @dropdownLinkColor: @grayDark;
108
108
  @dropdownLinkColorHover: @white;
109
109
  @dropdownLinkBackgroundHover: @linkColor;
110
-
110
+ @dropdownDividerTop: #e5e5e5;
111
+ @dropdownDividerBottom: @white;
111
112
 
112
113
 
113
114
 
metadata CHANGED
@@ -1,91 +1,67 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: less-rails-bootstrap
3
- version: !ruby/object:Gem::Version
4
- hash: 23
3
+ version: !ruby/object:Gem::Version
4
+ version: 2.0.13
5
5
  prerelease:
6
- segments:
7
- - 2
8
- - 0
9
- - 12
10
- version: 2.0.12
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Ken Collins
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2012-04-25 00:00:00 Z
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
12
+ date: 2012-06-07 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
21
15
  name: less-rails
22
- prerelease: false
23
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: &70134891370920 !ruby/object:Gem::Requirement
24
17
  none: false
25
- requirements:
18
+ requirements:
26
19
  - - ~>
27
- - !ruby/object:Gem::Version
28
- hash: 7
29
- segments:
30
- - 2
31
- - 2
32
- - 0
20
+ - !ruby/object:Gem::Version
33
21
  version: 2.2.0
34
22
  type: :runtime
35
- version_requirements: *id001
36
- - !ruby/object:Gem::Dependency
37
- name: minitest
38
23
  prerelease: false
39
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: *70134891370920
25
+ - !ruby/object:Gem::Dependency
26
+ name: minitest
27
+ requirement: &70134891370480 !ruby/object:Gem::Requirement
40
28
  none: false
41
- requirements:
42
- - - ">="
43
- - !ruby/object:Gem::Version
44
- hash: 3
45
- segments:
46
- - 0
47
- version: "0"
29
+ requirements:
30
+ - - ! '>='
31
+ - !ruby/object:Gem::Version
32
+ version: '0'
48
33
  type: :development
49
- version_requirements: *id002
50
- - !ruby/object:Gem::Dependency
51
- name: guard-minitest
52
34
  prerelease: false
53
- requirement: &id003 !ruby/object:Gem::Requirement
35
+ version_requirements: *70134891370480
36
+ - !ruby/object:Gem::Dependency
37
+ name: guard-minitest
38
+ requirement: &70134891369960 !ruby/object:Gem::Requirement
54
39
  none: false
55
- requirements:
56
- - - ">="
57
- - !ruby/object:Gem::Version
58
- hash: 3
59
- segments:
60
- - 0
61
- version: "0"
40
+ requirements:
41
+ - - ! '>='
42
+ - !ruby/object:Gem::Version
43
+ version: '0'
62
44
  type: :development
63
- version_requirements: *id003
64
- - !ruby/object:Gem::Dependency
65
- name: rails
66
45
  prerelease: false
67
- requirement: &id004 !ruby/object:Gem::Requirement
46
+ version_requirements: *70134891369960
47
+ - !ruby/object:Gem::Dependency
48
+ name: rails
49
+ requirement: &70134891369460 !ruby/object:Gem::Requirement
68
50
  none: false
69
- requirements:
51
+ requirements:
70
52
  - - ~>
71
- - !ruby/object:Gem::Version
72
- hash: 5
73
- segments:
74
- - 3
75
- - 1
76
- version: "3.1"
53
+ - !ruby/object:Gem::Version
54
+ version: '3.1'
77
55
  type: :development
78
- version_requirements: *id004
56
+ prerelease: false
57
+ version_requirements: *70134891369460
79
58
  description: CSS toolkit from Twitter For Rails 3.1 Asset Pipeline. Best one of all!
80
- email:
59
+ email:
81
60
  - ken@metaskills.net
82
61
  executables: []
83
-
84
62
  extensions: []
85
-
86
63
  extra_rdoc_files: []
87
-
88
- files:
64
+ files:
89
65
  - .gitignore
90
66
  - .travis.yml
91
67
  - CHANGELOG.md
@@ -171,38 +147,29 @@ files:
171
147
  - vendor/frameworks/twitter/bootstrap/wells.less
172
148
  homepage: http://github.com/metaskills/less-rails-bootstrap
173
149
  licenses: []
174
-
175
150
  post_install_message:
176
151
  rdoc_options: []
177
-
178
- require_paths:
152
+ require_paths:
179
153
  - lib
180
- required_ruby_version: !ruby/object:Gem::Requirement
154
+ required_ruby_version: !ruby/object:Gem::Requirement
181
155
  none: false
182
- requirements:
183
- - - ">="
184
- - !ruby/object:Gem::Version
185
- hash: 3
186
- segments:
187
- - 0
188
- version: "0"
189
- required_rubygems_version: !ruby/object:Gem::Requirement
156
+ requirements:
157
+ - - ! '>='
158
+ - !ruby/object:Gem::Version
159
+ version: '0'
160
+ required_rubygems_version: !ruby/object:Gem::Requirement
190
161
  none: false
191
- requirements:
192
- - - ">="
193
- - !ruby/object:Gem::Version
194
- hash: 3
195
- segments:
196
- - 0
197
- version: "0"
162
+ requirements:
163
+ - - ! '>='
164
+ - !ruby/object:Gem::Version
165
+ version: '0'
198
166
  requirements: []
199
-
200
167
  rubyforge_project:
201
168
  rubygems_version: 1.8.17
202
169
  signing_key:
203
170
  specification_version: 3
204
171
  summary: CSS toolkit from Twitter For Rails 3.1 Asset Pipeline
205
- test_files:
172
+ test_files:
206
173
  - test/cases/engine_spec.rb
207
174
  - test/cases/usage_css_spec.rb
208
175
  - test/cases/usage_js_spec.rb