less-rails-bootstrap 2.3.3 → 3.0.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (72) hide show
  1. data/.gitignore +1 -0
  2. data/CHANGELOG.md +4 -0
  3. data/README.md +7 -11
  4. data/lib/less/rails/bootstrap/version.rb +1 -1
  5. data/scripts/update_bootstrap.sh +37 -8
  6. data/test/cases/usage_css_spec.rb +15 -12
  7. data/test/cases/usage_js_spec.rb +4 -4
  8. data/test/dummy_app/app/assets/stylesheets/fonts.css.less +2 -0
  9. data/test/dummy_app/app/assets/stylesheets/framework.css.less +4 -2
  10. data/test/dummy_app/app/assets/stylesheets/individual.css.less +2 -2
  11. data/test/spec_helper.rb +1 -2
  12. data/vendor/assets/javascripts/twitter/bootstrap.js +0 -1
  13. data/vendor/assets/javascripts/twitter/bootstrap/affix.js +58 -49
  14. data/vendor/assets/javascripts/twitter/bootstrap/alert.js +36 -37
  15. data/vendor/assets/javascripts/twitter/bootstrap/button.js +41 -39
  16. data/vendor/assets/javascripts/twitter/bootstrap/carousel.js +131 -125
  17. data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +108 -96
  18. data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +72 -87
  19. data/vendor/assets/javascripts/twitter/bootstrap/modal.js +149 -155
  20. data/vendor/assets/javascripts/twitter/bootstrap/popover.js +60 -59
  21. data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js +103 -107
  22. data/vendor/assets/javascripts/twitter/bootstrap/tab.js +73 -82
  23. data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js +258 -255
  24. data/vendor/assets/javascripts/twitter/bootstrap/transition.js +34 -38
  25. data/vendor/frameworks/twitter/bootstrap/accordion.less +9 -12
  26. data/vendor/frameworks/twitter/bootstrap/alerts.less +43 -53
  27. data/vendor/frameworks/twitter/bootstrap/bootstrap.less +21 -21
  28. data/vendor/frameworks/twitter/bootstrap/breadcrumbs.less +7 -8
  29. data/vendor/frameworks/twitter/bootstrap/button-groups.less +93 -151
  30. data/vendor/frameworks/twitter/bootstrap/buttons.less +93 -164
  31. data/vendor/frameworks/twitter/bootstrap/carousel.less +110 -63
  32. data/vendor/frameworks/twitter/bootstrap/close.less +18 -17
  33. data/vendor/frameworks/twitter/bootstrap/code.less +14 -20
  34. data/vendor/frameworks/twitter/bootstrap/component-animations.less +10 -3
  35. data/vendor/frameworks/twitter/bootstrap/dropdowns.less +66 -143
  36. data/vendor/frameworks/twitter/bootstrap/forms.less +281 -548
  37. data/vendor/frameworks/twitter/bootstrap/grid.less +194 -11
  38. data/vendor/frameworks/twitter/bootstrap/media.less +8 -7
  39. data/vendor/frameworks/twitter/bootstrap/mixins.less +290 -446
  40. data/vendor/frameworks/twitter/bootstrap/modals.less +92 -51
  41. data/vendor/frameworks/twitter/bootstrap/navbar.less +285 -402
  42. data/vendor/frameworks/twitter/bootstrap/navs.less +176 -348
  43. data/vendor/frameworks/twitter/bootstrap/pager.less +45 -33
  44. data/vendor/frameworks/twitter/bootstrap/pagination.less +89 -104
  45. data/vendor/frameworks/twitter/bootstrap/popovers.less +53 -51
  46. data/vendor/frameworks/twitter/bootstrap/progress-bars.less +28 -45
  47. data/vendor/frameworks/twitter/bootstrap/responsive-utilities.less +92 -32
  48. data/vendor/frameworks/twitter/bootstrap/scaffolding.less +60 -18
  49. data/vendor/frameworks/twitter/bootstrap/tables.less +131 -164
  50. data/vendor/frameworks/twitter/bootstrap/thumbnails.less +20 -31
  51. data/vendor/frameworks/twitter/bootstrap/tooltip.less +45 -20
  52. data/vendor/frameworks/twitter/bootstrap/type.less +84 -99
  53. data/vendor/frameworks/twitter/bootstrap/utilities.less +17 -5
  54. data/vendor/frameworks/twitter/bootstrap/variables.less +446 -179
  55. data/vendor/frameworks/twitter/bootstrap/wells.less +5 -5
  56. metadata +41 -44
  57. data/vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png +0 -0
  58. data/vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png +0 -0
  59. data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +0 -335
  60. data/vendor/assets/stylesheets/twitter/bootstrap-responsive.css.less +0 -1
  61. data/vendor/assets/stylesheets/twitter/bootstrap.css.less +0 -1
  62. data/vendor/frameworks/twitter/bootstrap.less +0 -1
  63. data/vendor/frameworks/twitter/bootstrap/hero-unit.less +0 -25
  64. data/vendor/frameworks/twitter/bootstrap/labels-badges.less +0 -84
  65. data/vendor/frameworks/twitter/bootstrap/layouts.less +0 -16
  66. data/vendor/frameworks/twitter/bootstrap/reset.less +0 -216
  67. data/vendor/frameworks/twitter/bootstrap/responsive-1200px-min.less +0 -28
  68. data/vendor/frameworks/twitter/bootstrap/responsive-767px-max.less +0 -193
  69. data/vendor/frameworks/twitter/bootstrap/responsive-768px-979px.less +0 -19
  70. data/vendor/frameworks/twitter/bootstrap/responsive-navbar.less +0 -189
  71. data/vendor/frameworks/twitter/bootstrap/responsive.less +0 -48
  72. data/vendor/frameworks/twitter/bootstrap/sprites.less +0 -197
