anjlab-bootstrap-rails 2.2.2.1 → 2.3.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (41) hide show
  1. data/README.md +3 -2
  2. data/lib/bootstrap-rails/version.rb +1 -1
  3. data/vendor/assets/javascripts/twitter/bootstrap/affix.js +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 +31 -9
  7. data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +4 -4
  8. data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +14 -10
  9. data/vendor/assets/javascripts/twitter/bootstrap/modal.js +13 -11
  10. data/vendor/assets/javascripts/twitter/bootstrap/popover.js +5 -5
  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 +95 -29
  14. data/vendor/assets/javascripts/twitter/bootstrap/transition.js +1 -1
  15. data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +16 -4
  16. data/vendor/frameworks/twitter/bootstrap/bootstrap.scss +1 -1
  17. data/vendor/frameworks/twitter/bootstrap/button-groups.scss +4 -2
  18. data/vendor/frameworks/twitter/bootstrap/buttons.scss +8 -10
  19. data/vendor/frameworks/twitter/bootstrap/carousel.scss +31 -4
  20. data/vendor/frameworks/twitter/bootstrap/close.scss +2 -1
  21. data/vendor/frameworks/twitter/bootstrap/dropdowns.scss +16 -12
  22. data/vendor/frameworks/twitter/bootstrap/forms.scss +5 -2
  23. data/vendor/frameworks/twitter/bootstrap/labels-badges.scss +4 -2
  24. data/vendor/frameworks/twitter/bootstrap/media.scss +2 -2
  25. data/vendor/frameworks/twitter/bootstrap/mixins.scss +19 -4
  26. data/vendor/frameworks/twitter/bootstrap/navbar.scss +21 -14
  27. data/vendor/frameworks/twitter/bootstrap/navs.scss +39 -21
  28. data/vendor/frameworks/twitter/bootstrap/pager.scss +3 -1
  29. data/vendor/frameworks/twitter/bootstrap/pagination.scss +3 -1
  30. data/vendor/frameworks/twitter/bootstrap/popovers.scss +5 -1
  31. data/vendor/frameworks/twitter/bootstrap/responsive-navbar.scss +6 -2
  32. data/vendor/frameworks/twitter/bootstrap/responsive-utilities.scss +16 -0
  33. data/vendor/frameworks/twitter/bootstrap/responsive.scss +1 -10
  34. data/vendor/frameworks/twitter/bootstrap/scaffolding.scss +2 -1
  35. data/vendor/frameworks/twitter/bootstrap/sprites.scss +7 -3
  36. data/vendor/frameworks/twitter/bootstrap/tables.scss +25 -18
  37. data/vendor/frameworks/twitter/bootstrap/thumbnails.scss +3 -2
  38. data/vendor/frameworks/twitter/bootstrap/tooltip.scss +6 -6
  39. data/vendor/frameworks/twitter/bootstrap/type.scss +22 -10
  40. data/vendor/frameworks/twitter/bootstrap/variables.scss +1 -1
  41. metadata +4 -4
@@ -16,7 +16,8 @@
16
16
  .nav > li > a {
17
17
  display: block;
18
18
  }
19
- .nav > li > a:hover {
19
+ .nav > li > a:hover,
20
+ .nav > li > a:focus {
20
21
  text-decoration: none;
21
22
  background-color: $grayLighter;
22
23
  }
@@ -68,7 +69,8 @@
68
69
  padding: 3px 15px;
69
70
  }
70
71
  .nav-list > .active > a,
