less-rails-bootstrap 2.0.13 → 2.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (61) hide show
  1. data/.gitignore +2 -1
  2. data/CHANGELOG.md +2 -2
  3. data/lib/less/rails/bootstrap/version.rb +1 -1
  4. data/vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png +0 -0
  5. data/vendor/assets/javascripts/twitter/bootstrap.js +1 -0
  6. data/vendor/assets/javascripts/twitter/bootstrap/affix.js +104 -0
  7. data/vendor/assets/javascripts/twitter/bootstrap/alert.js +1 -1
  8. data/vendor/assets/javascripts/twitter/bootstrap/button.js +1 -1
  9. data/vendor/assets/javascripts/twitter/bootstrap/carousel.js +12 -5
  10. data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +4 -3
  11. data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +66 -16
  12. data/vendor/assets/javascripts/twitter/bootstrap/modal.js +95 -74
  13. data/vendor/assets/javascripts/twitter/bootstrap/popover.js +9 -4
  14. data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js +9 -9
  15. data/vendor/assets/javascripts/twitter/bootstrap/tab.js +2 -2
  16. data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js +15 -15
  17. data/vendor/assets/javascripts/twitter/bootstrap/transition.js +2 -3
  18. data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +50 -35
  19. data/vendor/frameworks/twitter/bootstrap/accordion.less +3 -2
  20. data/vendor/frameworks/twitter/bootstrap/alerts.less +16 -9
  21. data/vendor/frameworks/twitter/bootstrap/bootstrap.less +1 -1
  22. data/vendor/frameworks/twitter/bootstrap/breadcrumbs.less +10 -10
  23. data/vendor/frameworks/twitter/bootstrap/button-groups.less +76 -23
  24. data/vendor/frameworks/twitter/bootstrap/buttons.less +85 -65
  25. data/vendor/frameworks/twitter/bootstrap/carousel.less +13 -3
  26. data/vendor/frameworks/twitter/bootstrap/close.less +4 -2
  27. data/vendor/frameworks/twitter/bootstrap/code.less +6 -5
  28. data/vendor/frameworks/twitter/bootstrap/component-animations.less +5 -2
  29. data/vendor/frameworks/twitter/bootstrap/dropdowns.less +81 -14
  30. data/vendor/frameworks/twitter/bootstrap/forms.less +100 -48
  31. data/vendor/frameworks/twitter/bootstrap/grid.less +17 -1
  32. data/vendor/frameworks/twitter/bootstrap/hero-unit.less +4 -2
  33. data/vendor/frameworks/twitter/bootstrap/labels-badges.less +19 -2
  34. data/vendor/frameworks/twitter/bootstrap/layouts.less +1 -2
  35. data/vendor/frameworks/twitter/bootstrap/mixins.less +98 -73
  36. data/vendor/frameworks/twitter/bootstrap/modals.less +9 -2
  37. data/vendor/frameworks/twitter/bootstrap/navbar.less +238 -127
  38. data/vendor/frameworks/twitter/bootstrap/navs.less +38 -17
  39. data/vendor/frameworks/twitter/bootstrap/pager.less +5 -4
  40. data/vendor/frameworks/twitter/bootstrap/pagination.less +16 -8
  41. data/vendor/frameworks/twitter/bootstrap/popovers.less +101 -33
  42. data/vendor/frameworks/twitter/bootstrap/progress-bars.less +18 -13
  43. data/vendor/frameworks/twitter/bootstrap/reset.less +6 -3
  44. data/vendor/frameworks/twitter/bootstrap/responsive-1200px-min.less +9 -7
  45. data/vendor/frameworks/twitter/bootstrap/responsive-767px-max.less +86 -68
  46. data/vendor/frameworks/twitter/bootstrap/responsive-768px-979px.less +7 -5
  47. data/vendor/frameworks/twitter/bootstrap/responsive-navbar.less +18 -5
  48. data/vendor/frameworks/twitter/bootstrap/responsive-utilities.less +17 -15
  49. data/vendor/frameworks/twitter/bootstrap/responsive.less +5 -5
  50. data/vendor/frameworks/twitter/bootstrap/scaffolding.less +26 -4
  51. data/vendor/frameworks/twitter/bootstrap/sprites.less +15 -19
  52. data/vendor/frameworks/twitter/bootstrap/tables.less +60 -11
  53. data/vendor/frameworks/twitter/bootstrap/thumbnails.less +9 -4
  54. data/vendor/frameworks/twitter/bootstrap/tooltip.less +47 -12
  55. data/vendor/frameworks/twitter/bootstrap/type.less +57 -83
  56. data/vendor/frameworks/twitter/bootstrap/utilities.less +9 -2
  57. data/vendor/frameworks/twitter/bootstrap/variables.less +100 -29
  58. data/vendor/frameworks/twitter/bootstrap/wells.less +7 -5
  59. metadata +11 -12
  60. data/vendor/frameworks/twitter/bootstrap/badges.less +0 -36
  61. data/vendor/frameworks/twitter/bootstrap/labels.less +0 -38