@@ -4,40 +4,52 @@
4
4
 
5
5
 
6
6
  .pager {
7
- margin: @baseLineHeight 0;
7
+ padding-left: 0;
8
+ margin: @line-height-computed 0;
8
9
  list-style: none;
9
10
  text-align: center;
10
11
  .clearfix();
11
- }
12
- .pager li {
13
- display: inline;
14
- }
15
- .pager li > a,
16
- .pager li > span {
17
- display: inline-block;
18
- padding: 5px 14px;
19
- background-color: #fff;
20
- border: 1px solid #ddd;
21
- .border-radius(15px);
22
- }
23
- .pager li > a:hover,
24
- .pager li > a:focus {
25
- text-decoration: none;
26
- background-color: #f5f5f5;
27
- }
28
- .pager .next > a,
29
- .pager .next > span {
30
- float: right;
31
- }
32
- .pager .previous > a,
33
- .pager .previous > span {
34
- float: left;
35
- }
36
- .pager .disabled > a,
37
- .pager .disabled > a:hover,
38
- .pager .disabled > a:focus,
39
- .pager .disabled > span {
40
- color: @grayLight;
41
- background-color: #fff;
42
- cursor: default;
12
+ li {
13
+ display: inline;
14
+ > a,
15
+ > span {
16
+ display: inline-block;
17
+ padding: 5px 14px;
18
+ background-color: @pagination-bg;
19
+ border: 1px solid @pagination-border;
20
+ border-radius: @pager-border-radius;
21
+ }
22
+
23
+ > a:hover,
24
+ > a:focus {
25
+ text-decoration: none;
26
+ background-color: @pagination-active-bg;
27
+ }
28
+ }
29
+
30
+ .next {
31
+ > a,
32
+ > span {
33
+ float: right;
34
+ }
35
+ }
36
+
37
+ .previous {
38
+ > a,
39
+ > span {
40
+ float: left;
41
+ }
42
+ }
43
+
44
+ .disabled {
45
+ > a,
46
+ > a:hover,
47
+ > a:focus,
48
+ > span {
49
+ color: @pager-disabled-color;
50
+ background-color: @pagination-bg;
51
+ cursor: not-allowed;
52
+ }
53
+ }
54
+
43
55
  }
@@ -1,123 +1,108 @@
1
1
  //
2
2
  // Pagination (multiple pages)
3
3
  // --------------------------------------------------