71
- .nav-list > .active > a:hover {
72
+ .nav-list > .active > a:hover,
73
+ .nav-list > .active > a:focus {
72
74
  color: $white;
73
75
  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
74
76
  background-color: $linkColor;
@@ -122,13 +124,15 @@
122
124
  line-height: $baseLineHeight;
123
125
  border: 1px solid transparent;
124
126
  @include border-radius(4px 4px 0 0);
125
- &:hover {
127
+ &:hover,
128
+ &:focus {
126
129
  border-color: $grayLighter $grayLighter #ddd;
127
130
  }
128
131
  }
129
- // Active state, and it's :hover to override normal :hover
132
+ // Active state, and it's :hover/:focus to override normal :hover/:focus
130
133
  .nav-tabs > .active > a,
131
- .nav-tabs > .active > a:hover {
134
+ .nav-tabs > .active > a:hover,
135
+ .nav-tabs > .active > a:focus {
132
136
  color: $gray;
133
137
  background-color: $bodyBackground;
134
138
  border: 1px solid #ddd;
@@ -151,7 +155,8 @@
151
155
 
152
156
  // Active state
153
157
  .nav-pills > .active > a,
154
- .nav-pills > .active > a:hover {
158
+ .nav-pills > .active > a:hover,
159
+ .nav-pills > .active > a:focus {
155
160
  color: $white;
156
161
  background-color: $linkColor;
157
162
  }
@@ -183,7 +188,8 @@
183
188
  .nav-tabs.nav-stacked > li:last-child > a {
184
189
  @include border-bottom-radius(4px);
185
190
  }
186
- .nav-tabs.nav-stacked > li > a:hover {
191
+ .nav-tabs.nav-stacked > li > a:hover,
192
+ .nav-tabs.nav-stacked > li > a:focus {
187
193
  border-color: #ddd;
188
194
  z-index: 2;
189
195
  }
@@ -216,7 +222,8 @@
216
222
  border-bottom-color: $linkColor;
217
223
  margin-top: 6px;
218
224
  }
219
- .nav .dropdown-toggle:hover .caret {
225
+ .nav .dropdown-toggle:hover .caret,
226
+ .nav .dropdown-toggle:focus .caret {
220
227
  border-top-color: $linkColorHover;
221
228
  border-bottom-color: $linkColorHover;
222
229
  }
@@ -236,9 +243,10 @@
236
243
  border-bottom-color: $gray;
237
244
  }
238
245
 
239
- // Active:hover dropdown links
246
+ // Active:hover/:focus dropdown links
240
247
  // -------------------------
241
- .nav > .dropdown.active > a:hover {
248
+ .nav > .dropdown.active > a:hover,
249
+ .nav > .dropdown.active > a:focus {
242
250
  cursor: pointer;
243
251
  }
244
252
 
@@ -246,21 +254,24 @@
246
254
  // -------------------------
247
255
  .nav-tabs .open .dropdown-toggle,
248
256
  .nav-pills .open .dropdown-toggle,
249
- .nav > li.dropdown.open.active > a:hover {
257
+ .nav > li.dropdown.open.active > a:hover,
258
+ .nav > li.dropdown.open.active > a:focus {
250
259
  color: $white;
251
260
  background-color: $grayLight;
252
261
  border-color: $grayLight;
253
262
  }
254
263
  .nav li.dropdown.open .caret,
255
264
  .nav li.dropdown.open.active .caret,
256
- .nav li.dropdown.open a:hover .caret {
265
+ .nav li.dropdown.open a:hover .caret,
266
+ .nav li.dropdown.open a:focus .caret {
257
267
  border-top-color: $white;
258
268
  border-bottom-color: $white;
259
269
  @include opacity(100);
260
270
  }
261
271
 
262
272
  // Dropdowns in stacked tabs
263
- .tabs-stacked .open > a:hover {
273
+ .tabs-stacked .open > a:hover,
274
+ .tabs-stacked .open > a:focus {
264
275
  border-color: $grayLight;
265
276
  }
266
277
 
@@ -311,13 +322,15 @@
311
322
  }
312
323
  .tabs-below > .nav-tabs > li > a {
313
324
  @include border-radius(0 0 4px 4px);
314
- &:hover {
325
+ &:hover,
326
+ &:focus {
315
327
  border-bottom-color: transparent;
316
328
  border-top-color: #ddd;
317
329
  }
318
330
  }
319
331
  .tabs-below > .nav-tabs > .active > a,
320
- .tabs-below > .nav-tabs > .active > a:hover {
332
+ .tabs-below > .nav-tabs > .active > a:hover,
333
+ .tabs-below > .nav-tabs > .active > a:focus {
321
334
  border-color: transparent #ddd #ddd #ddd;
322
335
  }
323
336
 
@@ -346,11 +359,13 @@
346
359
  margin-right: -1px;
347
360
  @include border-radius(4px 0 0 4px);
348
361
  }
349
- .tabs-left > .nav-tabs > li > a:hover {
362
+ .tabs-left > .nav-tabs > li > a:hover,
363
+ .tabs-left > .nav-tabs > li > a:focus {
350
364
  border-color: $grayLighter #ddd $grayLighter $grayLighter;
351
365
  }
352
366
  .tabs-left > .nav-tabs .active > a,
353
- .tabs-left > .nav-tabs .active > a:hover {
367
+ .tabs-left > .nav-tabs .active > a:hover,
368
+ .tabs-left > .nav-tabs .active > a:focus {
354
369
  border-color: #ddd transparent #ddd #ddd;
355
370
  *border-right-color: $white;
356
371
  }
@@ -365,11 +380,13 @@
365
380
  margin-left: -1px;
366
381
  @include border-radius(0 4px 4px 0);
367
382
  }
368
- .tabs-right > .nav-tabs > li > a:hover {
383
+ .tabs-right > .nav-tabs > li > a:hover,
384
+ .tabs-right > .nav-tabs > li > a:focus {
369
385
  border-color: $grayLighter $grayLighter $grayLighter #ddd;
370
386
  }
371
387
  .tabs-right > .nav-tabs .active > a,
372
- .tabs-right > .nav-tabs .active > a:hover {
388
+ .tabs-right > .nav-tabs .active > a:hover,
389
+ .tabs-right > .nav-tabs .active > a:focus {
373
390
  border-color: #ddd #ddd #ddd transparent;
374
391
  *border-left-color: $white;
375
392
  }
@@ -383,8 +400,9 @@
383
400
  .nav > .disabled > a {
384
401
  color: $grayLight;
385
402
  }
386
- // Nuke hover effects
387
- .nav > .disabled > a:hover {
403
+ // Nuke hover/focus effects
404
+ .nav > .disabled > a:hover,
405
+ .nav > .disabled > a:focus {
388
406
  text-decoration: none;
389
407
  background-color: transparent;
390
408
  cursor: default;
@@ -20,7 +20,8 @@
20
20
  border: 1px solid #ddd;
21
21
  @include border-radius(15px);
22
22
  }
23
- .pager li > a:hover {
23
+ .pager li > a:hover,
24
+ .pager li > a:focus {
24
25
  text-decoration: none;
25
26
  background-color: #f5f5f5;
26
27
  }
@@ -34,6 +35,7 @@
34
35
  }
35
36
  .pager .disabled > a,
36
37
  .pager .disabled > a:hover,
38
+ .pager .disabled > a:focus,
37
39
  .pager .disabled > span {
38
40
  color: $grayLight;
39
41
  background-color: #fff;
@@ -32,6 +32,7 @@
32
32
  border-left-width: 0;
33
33
  }
34
34
  .pagination ul > li > a:hover,
35
+ .pagination ul > li > a:focus,
35
36
  .pagination ul > .active > a,
36
37
  .pagination ul > .active > span {
37
38
  background-color: $paginationActiveBackground;
@@ -43,7 +44,8 @@
43
44
  }
44
45
  .pagination ul > .disabled > span,
45
46
  .pagination ul > .disabled > a,
46
- .pagination ul > .disabled > a:hover {
47
+ .pagination ul > .disabled > a:hover,
48
+ .pagination ul > .disabled > a:focus {
47
49
  color: $grayLight;
48
50
  background-color: transparent;
49
51
  cursor: default;
@@ -9,7 +9,7 @@
9
9
  left: 0;
10
10
  z-index: $zindexPopover;
11
11
  display: none;
12
- width: 236px;
12
+ max-width: 276px;
13
13
  padding: 1px;
14
14
  text-align: left; // Reset given new insertion method
15
15
  background-color: $popoverBackground;
@@ -40,6 +40,10 @@
40
40
  background-color: $popoverTitleBackground;
41
41
  border-bottom: 1px solid darken($popoverTitleBackground, 5%);
42
42
  @include border-radius(5px 5px 0 0);
43
+
44
+ &:empty {
45
+ display: none;
46
+ }
43
47
  }
44
48
 
45
49
  .popover-content {
@@ -81,7 +81,9 @@
81
81
  margin-bottom: 2px;
82
82
  }
83
83
  .nav-collapse .nav > li > a:hover,
84
- .nav-collapse .dropdown-menu a:hover {
84
+ .nav-collapse .nav > li > a:focus,
85
+ .nav-collapse .dropdown-menu a:hover,
86
+ .nav-collapse .dropdown-menu a:focus {
85
87
  background-color: $navbarBackground;
86
88
  }
87
89
  .navbar-inverse .nav-collapse .nav > li > a,
@@ -89,7 +91,9 @@
89
91
  color: $navbarInverseLinkColor;
90
92
  }
91
93
  .navbar-inverse .nav-collapse .nav > li > a:hover,
92
- .navbar-inverse .nav-collapse .dropdown-menu a:hover {
94
+ .navbar-inverse .nav-collapse .nav > li > a:focus,
95
+ .navbar-inverse .nav-collapse .dropdown-menu a:hover,
96
+ .navbar-inverse .nav-collapse .dropdown-menu a:focus {
93
97
  background-color: $navbarInverseBackground;
94
98
  }
95
99
  // Buttons in the navbar
@@ -3,6 +3,13 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
+ // IE10 Metro responsive
7
+ // Required for Windows 8 Metro split-screen snapping with IE10
8
+ // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
9
+ @-ms-viewport{
10
+ width: device-width;
11
+ }
12
+
6
13
  // Hide from screenreaders and browsers
7
14
  // Credit: HTML5 Boilerplate
8
15
  .hidden {
@@ -41,3 +48,12 @@
41
48
  // Hide
42
49
  .hidden-phone { display: none !important; }
43
50
  }
51
+
52
+ // Print utilities
53
+ .visible-print { display: none !important; }
54
+ .hidden-print { }
55
+
56
+ @media print {
57
+ .visible-print { display: inherit !important; }
58
+ .hidden-print { display: none !important; }
59
+ }
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap Responsive v2.2.2
2
+ * Bootstrap Responsive v2.3.0
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -14,15 +14,6 @@
14
14
  // -------------------------------------------------------------
15
15
 
16
16
 
17
- // IE10 Metro responsive
18
- // Required for Windows 8 Metro split-screen snapping with IE10
19
- // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
20
-
21
- @-ms-viewport{
22
- width: device-width;
23
- }
24
-
25
-
26
17
  // REPEAT VARIABLES & MIXINS
27
18
  // -------------------------
28
19
  // Required since we compile the responsive stuff separately
@@ -23,7 +23,8 @@ a {
23
23
  color: $linkColor;
24
24
  text-decoration: none;
25
25
  }
26
- a:hover {
26
+ a:hover,
27
+ a:focus {
27
28
  color: $linkColorHover;
28
29
  text-decoration: underline;
29
30
  }
@@ -28,7 +28,7 @@
28
28
  margin-top: 1px;
29
29
  }
30
30
 
31
- /* White icons with optional class, or on hover/active states of certain elements */
31
+ /* White icons with optional class, or on hover/focus/active states of certain elements */
32
32
  .icon-white,
33
33
  .nav-pills > .active > a > [class^="icon-"],
34
34
  .nav-pills > .active > a > [class*=" icon-"],
@@ -37,11 +37,15 @@
37
37
  .navbar-inverse .nav > .active > a > [class^="icon-"],
38
38
  .navbar-inverse .nav > .active > a > [class*=" icon-"],
39
39
  .dropdown-menu > li > a:hover > [class^="icon-"],
40
+ .dropdown-menu > li > a:focus > [class^="icon-"],
40
41
  .dropdown-menu > li > a:hover > [class*=" icon-"],
42
+ .dropdown-menu > li > a:focus > [class*=" icon-"],
41
43
  .dropdown-menu > .active > a > [class^="icon-"],
42
44
  .dropdown-menu > .active > a > [class*=" icon-"],
43
45
  .dropdown-submenu:hover > a > [class^="icon-"],
44
- .dropdown-submenu:hover > a > [class*=" icon-"] {
46
+ .dropdown-submenu:focus > a > [class^="icon-"],
47
+ .dropdown-submenu:hover > a > [class*=" icon-"],
48
+ .dropdown-submenu:focus > a > [class*=" icon-"] {
45
49
  background-image: url($iconWhiteSpritePath);
46
50
  }
47
51
 
@@ -166,7 +170,7 @@
166
170
  .icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off
167
171
  .icon-retweet { background-position: -336px -120px; }
168
172
  .icon-shopping-cart { background-position: -360px -120px; }
169
- .icon-folder-close { background-position: -384px -120px; }
173
+ .icon-folder-close { background-position: -384px -120px; width: 16px; }
170
174
  .icon-folder-open { background-position: -408px -120px; width: 16px; }
171
175
  .icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off
172
176
  .icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off
@@ -93,24 +93,32 @@ table {
93
93
  tbody:first-child tr:first-child td {
94
94
  border-top: 0;
95
95
  }
96
- // For first th or td in the first row in the first thead or tbody
96
+ // For first th/td in the first row in the first thead or tbody
97
97
  thead:first-child tr:first-child > th:first-child,
98
- tbody:first-child tr:first-child > td:first-child {
98
+ tbody:first-child tr:first-child > td:first-child,
99
+ tbody:first-child tr:first-child > th:first-child {
99
100
  @include border-top-left-radius($baseBorderRadius);
100
101
  }
102
+ // For last th/td in the first row in the first thead or tbody
101
103
  thead:first-child tr:first-child > th:last-child,
102
- tbody:first-child tr:first-child > td:last-child {
104
+ tbody:first-child tr:first-child > td:last-child,
105
+ tbody:first-child tr:first-child > th:last-child {
103
106
  @include border-top-right-radius($baseBorderRadius);
104
107
  }
105
- // For first th or td in the last row in the last thead or tbody
108
+ // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
106
109
  thead:last-child tr:last-child > th:first-child,
107
110
  tbody:last-child tr:last-child > td:first-child,
108
- tfoot:last-child tr:last-child > td:first-child {
111
+ tbody:last-child tr:last-child > th:first-child,
112
+ tfoot:last-child tr:last-child > td:first-child,
113
+ tfoot:last-child tr:last-child > th:first-child {
109
114
  @include border-bottom-left-radius($baseBorderRadius);
110
115
  }
116
+ // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
111
117
  thead:last-child tr:last-child > th:last-child,
112
118
  tbody:last-child tr:last-child > td:last-child,
113
- tfoot:last-child tr:last-child > td:last-child {
119
+ tbody:last-child tr:last-child > th:last-child,
120
+ tfoot:last-child tr:last-child > td:last-child,
121
+ tfoot:last-child tr:last-child > th:last-child {
114
122
  @include border-bottom-right-radius($baseBorderRadius);
115
123
  }
116
124
 
@@ -122,7 +130,6 @@ table {
122
130
  @include border-bottom-right-radius(0);
123
131
  }
124
132
 
125
-
126
133
  // Special fixes to round the left border on the first td/th
127
134
  caption + thead tr:first-child th:first-child,
128
135
  caption + tbody tr:first-child td:first-child,
@@ -161,10 +168,10 @@ table {
161
168
  // Placed here since it has to come after the potential zebra striping
162
169
  .table-hover {
163
170
  tbody {
164
- tr:hover td,
165
- tr:hover th {
171
+ tr:hover > td,
172
+ tr:hover > th {
166
173
  background-color: $tableBackgroundHover;
167
- }
174
+ }
168
175
  }
169
176
  }
170
177
 
@@ -197,32 +204,32 @@ table th[class*="span"],
197
204
  // Exact selectors below required to override .table-striped
198
205
 
199
206
  .table tbody tr {
200
- &.success td {
207
+ &.success > td {
201
208
  background-color: $successBackground;
202
209
  }
203
- &.error td {
210
+ &.error > td {
204
211
  background-color: $errorBackground;
205
212
  }
206
- &.warning td {
213
+ &.warning > td {
207
214
  background-color: $warningBackground;
208
215
  }
209
- &.info td {
216
+ &.info > td {
210
217
  background-color: $infoBackground;
211
218
  }
212
219
  }
213
220
 
214
221
  // Hover states for .table-hover
215
222
  .table-hover tbody tr {
216
- &.success:hover td {
223
+ &.success:hover > td {
217
224
  background-color: darken($successBackground, 5%);
218
225
  }
219
- &.error:hover td {
226
+ &.error:hover > td {
220
227
  background-color: darken($errorBackground, 5%);
221
228
  }
222
- &.warning:hover td {
229
+ &.warning:hover > td {
223
230
  background-color: darken($warningBackground, 5%);
224
231
  }
225
- &.info:hover td {
232
+ &.info:hover > td {
226
233
  background-color: darken($infoBackground, 5%);
227
234
  }
228
235
  }
@@ -33,8 +33,9 @@
33
33
  @include box-shadow(0 1px 3px rgba(0,0,0,.055));
34
34
  @include transition(all .2s ease-in-out);
35
35
  }
36
- // Add a hover state for linked versions only
37
- a.thumbnail:hover {
36
+ // Add a hover/focus state for linked versions only
37
+ a.thumbnail:hover,
38
+ a.thumbnail:focus {
38
39
  border-color: $linkColor;
39
40
  @include box-shadow(0 1px 4px rgba(0,105,214,.25));
40
41
  }