bootstrapped 2.0.3 → 2.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. data/bootstrapped.gemspec +0 -1
  2. data/lib/bootstrapped/version.rb +2 -2
  3. data/vendor/assets/images/glyphicons-halflings-white.png +0 -0
  4. data/vendor/assets/images/glyphicons-halflings.png +0 -0
  5. data/vendor/assets/javascripts/bootstrap-alert.js +1 -1
  6. data/vendor/assets/javascripts/bootstrap-button.js +1 -1
  7. data/vendor/assets/javascripts/bootstrap-carousel.js +1 -1
  8. data/vendor/assets/javascripts/bootstrap-collapse.js +1 -1
  9. data/vendor/assets/javascripts/bootstrap-dropdown.js +1 -1
  10. data/vendor/assets/javascripts/bootstrap-modal.js +1 -1
  11. data/vendor/assets/javascripts/bootstrap-popover.js +1 -1
  12. data/vendor/assets/javascripts/bootstrap-scrollspy.js +2 -2
  13. data/vendor/assets/javascripts/bootstrap-tab.js +1 -1
  14. data/vendor/assets/javascripts/bootstrap-tooltip.js +3 -3
  15. data/vendor/assets/javascripts/bootstrap-transition.js +1 -1
  16. data/vendor/assets/javascripts/bootstrap-typeahead.js +2 -2
  17. data/vendor/assets/stylesheets/twitter/bootstrap/static/bootstrap-responsive.css +10 -3
  18. data/vendor/assets/stylesheets/twitter/bootstrap/static/bootstrap.css +128 -105
  19. data/vendor/less/twitter/bootstrap/less/bootstrap.less +1 -1
  20. data/vendor/less/twitter/bootstrap/less/component-animations.less +3 -3
  21. data/vendor/less/twitter/bootstrap/less/dropdowns.less +3 -3
  22. data/vendor/less/twitter/bootstrap/less/forms.less +91 -92
  23. data/vendor/less/twitter/bootstrap/less/mixins.less +20 -5
  24. data/vendor/less/twitter/bootstrap/less/navbar.less +2 -8
  25. data/vendor/less/twitter/bootstrap/less/reset.less +5 -0
  26. data/vendor/less/twitter/bootstrap/less/responsive-navbar.less +9 -2
  27. data/vendor/less/twitter/bootstrap/less/responsive.less +1 -1
  28. data/vendor/less/twitter/bootstrap/less/tests/css-tests.css +52 -0
  29. data/vendor/less/twitter/bootstrap/less/tests/css-tests.html +917 -0
  30. data/vendor/less/twitter/bootstrap/less/tests/forms.html +179 -0
  31. data/vendor/less/twitter/bootstrap/less/tests/navbar.html +108 -0
  32. data/vendor/less/twitter/bootstrap/less/type.less +1 -4
  33. data/vendor/less/twitter/bootstrap/less/variables.less +2 -1
  34. metadata +24 -31
@@ -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
@@ -2,10 +2,10 @@
2
2
  // --------------------
3
3
 
4
4
  .fade {
5
- .opacity(0);
5
+ opacity: 0;
6
6
  .transition(opacity .15s linear);
7
7
  &.in {
8
- .opacity(100);
8
+ opacity: 1;
9
9
  }
10
10
  }
11
11
 
@@ -17,4 +17,4 @@
17
17
  &.in {
18
18
  height: auto;
19
19
  }
20
- }
20
+ }
@@ -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
 
@@ -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,
@@ -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
 
@@ -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 {
@@ -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
@@ -0,0 +1,52 @@
1
+ /*!
2
+ * Bootstrap CSS Tests
3
+ */
4
+
5
+
6
+ /* Remove background image */
7
+ body {
8
+ background-image: none;
9
+ }
10
+
11
+ /* Space out subhead */
12
+ .subhead {
13
+ margin-bottom: 36px;
14
+ }
15
+ h4 {
16
+ margin-bottom: 5px;
17
+ }
18
+
19
+
20
+ /* colgroup tests */
21
+ .col1 {
22
+ background-color: rgba(255,0,0,.1);
23
+ }
24
+ .col2 {
25
+ background-color: rgba(0,255,0,.1);
26
+ }
27
+ .col3 {
28
+ background-color: rgba(0,0,255,.1);
29
+ }
30
+
31
+
32
+ /* Fluid row inputs */
33
+ #rowInputs .row > [class*=span],
34
+ #fluidRowInputs .row-fluid > [class*=span] {
35
+ background-color: rgba(255,0,0,.1);
36
+ }
37
+
38
+
39
+ /* Fluid grid */
40
+ .fluid-grid {
41
+ margin-bottom: 45px;
42
+ }
43
+ .fluid-grid .row {
44
+ height: 40px;
45
+ padding-top: 10px;
46
+ margin-top: 10px;
47
+ color: #ddd;
48
+ text-align: center;
49
+ }
50
+ .fluid-grid .span1 {
51
+ background-color: #999;
52
+ }