4
-
5
- // Space out pagination from surrounding content
6
4
  .pagination {
7
- margin: @baseLineHeight 0;
8
- }
9
-
10
- .pagination ul {
11
- // Allow for text-based alignment
12
5
  display: inline-block;
13
- .ie7-inline-block();
14
- // Reset default ul styles
15
- margin-left: 0;
16
- margin-bottom: 0;
17
- // Visuals
18
- .border-radius(@baseBorderRadius);
19
- .box-shadow(0 1px 2px rgba(0,0,0,.05));
20
- }
21
- .pagination ul > li {
22
- display: inline; // Remove list-style and block-level defaults
23
- }
24
- .pagination ul > li > a,
25
- .pagination ul > li > span {
26
- float: left; // Collapse white-space
27
- padding: 4px 12px;
28
- line-height: @baseLineHeight;
29
- text-decoration: none;
30
- background-color: @paginationBackground;
31
- border: 1px solid @paginationBorder;
32
- border-left-width: 0;
33
- }
34
- .pagination ul > li > a:hover,
35
- .pagination ul > li > a:focus,
36
- .pagination ul > .active > a,
37
- .pagination ul > .active > span {
38
- background-color: @paginationActiveBackground;
39
- }
40
- .pagination ul > .active > a,
41
- .pagination ul > .active > span {
42
- color: @grayLight;
43
- cursor: default;
44
- }
45
- .pagination ul > .disabled > span,
46
- .pagination ul > .disabled > a,
47
- .pagination ul > .disabled > a:hover,
48
- .pagination ul > .disabled > a:focus {
49
- color: @grayLight;
50
- background-color: transparent;
51
- cursor: default;
52
- }
53
- .pagination ul > li:first-child > a,
54
- .pagination ul > li:first-child > span {
55
- border-left-width: 1px;
56
- .border-left-radius(@baseBorderRadius);
57
- }
58
- .pagination ul > li:last-child > a,
59
- .pagination ul > li:last-child > span {
60
- .border-right-radius(@baseBorderRadius);
61
- }
62
-
63
-
64
- // Alignment
65
- // --------------------------------------------------
66
-
67
- .pagination-centered {
68
- text-align: center;
69
- }
70
- .pagination-right {
71
- text-align: right;
6
+ padding-left: 0;
7
+ margin: @line-height-computed 0;
8
+ border-radius: @border-radius-base;
9
+
10
+ > li {
11
+ display: inline; // Remove list-style and block-level defaults
12
+ > a,
13
+ > span {
14
+ float: left; // Collapse white-space
15
+ padding: 4px 12px;
16
+ line-height: @line-height-base;
17
+ text-decoration: none;
18
+ background-color: @pagination-bg;
19
+ border: 1px solid @pagination-border;
20
+ border-left-width: 0;
21
+ }
22
+ &:first-child {
23
+ > a,
24
+ > span {
25
+ border-left-width: 1px;
26
+ .border-left-radius(@border-radius-base);
27
+ }
28
+ }
29
+ &:last-child {
30
+ > a,
31
+ > span {
32
+ .border-right-radius(@border-radius-base);
33
+ }
34
+ }
35
+ }
36
+
37
+ > li > a:hover,
38
+ > li > a:focus,
39
+ > .active > a,
40
+ > .active > span {
41
+ background-color: @pagination-active-bg;
42
+ }
43
+ > .active > a,
44
+ > .active > span {
45
+ color: @pagination-active-color;
46
+ cursor: default;
47
+ }
48
+
49
+ > .disabled {
50
+ > span,
51
+ > a,
52
+ > a:hover,
53
+ > a:focus {
54
+ color: @pagination-disabled-color;
55
+ background-color: @pagination-bg;
56
+ cursor: not-allowed;
57
+ }
58
+ }
72
59
  }
73
60
 
74
-
75
61
  // Sizing
76
62
  // --------------------------------------------------
77
63
 
78
64
  // Large