@@ -1,6 +1,6 @@
1
- // NAVIGATIONS
2
- // -----------
3
-
1
+ //
2
+ // Navs
3
+ // --------------------------------------------------
4
4
 
5
5
 
6
6
  // BASE CLASS
@@ -27,7 +27,7 @@
27
27
  }
28
28
 
29
29
  // Nav headers (for dropdowns and lists)
30
- .nav .nav-header {
30
+ .nav-header {
31
31
  display: block;
32
32
  padding: 3px 15px;
33
33
  font-size: 11px;
@@ -43,6 +43,7 @@
43
43
  }
44
44
 
45
45
 
46
+
46
47
  // NAV LIST
47
48
  // --------
48
49
 
@@ -170,10 +171,10 @@
170
171
  .border-radius(0);
171
172
  }
172
173
  .nav-tabs.nav-stacked > li:first-child > a {
173
- .border-radius(4px 4px 0 0);
174
+ .border-top-radius(4px);
174
175
  }
175
176
  .nav-tabs.nav-stacked > li:last-child > a {
176
- .border-radius(0 0 4px 4px);
177
+ .border-bottom-radius(4px);
177
178
  }
178
179
  .nav-tabs.nav-stacked > li > a:hover {
179
180
  border-color: #ddd;
@@ -194,39 +195,43 @@
194
195
  // ---------
195
196
 
196
197
  .nav-tabs .dropdown-menu {
197
- .border-radius(0 0 5px 5px); // remove the top rounded corners here since there is a hard edge above the menu
198
+ .border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu
198
199
  }
199
200
  .nav-pills .dropdown-menu {
200
- .border-radius(4px); // make rounded corners match the pills
201
+ .border-radius(6px); // make rounded corners match the pills
201
202
  }
202
203
 
203
204
  // Default dropdown links
204
205
  // -------------------------
205
206
  // Make carets use linkColor to start
206
- .nav-tabs .dropdown-toggle .caret,
207
- .nav-pills .dropdown-toggle .caret {
207
+ .nav .dropdown-toggle .caret {
208
208
  border-top-color: @linkColor;
209
209
  border-bottom-color: @linkColor;
210
210
  margin-top: 6px;
211
211
  }
212
- .nav-tabs .dropdown-toggle:hover .caret,
213
- .nav-pills .dropdown-toggle:hover .caret {
212
+ .nav .dropdown-toggle:hover .caret {
214
213
  border-top-color: @linkColorHover;
215
214
  border-bottom-color: @linkColorHover;
216
215
  }
216
+ /* move down carets for tabs */
217
+ .nav-tabs .dropdown-toggle .caret {
218
+ margin-top: 8px;
219
+ }
217
220
 
218
221
  // Active dropdown links
219
222
  // -------------------------
220
- .nav-tabs .active .dropdown-toggle .caret,
221
- .nav-pills .active .dropdown-toggle .caret {
222
- border-top-color: @grayDark;
223
- border-bottom-color: @grayDark;
223
+ .nav .active .dropdown-toggle .caret {
224
+ border-top-color: #fff;
225
+ border-bottom-color: #fff;
226
+ }
227
+ .nav-tabs .active .dropdown-toggle .caret {
228
+ border-top-color: @gray;
229
+ border-bottom-color: @gray;
224
230
  }
225
231
 
226
232
  // Active:hover dropdown links
227
233
  // -------------------------
228
234
  .nav > .dropdown.active > a:hover {
229
- color: @black;
230
235
  cursor: pointer;
231
236
  }
232
237
 
@@ -361,3 +366,19 @@
361
366
  border-color: #ddd #ddd #ddd transparent;
362
367
  *border-left-color: @white;
363
368
  }
369
+
370
+
371
+
372
+ // DISABLED STATES
373
+ // ---------------
374
+
375
+ // Gray out text
376
+ .nav > .disabled > a {
377
+ color: @grayLight;
378
+ }
379
+ // Nuke hover effects
380
+ .nav > .disabled > a:hover {
381
+ text-decoration: none;
382
+ background-color: transparent;
383
+ cursor: default;
384
+ }
@@ -1,9 +1,10 @@
1
- // PAGER
2
- // -----
1
+ //
2
+ // Pager pagination
3
+ // --------------------------------------------------
4
+
3
5
 
4
6
  .pager {
5
- margin-left: 0;
6
- margin-bottom: @baseLineHeight;
7
+ margin: @baseLineHeight 0;
7
8
  list-style: none;
8
9
  text-align: center;
9
10
  .clearfix();
@@ -1,5 +1,7 @@
1
- // PAGINATION
2
- // ----------
1
+ //
2
+ // Pagination (multiple pages)
3
+ // --------------------------------------------------
4
+
3
5
 
4
6
  .pagination {
5
7
  height: @baseLineHeight * 2;
@@ -16,19 +18,23 @@
16
18
  .pagination li {
17
19
  display: inline;
18
20
  }
19
- .pagination a {
21
+ .pagination a,
22
+ .pagination span {
20
23
  float: left;
21
24
  padding: 0 14px;
22
25
  line-height: (@baseLineHeight * 2) - 2;
23
26
  text-decoration: none;
24
- border: 1px solid #ddd;
27
+ background-color: @paginationBackground;
28
+ border: 1px solid @paginationBorder;
25
29
  border-left-width: 0;
26
30
  }
27
31
  .pagination a:hover,
28
- .pagination .active a {
32
+ .pagination .active a,
33
+ .pagination .active span {
29
34
  background-color: #f5f5f5;
30
35
  }
31
- .pagination .active a {
36
+ .pagination .active a,
37
+ .pagination .active span {
32
38
  color: @grayLight;
33
39
  cursor: default;
34
40
  }
@@ -39,11 +45,13 @@
39
45
  background-color: transparent;
40
46
  cursor: default;
41
47
  }
42
- .pagination li:first-child a {
48
+ .pagination li:first-child a,
49
+ .pagination li:first-child span {
43
50
  border-left-width: 1px;
44
51
  .border-radius(3px 0 0 3px);
45
52
  }
46
- .pagination li:last-child a {
53
+ .pagination li:last-child a,
54
+ .pagination li:last-child span {
47
55
  .border-radius(0 3px 3px 0);
48
56
  }
49
57
 
@@ -1,5 +1,7 @@
1
- // POPOVERS
2
- // --------
1
+ //
2
+ // Popovers
3
+ // --------------------------------------------------
4
+
3
5
 
4
6
  .popover {
5
7
  position: absolute;
@@ -7,43 +9,109 @@
7
9
  left: 0;
8
10
  z-index: @zindexPopover;
9
11
  display: none;
10
- padding: 5px;
11
- &.top { margin-top: -5px; }
12
- &.right { margin-left: 5px; }
13
- &.bottom { margin-top: 5px; }
14
- &.left { margin-left: -5px; }
15
- &.top .arrow { #popoverArrow > .top(); }
16
- &.right .arrow { #popoverArrow > .right(); }
17
- &.bottom .arrow { #popoverArrow > .bottom(); }
18
- &.left .arrow { #popoverArrow > .left(); }
19
- .arrow {
20
- position: absolute;
21
- width: 0;
22
- height: 0;
23
- }
24
- }
25
- .popover-inner {
26
- padding: 3px;
27
- width: 280px;
28
- overflow: hidden;
29
- background: @black; // has to be full background declaration for IE fallback
30
- background: rgba(0,0,0,.8);
12
+ width: 236px;
13
+ padding: 1px;
14
+ background-color: @popoverBackground;
15
+ -webkit-background-clip: padding-box;
16
+ -moz-background-clip: padding;
17
+ background-clip: padding-box;
18
+ border: 1px solid #ccc;
19
+ border: 1px solid rgba(0,0,0,.2);
31
20
  .border-radius(6px);
32
- .box-shadow(0 3px 7px rgba(0,0,0,0.3));
21
+ .box-shadow(0 5px 10px rgba(0,0,0,.2));
22
+
23
+ // Offset the popover to account for the popover arrow
24
+ &.top { margin-bottom: 10px; }
25
+ &.right { margin-left: 10px; }
26
+ &.bottom { margin-top: 10px; }
27
+ &.left { margin-right: 10px; }
28
+
33
29
  }
30
+
34
31
  .popover-title {
35
- padding: 9px 15px;
36
- line-height: 1;
37
- background-color: #f5f5f5;
38
- border-bottom:1px solid #eee;
39
- .border-radius(3px 3px 0 0);
32
+ margin: 0; // reset heading margin
33
+ padding: 8px 14px;
34
+ font-size: 14px;
35
+ font-weight: normal;
36
+ line-height: 18px;
37
+ background-color: @popoverTitleBackground;
38
+ border-bottom: 1px solid darken(@popoverTitleBackground, 5%);
39
+ .border-radius(5px 5px 0 0);
40
40
  }
41
+
41
42
  .popover-content {
42
- padding: 14px;
43
- background-color: @white;
44
- .border-radius(0 0 3px 3px);
45
- .background-clip(padding-box);
43
+ padding: 9px 14px;
46
44
  p, ul, ol {
47
45
  margin-bottom: 0;
48
46
  }
49
47
  }
48
+
49
+ // Arrows
50
+ .popover .arrow,
51
+ .popover .arrow:after {
52
+ position: absolute;
53
+ display: inline-block;
54
+ width: 0;
55
+ height: 0;
56
+ border-color: transparent;
57
+ border-style: solid;
58
+ }
59
+ .popover .arrow:after {
60
+ content: "";
61
+ z-index: -1;
62
+ }
63
+
64
+ .popover {
65
+ &.top .arrow {
66
+ bottom: -@popoverArrowWidth;
67
+ left: 50%;
68
+ margin-left: -@popoverArrowWidth;
69
+ border-width: @popoverArrowWidth @popoverArrowWidth 0;
70
+ border-top-color: @popoverArrowColor;
71
+ &:after {
72
+ border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth 0;
73
+ border-top-color: @popoverArrowOuterColor;
74
+ bottom: -1px;
75
+ left: -@popoverArrowOuterWidth;
76
+ }
77
+ }
78
+ &.right .arrow {
79
+ top: 50%;
80
+ left: -@popoverArrowWidth;
81
+ margin-top: -@popoverArrowWidth;
82
+ border-width: @popoverArrowWidth @popoverArrowWidth @popoverArrowWidth 0;
83
+ border-right-color: @popoverArrowColor;
84
+ &:after {
85
+ border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth @popoverArrowOuterWidth 0;
86
+ border-right-color: @popoverArrowOuterColor;
87
+ bottom: -@popoverArrowOuterWidth;
88
+ left: -1px;
89
+ }
90
+ }
91
+ &.bottom .arrow {
92
+ top: -@popoverArrowWidth;
93
+ left: 50%;
94
+ margin-left: -@popoverArrowWidth;
95
+ border-width: 0 @popoverArrowWidth @popoverArrowWidth;
96
+ border-bottom-color: @popoverArrowColor;
97
+ &:after {
98
+ border-width: 0 @popoverArrowOuterWidth @popoverArrowOuterWidth;
99
+ border-bottom-color: @popoverArrowOuterColor;
100
+ top: -1px;
101
+ left: -@popoverArrowOuterWidth;
102
+ }
103
+ }
104
+ &.left .arrow {
105
+ top: 50%;
106
+ right: -@popoverArrowWidth;
107
+ margin-top: -@popoverArrowWidth;
108
+ border-width: @popoverArrowWidth 0 @popoverArrowWidth @popoverArrowWidth;
109
+ border-left-color: @popoverArrowColor;
110
+ &:after {
111
+ border-width: @popoverArrowOuterWidth 0 @popoverArrowOuterWidth @popoverArrowOuterWidth;
112
+ border-left-color: @popoverArrowOuterColor;
113
+ bottom: -@popoverArrowOuterWidth;
114
+ right: -1px;
115
+ }
116
+ }
117
+ }
@@ -1,5 +1,6 @@
1
- // PROGRESS BARS
2
- // -------------
1
+ //
2
+ // Progress bars
3
+ // --------------------------------------------------
3
4
 
4
5
 
5
6
  // ANIMATIONS
@@ -43,8 +44,8 @@
43
44
  // Outer container
44
45
  .progress {
45
46
  overflow: hidden;
46
- height: 18px;
47
- margin-bottom: 18px;
47
+ height: @baseLineHeight;
48
+ margin-bottom: @baseLineHeight;
48
49
  #gradient > .vertical(#f5f5f5, #f9f9f9);
49
50
  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
50
51
  .border-radius(4px);
@@ -53,8 +54,9 @@
53
54
  // Bar of progress
54
55
  .progress .bar {
55
56
  width: 0%;
56
- height: 18px;
57
+ height: 100%;
57
58
  color: @white;
59
+ float: left;
58
60
  font-size: 12px;
59
61
  text-align: center;
60
62
  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
@@ -63,6 +65,9 @@
63
65
  .box-sizing(border-box);
64
66
  .transition(width .6s ease);
65
67
  }
68
+ .progress .bar + .bar {
69
+ .box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)");
70
+ }
66
71
 
67
72
  // Striped bars
68
73
  .progress-striped .bar {
@@ -85,33 +90,33 @@
85
90
  // ------
86
91
 
87
92
  // Danger (red)
88
- .progress-danger .bar {
93
+ .progress-danger .bar, .progress .bar-danger {
89
94
  #gradient > .vertical(#ee5f5b, #c43c35);
90
95
  }
91
- .progress-danger.progress-striped .bar {
96
+ .progress-danger.progress-striped .bar, .progress-striped .bar-danger {
92
97
  #gradient > .striped(#ee5f5b);
93
98
  }
94
99
 
95
100
  // Success (green)
96
- .progress-success .bar {
101
+ .progress-success .bar, .progress .bar-success {
97
102
  #gradient > .vertical(#62c462, #57a957);
98
103
  }
99
- .progress-success.progress-striped .bar {
104
+ .progress-success.progress-striped .bar, .progress-striped .bar-success {
100
105
  #gradient > .striped(#62c462);
101
106
  }
102
107
 
103
108
  // Info (teal)
104
- .progress-info .bar {
109
+ .progress-info .bar, .progress .bar-info {
105
110
  #gradient > .vertical(#5bc0de, #339bb9);
106
111
  }
107
- .progress-info.progress-striped .bar {
112
+ .progress-info.progress-striped .bar, .progress-striped .bar-info {
108
113
  #gradient > .striped(#5bc0de);
109
114
  }
110
115
 
111
116
  // Warning (orange)
112
- .progress-warning .bar {
117
+ .progress-warning .bar, .progress .bar-warning {
113
118
  #gradient > .vertical(lighten(@orange, 15%), @orange);
114
119
  }
115
- .progress-warning.progress-striped .bar {
120
+ .progress-warning.progress-striped .bar, .progress-striped .bar-warning {
116
121
  #gradient > .striped(lighten(@orange, 15%));
117
122
  }
@@ -1,6 +1,8 @@
1
- // Reset.less
2
- // Adapted from Normalize.css http://github.com/necolas/normalize.css
3
- // ------------------------------------------------------------------------
1
+ //
2
+ // Modals
3
+ // Adapted from http://github.com/necolas/normalize.css
4
+ // --------------------------------------------------
5
+
4
6
 
5
7
  // Display in IE6-9 and FF3
6
8
  // -------------------------
@@ -76,6 +78,7 @@ sub {
76
78
 
77
79
  img {
78
80
  max-width: 100%; // Make images inherently responsive
81
+ height: auto; // Make images inherently responsive
79
82
  vertical-align: middle;
80
83
  border: 0;
81
84
  -ms-interpolation-mode: bicubic;
@@ -1,23 +1,25 @@
1
- // LARGE DESKTOP & UP
2
- // ------------------
1
+ //
2
+ // Responsive: Large desktop and up
3
+ // --------------------------------------------------
4
+
3
5
 
4
6
  @media (min-width: 1200px) {
5
7
 
6
8
  // Fixed grid
7
- #grid > .core(70px, 30px);
9
+ #grid > .core(@gridColumnWidth1200, @gridGutterWidth1200);
8
10
 
9
11
  // Fluid grid
10
- #grid > .fluid(5.982905983%, 2.564102564%);
12
+ #grid > .fluid(@fluidGridColumnWidth1200, @fluidGridGutterWidth1200);
11
13
 
12
14
  // Input grid
13
- #grid > .input(70px, 30px);
15
+ #grid > .input(@gridColumnWidth1200, @gridGutterWidth1200);
14
16
 
15
17
  // Thumbnails
16
18
  .thumbnails {
17
- margin-left: -30px;
19
+ margin-left: -@gridGutterWidth1200;
18
20
  }
19
21
  .thumbnails > li {
20
- margin-left: 30px;
22
+ margin-left: @gridGutterWidth1200;
21
23
  }
22
24
  .row-fluid .thumbnails {
23
25
  margin-left: 0;