79
65
  .pagination-large {
80
- ul > li > a,
81
- ul > li > span {
82
- padding: @paddingLarge;
83
- font-size: @fontSizeLarge;
84
- }
85
- ul > li:first-child > a,
86
- ul > li:first-child > span {
87
- .border-left-radius(@borderRadiusLarge);
88
- }
89
- ul > li:last-child > a,
90
- ul > li:last-child > span {
91
- .border-right-radius(@borderRadiusLarge);
92
- }
93
- }
94
-
95
- // Small and mini
96
- .pagination-mini,
97
- .pagination-small {
98
- ul > li:first-child > a,
99
- ul > li:first-child > span {
100
- .border-left-radius(@borderRadiusSmall);
101
- }
102
- ul > li:last-child > a,
103
- ul > li:last-child > span {
104
- .border-right-radius(@borderRadiusSmall);
66
+ > li {
67
+ > a,
68
+ > span {
69
+ padding: @padding-large-vertical @padding-large-horizontal;
70
+ font-size: @font-size-large;
71
+ }
72
+ &:first-child {
73
+ > a,
74
+ > span {
75
+ .border-left-radius(@border-radius-large);
76
+ }
77
+ }
78
+ &:last-child {
79
+ > a,
80
+ > span {
81
+ .border-right-radius(@border-radius-large);
82
+ }
83
+ }
105
84
  }
106
85
  }
107
86
 
108
87
  // Small
109
88
  .pagination-small {
110
- ul > li > a,
111
- ul > li > span {
112
- padding: @paddingSmall;
113
- font-size: @fontSizeSmall;
114
- }
115
- }
116
- // Mini
117
- .pagination-mini {
118
- ul > li > a,
119
- ul > li > span {
120
- padding: @paddingMini;
121
- font-size: @fontSizeMini;
89
+ > li {
90
+ > a,
91
+ > span {
92
+ padding: @padding-small-vertical @padding-small-horizontal;
93
+ font-size: @font-size-small;
94
+ }
95
+ &:first-child {
96
+ > a,
97
+ > span {
98
+ .border-left-radius(@border-radius-small);
99
+ }
100
+ }
101
+ &:last-child {
102
+ > a,
103
+ > span {
104
+ .border-right-radius(@border-radius-small);
105
+ }
106
+ }
122
107
  }
123
108
  }
@@ -7,18 +7,18 @@
7
7
  position: absolute;
8
8
  top: 0;
9
9
  left: 0;
10
- z-index: @zindexPopover;
10
+ z-index: @zindex-popover;
11
11
  display: none;
12
- max-width: 276px;
12
+ max-width: @popover-max-width;
13
13
  padding: 1px;
14
14
  text-align: left; // Reset given new insertion method
15
- background-color: @popoverBackground;
16
- -webkit-background-clip: padding-box;
17
- -moz-background-clip: padding;
18
- background-clip: padding-box;
19
- border: 1px solid #ccc;
20
- border: 1px solid rgba(0,0,0,.2);
21
- .border-radius(6px);
15
+ background-color: @popover-bg;
16
+ -webkit-bg-clip: padding-box;
17
+ -moz-bg-clip: padding;
18
+ background-clip: padding-box;
19
+ border: 1px solid @popover-fallback-border-color;
20
+ border: 1px solid @popover-border-color;
21
+ border-radius: @border-radius-large;
22
22
  .box-shadow(0 5px 10px rgba(0,0,0,.2));
23
23
 
24
24
  // Overrides for proper insertion
@@ -34,16 +34,12 @@
34
34
  .popover-title {
35
35
  margin: 0; // reset heading margin
36
36
  padding: 8px 14px;
37
- font-size: 14px;
37
+ font-size: @font-size-base;
38
38
  font-weight: normal;
39
39
  line-height: 18px;
40
- background-color: @popoverTitleBackground;
41
- border-bottom: 1px solid darken(@popoverTitleBackground, 5%);
42
- .border-radius(5px 5px 0 0);
43
-
44
- &:empty {
45
- display: none;
46
- }
40
+ background-color: @popover-title-bg;
41
+ border-bottom: 1px solid darken(@popover-title-bg, 5%);
42
+ border-radius: 5px 5px 0 0;
47
43
  }
48
44
 
49
45
  .popover-content {
@@ -54,79 +50,85 @@
54
50
  //
55
51
  // .arrow is outer, .arrow:after is inner
56
52
 
57
- .popover .arrow,
58
- .popover .arrow:after {
59
- position: absolute;
60
- display: block;
61
- width: 0;
62
- height: 0;
63
- border-color: transparent;
64
- border-style: solid;
53
+ .popover .arrow {
54
+ &,
55
+ &:after {
56
+ position: absolute;
57
+ display: block;
58
+ width: 0;
59
+ height: 0;
60
+ border-color: transparent;
61
+ border-style: solid;
62
+ }
65
63
  }
66
64
  .popover .arrow {
67
- border-width: @popoverArrowOuterWidth;
65
+ border-width: @popover-arrow-outer-width;
68
66
  }
69
67
  .popover .arrow:after {
70
- border-width: @popoverArrowWidth;
68
+ border-width: @popover-arrow-width;
71
69
  content: "";
72
70
  }
73
71
 
74
72
  .popover {
75
73
  &.top .arrow {
76
74
  left: 50%;
77
- margin-left: -@popoverArrowOuterWidth;
75
+ margin-left: -@popover-arrow-outer-width;
78
76
  border-bottom-width: 0;
79
- border-top-color: #999; // IE8 fallback
80
- border-top-color: @popoverArrowOuterColor;
81
- bottom: -@popoverArrowOuterWidth;
77
+ border-top-color: @popover-arrow-outer-fallback-color; // IE8 fallback
78
+ border-top-color: @popover-arrow-outer-color;
79
+ bottom: -@popover-arrow-outer-width;
82
80
  &:after {
81
+ content: " ";
83
82
  bottom: 1px;
84
- margin-left: -@popoverArrowWidth;
83
+ margin-left: -@popover-arrow-width;
85
84
  border-bottom-width: 0;
86
- border-top-color: @popoverArrowColor;
85
+ border-top-color: @popover-arrow-color;
87
86
  }
88
87
  }
89
88
  &.right .arrow {
90
89
  top: 50%;
91
- left: -@popoverArrowOuterWidth;
92
- margin-top: -@popoverArrowOuterWidth;
90
+ left: -@popover-arrow-outer-width;
91
+ margin-top: -@popover-arrow-outer-width;
93
92
  border-left-width: 0;
94
- border-right-color: #999; // IE8 fallback
95
- border-right-color: @popoverArrowOuterColor;
93
+ border-right-color: @popover-arrow-outer-fallback-color; // IE8 fallback
94
+ border-right-color: @popover-arrow-outer-color;
96
95
  &:after {
96
+ content: " ";
97
97
  left: 1px;
98
- bottom: -@popoverArrowWidth;
98
+ bottom: -@popover-arrow-width;
99
99
  border-left-width: 0;
100
- border-right-color: @popoverArrowColor;
100
+ border-right-color: @popover-arrow-color;
101
101
  }
102
102
  }
103
103
  &.bottom .arrow {
104
104
  left: 50%;
105
- margin-left: -@popoverArrowOuterWidth;
105
+ margin-left: -@popover-arrow-outer-width;
106
106
  border-top-width: 0;
107
- border-bottom-color: #999; // IE8 fallback
108
- border-bottom-color: @popoverArrowOuterColor;
109
- top: -@popoverArrowOuterWidth;
107
+ border-bottom-color: @popover-arrow-outer-fallback-color; // IE8 fallback
108
+ border-bottom-color: @popover-arrow-outer-color;
109
+ top: -@popover-arrow-outer-width;
110
110
  &:after {
111
+ content: " ";
111
112
  top: 1px;
112
- margin-left: -@popoverArrowWidth;
113
+ margin-left: -@popover-arrow-width;
113
114
  border-top-width: 0;
114
- border-bottom-color: @popoverArrowColor;
115
+ border-bottom-color: @popover-arrow-color;
115
116
  }
116
117
  }
117
118
 
118
119
  &.left .arrow {
119
120
  top: 50%;
120
- right: -@popoverArrowOuterWidth;
121
- margin-top: -@popoverArrowOuterWidth;
121
+ right: -@popover-arrow-outer-width;
122
+ margin-top: -@popover-arrow-outer-width;
122
123
  border-right-width: 0;
123
- border-left-color: #999; // IE8 fallback
124
- border-left-color: @popoverArrowOuterColor;
124
+ border-left-color: @popover-arrow-outer-fallback-color; // IE8 fallback
125
+ border-left-color: @popover-arrow-outer-color;
125
126
  &:after {
127
+ content: " ";
126
128
  right: 1px;
127
129
  border-right-width: 0;
128
- border-left-color: @popoverArrowColor;
129
- bottom: -@popoverArrowWidth;
130
+ border-left-color: @popover-arrow-color;
131
+ bottom: -@popover-arrow-width;
130
132
  }
131
133
  }
132
134