twbs_sass_rails 0.2.0 → 0.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (131) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +17 -8
  3. data/CONTRIBUTING.md +4 -4
  4. data/Gemfile.lock +52 -65
  5. data/LICENSE +2 -2
  6. data/README.md +48 -18
  7. data/Rakefile +67 -32
  8. data/app/assets/fonts/fontawesome-webfont.eot +0 -0
  9. data/app/assets/fonts/fontawesome-webfont.svg +23 -8
  10. data/app/assets/fonts/fontawesome-webfont.ttf +0 -0
  11. data/app/assets/fonts/fontawesome-webfont.woff +0 -0
  12. data/app/assets/fonts/glyphicons-halflings-regular.eot +0 -0
  13. data/app/assets/fonts/glyphicons-halflings-regular.svg +200 -199
  14. data/app/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
  15. data/app/assets/fonts/glyphicons-halflings-regular.woff +0 -0
  16. data/gemfiles/Gemfile.rails-3.2.x +2 -3
  17. data/gemfiles/Gemfile.rails-4.0.x +2 -3
  18. data/lib/generators/twbs_sass_rails/install/install_generator.rb +2 -2
  19. data/lib/generators/twbs_sass_rails/install/templates/{twbs-variables.css.less → twbs-variables.css.scss} +4 -3
  20. data/lib/generators/twbs_sass_rails/install/templates/{twbs.css.less → twbs.css.scss} +12 -7
  21. data/lib/twbs_sass_rails/version.rb +1 -1
  22. data/test/dummy/app/assets/stylesheets/{default-twbs.css.less → default-twbs.css.scss} +0 -0
  23. data/test/dummy/app/assets/stylesheets/test.css.scss +9 -0
  24. data/test/dummy/app/assets/stylesheets/twbs-variables.css.scss +7 -0
  25. data/test/dummy/app/assets/stylesheets/{twbs.css.less → twbs.css.scss} +12 -7
  26. data/test/dummy/config/application.rb +4 -1
  27. data/test/dummy/config/environments/development.rb +1 -1
  28. data/test/generators/install_generator_test.rb +4 -4
  29. data/test/integration/assets_precompile_integration_test.rb +11 -5
  30. data/test/integration/twbs_sass_rails_integration_test.rb +8 -7
  31. data/test/test_helper.rb +2 -4
  32. data/twbs_sass_rails.gemspec +6 -9
  33. data/vendor/assets/javascripts/respond.js +223 -212
  34. data/vendor/assets/javascripts/twbs/bootstrap/affix.js +36 -25
  35. data/vendor/assets/javascripts/twbs/bootstrap/alert.js +7 -17
  36. data/vendor/assets/javascripts/twbs/bootstrap/button.js +26 -28
  37. data/vendor/assets/javascripts/twbs/bootstrap/carousel.js +22 -34
  38. data/vendor/assets/javascripts/twbs/bootstrap/collapse.js +9 -18
  39. data/vendor/assets/javascripts/twbs/bootstrap/dropdown.js +25 -32
  40. data/vendor/assets/javascripts/twbs/bootstrap/modal.js +27 -30
  41. data/vendor/assets/javascripts/twbs/bootstrap/popover.js +16 -23
  42. data/vendor/assets/javascripts/twbs/bootstrap/scrollspy.js +19 -24
  43. data/vendor/assets/javascripts/twbs/bootstrap/tab.js +10 -20
  44. data/vendor/assets/javascripts/twbs/bootstrap/tooltip.js +54 -41
  45. data/vendor/assets/javascripts/twbs/bootstrap/transition.js +13 -21
  46. data/vendor/assets/stylesheets/fontawesome/_bordered-pulled.scss +16 -0
  47. data/vendor/assets/stylesheets/fontawesome/_core.scss +12 -0
  48. data/vendor/assets/stylesheets/fontawesome/_extras.scss +44 -0
  49. data/vendor/assets/stylesheets/fontawesome/_fixed-width.scss +6 -0
  50. data/vendor/assets/stylesheets/fontawesome/_icons.scss +412 -0
  51. data/vendor/assets/stylesheets/fontawesome/_larger.scss +13 -0
  52. data/vendor/assets/stylesheets/fontawesome/_list.scss +19 -0
  53. data/vendor/assets/stylesheets/fontawesome/_mixins.scss +20 -0
  54. data/vendor/assets/stylesheets/fontawesome/_path.scss +14 -0
  55. data/vendor/assets/stylesheets/fontawesome/_rotated-flipped.scss +9 -0
  56. data/vendor/assets/stylesheets/fontawesome/_spinning.scss +30 -0
  57. data/vendor/assets/stylesheets/fontawesome/_stacked.scss +20 -0
  58. data/vendor/assets/stylesheets/fontawesome/_variables.scss +381 -0
  59. data/vendor/assets/stylesheets/fontawesome/font-awesome.scss +17 -0
  60. data/vendor/assets/stylesheets/twbs/bootstrap/{alerts.less → _alerts.scss} +10 -10
  61. data/vendor/assets/stylesheets/twbs/bootstrap/{badges.less → _badges.scss} +19 -15
  62. data/vendor/assets/stylesheets/twbs/bootstrap/_breadcrumbs.scss +26 -0
  63. data/vendor/assets/stylesheets/twbs/bootstrap/{button-groups.less → _button-groups.scss} +38 -60
  64. data/vendor/assets/stylesheets/twbs/bootstrap/{buttons.less → _buttons.scss} +28 -34
  65. data/vendor/assets/stylesheets/twbs/bootstrap/{carousel.less → _carousel.scss} +38 -19
  66. data/vendor/assets/stylesheets/twbs/bootstrap/_close.scss +35 -0
  67. data/vendor/assets/stylesheets/twbs/bootstrap/_code.scss +63 -0
  68. data/vendor/assets/stylesheets/twbs/bootstrap/{component-animations.less → _component-animations.scss} +2 -2
  69. data/vendor/assets/stylesheets/twbs/bootstrap/{dropdowns.less → _dropdowns.scss} +53 -33
  70. data/vendor/assets/stylesheets/twbs/bootstrap/{forms.less → _forms.scss} +133 -79
  71. data/vendor/assets/stylesheets/twbs/bootstrap/{glyphicons.less → _glyphicons.scss} +16 -19
  72. data/vendor/assets/stylesheets/twbs/bootstrap/_grid.scss +100 -0
  73. data/vendor/assets/stylesheets/twbs/bootstrap/{input-groups.less → _input-groups.scss} +58 -29
  74. data/vendor/assets/stylesheets/twbs/bootstrap/_jumbotron.scss +44 -0
  75. data/vendor/assets/stylesheets/twbs/bootstrap/{labels.less → _labels.scss} +14 -8
  76. data/vendor/assets/stylesheets/twbs/bootstrap/_list-group.scss +110 -0
  77. data/vendor/assets/stylesheets/twbs/bootstrap/{media.less → _media.scss} +0 -0
  78. data/vendor/assets/stylesheets/twbs/bootstrap/_mixins.scss +931 -0
  79. data/vendor/assets/stylesheets/twbs/bootstrap/{modals.less → _modals.scss} +37 -40
  80. data/vendor/assets/stylesheets/twbs/bootstrap/_navbar.scss +620 -0
  81. data/vendor/assets/stylesheets/twbs/bootstrap/{navs.less → _navs.scss} +41 -52
  82. data/vendor/assets/stylesheets/twbs/bootstrap/{normalize.less → _normalize.scss} +148 -121
  83. data/vendor/assets/stylesheets/twbs/bootstrap/{pager.less → _pager.scss} +8 -8
  84. data/vendor/assets/stylesheets/twbs/bootstrap/_pagination.scss +88 -0
  85. data/vendor/assets/stylesheets/twbs/bootstrap/_panels.scss +230 -0
  86. data/vendor/assets/stylesheets/twbs/bootstrap/{popovers.less → _popovers.scss} +36 -36
  87. data/vendor/assets/stylesheets/twbs/bootstrap/{print.less → _print.scss} +6 -5
  88. data/vendor/assets/stylesheets/twbs/bootstrap/_progress-bars.scss +80 -0
  89. data/vendor/assets/stylesheets/twbs/bootstrap/_responsive-utilities.scss +80 -0
  90. data/vendor/assets/stylesheets/twbs/bootstrap/{scaffolding.less → _scaffolding.scss} +39 -24
  91. data/vendor/assets/stylesheets/twbs/bootstrap/{tables.less → _tables.scss} +42 -48
  92. data/vendor/assets/stylesheets/twbs/bootstrap/_theme.scss +247 -0
  93. data/vendor/assets/stylesheets/twbs/bootstrap/_thumbnails.scss +38 -0
  94. data/vendor/assets/stylesheets/twbs/bootstrap/_tooltip.scss +95 -0
  95. data/vendor/assets/stylesheets/twbs/bootstrap/_type.scss +296 -0
  96. data/vendor/assets/stylesheets/twbs/bootstrap/{utilities.less → _utilities.scss} +14 -3
  97. data/vendor/assets/stylesheets/twbs/bootstrap/_variables.scss +831 -0
  98. data/vendor/assets/stylesheets/twbs/bootstrap/{wells.less → _wells.scss} +6 -6
  99. data/vendor/assets/stylesheets/twbs/bootstrap/bootstrap.scss +48 -0
  100. data/vendor/assets/stylesheets/twbs/{bootstrap.less → bootstrap.scss} +0 -0
  101. metadata +94 -134
  102. data/test/dummy/app/assets/stylesheets/test.css.less +0 -5
  103. data/test/dummy/app/assets/stylesheets/twbs-variables.css.less +0 -6
  104. data/test/dummy/config/database.yml +0 -25
  105. data/test/dummy/db/.keep +0 -0
  106. data/vendor/assets/stylesheets/fontawesome/bootstrap.less +0 -84
  107. data/vendor/assets/stylesheets/fontawesome/core.less +0 -129
  108. data/vendor/assets/stylesheets/fontawesome/extras.less +0 -93
  109. data/vendor/assets/stylesheets/fontawesome/font-awesome.less +0 -33
  110. data/vendor/assets/stylesheets/fontawesome/icons.less +0 -381
  111. data/vendor/assets/stylesheets/fontawesome/mixins.less +0 -48
  112. data/vendor/assets/stylesheets/fontawesome/path.less +0 -14
  113. data/vendor/assets/stylesheets/fontawesome/variables.less +0 -735
  114. data/vendor/assets/stylesheets/twbs/bootstrap/bootstrap.less +0 -58
  115. data/vendor/assets/stylesheets/twbs/bootstrap/breadcrumbs.less +0 -23
  116. data/vendor/assets/stylesheets/twbs/bootstrap/close.less +0 -33
  117. data/vendor/assets/stylesheets/twbs/bootstrap/code.less +0 -56
  118. data/vendor/assets/stylesheets/twbs/bootstrap/grid.less +0 -346
  119. data/vendor/assets/stylesheets/twbs/bootstrap/jumbotron.less +0 -40
  120. data/vendor/assets/stylesheets/twbs/bootstrap/list-group.less +0 -88
  121. data/vendor/assets/stylesheets/twbs/bootstrap/mixins.less +0 -744
  122. data/vendor/assets/stylesheets/twbs/bootstrap/navbar.less +0 -621
  123. data/vendor/assets/stylesheets/twbs/bootstrap/pagination.less +0 -85
  124. data/vendor/assets/stylesheets/twbs/bootstrap/panels.less +0 -143
  125. data/vendor/assets/stylesheets/twbs/bootstrap/progress-bars.less +0 -96
  126. data/vendor/assets/stylesheets/twbs/bootstrap/responsive-utilities.less +0 -220
  127. data/vendor/assets/stylesheets/twbs/bootstrap/theme.less +0 -244
  128. data/vendor/assets/stylesheets/twbs/bootstrap/thumbnails.less +0 -32
  129. data/vendor/assets/stylesheets/twbs/bootstrap/tooltip.less +0 -95
  130. data/vendor/assets/stylesheets/twbs/bootstrap/type.less +0 -271
  131. data/vendor/assets/stylesheets/twbs/bootstrap/variables.less +0 -635
@@ -2,37 +2,6 @@
2
2
  // Button groups
3
3
  // --------------------------------------------------
4
4
 
5
- // Button carets
6
- //
7
- // Match the button text color to the arrow/caret for indicating dropdown-ness.
8
-
9
- .caret {
10
- .btn-default & {
11
- border-top-color: @btn-default-color;
12
- }
13
- .btn-primary &,
14
- .btn-success &,
15
- .btn-warning &,
16
- .btn-danger &,
17
- .btn-info & {
18
- border-top-color: #fff;
19
- }
20
- }
21
- .dropup {
22
- & .btn-default .caret {
23
- border-bottom-color: @btn-default-color;
24
- }
25
- .btn-primary,
26
- .btn-success,
27
- .btn-warning,
28
- .btn-danger,
29
- .btn-info {
30
- .caret {
31
- border-bottom-color: #fff;
32
- }
33
- }
34
- }
35
-
36
5
  // Make the div behave like a button
37
6
  .btn-group,
38
7
  .btn-group-vertical {
@@ -68,18 +37,17 @@
68
37
 
69
38
  // Optional: Group multiple button groups together for a toolbar
70
39
  .btn-toolbar {
71
- .clearfix();
40
+ margin-left: -5px; // Offset the first child's margin
41
+ @include clearfix();
72
42
 
73
- .btn-group {
43
+ .btn-group,
44
+ .input-group {
74
45
  float: left;
75
46
  }
76
- // Space out series of button groups
77
47
  > .btn,
78
- > .btn-group {
79
- + .btn,
80
- + .btn-group {
81
- margin-left: 5px;
82
- }
48
+ > .btn-group,
49
+ > .input-group {
50
+ margin-left: 5px;
83
51
  }
84
52
  }
85
53
 
@@ -91,13 +59,13 @@
91
59
  .btn-group > .btn:first-child {
92
60
  margin-left: 0;
93
61
  &:not(:last-child):not(.dropdown-toggle) {
94
- .border-right-radius(0);
62
+ @include border-right-radius(0);
95
63
  }
96
64
  }
97
65
  // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
98
66
  .btn-group > .btn:last-child:not(:first-child),
99
67
  .btn-group > .dropdown-toggle:not(:first-child) {
100
- .border-left-radius(0);
68
+ @include border-left-radius(0);
101
69
  }
102
70
 
103
71
  // Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group)
@@ -110,11 +78,11 @@
110
78
  .btn-group > .btn-group:first-child {
111
79
  > .btn:last-child,
112
80
  > .dropdown-toggle {
113
- .border-right-radius(0);
81
+ @include border-right-radius(0);
114
82
  }
115
83
  }
116
84
  .btn-group > .btn-group:last-child > .btn:first-child {
117
- .border-left-radius(0);
85
+ @include border-left-radius(0);
118
86
  }
119
87
 
120
88
  // On active and open, don't show outline
@@ -128,9 +96,9 @@
128
96
  //
129
97
  // Remix the default button sizing classes into new ones for easier manipulation.
130
98
 
131
- .btn-group-xs > .btn { .btn-xs(); }
132
- .btn-group-sm > .btn { .btn-sm(); }
133
- .btn-group-lg > .btn { .btn-lg(); }
99
+ .btn-group-xs > .btn { @extend .btn-xs; }
100
+ .btn-group-sm > .btn { @extend .btn-sm; }
101
+ .btn-group-lg > .btn { @extend .btn-lg; }
134
102
 
135
103
 
136
104
  // Split button dropdowns
@@ -149,7 +117,12 @@
149
117
  // The clickable button for toggling the menu
150
118
  // Remove the gradient and set the same inset shadow as the :active state
151
119
  .btn-group.open .dropdown-toggle {
152
- .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
120
+ @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
121
+
122
+ // Show no shadow for `.btn-link` since it has no other button styles.
123
+ &.btn-link {
124
+ @include box-shadow(none);
125
+ }
153
126
  }
154
127
 
155
128
 
@@ -159,12 +132,12 @@
159
132
  }
160
133
  // Carets in other button sizes
161
134
  .btn-lg .caret {
162
- border-width: @caret-width-large @caret-width-large 0;
135
+ border-width: $caret-width-large $caret-width-large 0;
163
136
  border-bottom-width: 0;
164
137
  }
165
138
  // Upside down carets for .dropup
166
139
  .dropup .btn-lg .caret {
167
- border-width: 0 @caret-width-large @caret-width-large;
140
+ border-width: 0 $caret-width-large $caret-width-large;
168
141
  }
169
142
 
170
143
 
@@ -173,7 +146,8 @@
173
146
 
174
147
  .btn-group-vertical {
175
148
  > .btn,
176
- > .btn-group {
149
+ > .btn-group,
150
+ > .btn-group > .btn {
177
151
  display: block;
178
152
  float: none;
179
153
  width: 100%;
@@ -182,7 +156,7 @@
182
156
 
183
157
  // Clear floats so dropdown menus can be properly placed
184
158
  > .btn-group {
185
- .clearfix();
159
+ @include clearfix();
186
160
  > .btn {
187
161
  float: none;
188
162
  }
@@ -202,25 +176,25 @@
202
176
  border-radius: 0;
203
177
  }
204
178
  &:first-child:not(:last-child) {
205
- border-top-right-radius: @border-radius-base;
206
- .border-bottom-radius(0);
179
+ border-top-right-radius: $border-radius-base;
180
+ @include border-bottom-radius(0);
207
181
  }
208
182
  &:last-child:not(:first-child) {
209
- border-bottom-left-radius: @border-radius-base;
210
- .border-top-radius(0);
183
+ border-bottom-left-radius: $border-radius-base;
184
+ @include border-top-radius(0);
211
185
  }
212
186
  }
213
187
  .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
214
188
  border-radius: 0;
215
189
  }
216
- .btn-group-vertical > .btn-group:first-child {
190
+ .btn-group-vertical > .btn-group:first-child:not(:last-child) {
217
191
  > .btn:last-child,
218
192
  > .dropdown-toggle {
219
- .border-bottom-radius(0);
193
+ @include border-bottom-radius(0);
220
194
  }
221
195
  }
222
- .btn-group-vertical > .btn-group:last-child > .btn:first-child {
223
- .border-top-radius(0);
196
+ .btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
197
+ @include border-top-radius(0);
224
198
  }
225
199
 
226
200
 
@@ -233,11 +207,15 @@
233
207
  width: 100%;
234
208
  table-layout: fixed;
235
209
  border-collapse: separate;
236
- .btn {
210
+ > .btn,
211
+ > .btn-group {
237
212
  float: none;
238
213
  display: table-cell;
239
214
  width: 1%;
240
215
  }
216
+ > .btn-group .btn {
217
+ width: 100%;
218
+ }
241
219
  }
242
220
 
243
221
 
@@ -6,30 +6,26 @@
6
6
  // Base styles
7
7
  // --------------------------------------------------
8
8
 
9
- // Core styles
10
9
  .btn {
11
10
  display: inline-block;
12
- padding: @padding-base-vertical @padding-base-horizontal;
13
11
  margin-bottom: 0; // For input.btn
14
- font-size: @font-size-base;
15
- font-weight: @btn-font-weight;
16
- line-height: @line-height-base;
12
+ font-weight: $btn-font-weight;
17
13
  text-align: center;
18
14
  vertical-align: middle;
19
15
  cursor: pointer;
20
16
  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
21
17
  border: 1px solid transparent;
22
- border-radius: @border-radius-base;
23
18
  white-space: nowrap;
24
- .user-select(none);
19
+ @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
20
+ @include user-select(none);
25
21
 
26
22
  &:focus {
27
- .tab-focus();
23
+ @include tab-focus();
28
24
  }
29
25
 
30
26
  &:hover,
31
27
  &:focus {
32
- color: @btn-default-color;
28
+ color: $btn-default-color;
33
29
  text-decoration: none;
34
30
  }
35
31
 
@@ -37,7 +33,7 @@
37
33
  &.active {
38
34
  outline: 0;
39
35
  background-image: none;
40
- .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
36
+ @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
41
37
  }
42
38
 
43
39
  &.disabled,
@@ -45,10 +41,9 @@
45
41
  fieldset[disabled] & {
46
42
  cursor: not-allowed;
47
43
  pointer-events: none; // Future-proof disabling of clicks
48
- .opacity(.65);
49
- .box-shadow(none);
44
+ @include opacity(.65);
45
+ @include box-shadow(none);
50
46
  }
51
-
52
47
  }
53
48
 
54
49
 
@@ -56,26 +51,26 @@
56
51
  // --------------------------------------------------
57
52
 
58
53
  .btn-default {
59
- .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
54
+ @include button-variant($btn-default-color, $btn-default-bg, $btn-default-border);
60
55
  }
61
56
  .btn-primary {
62
- .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
63
- }
64
- // Warning appears as orange
65
- .btn-warning {
66
- .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
67
- }
68
- // Danger and error appear as red
69
- .btn-danger {
70
- .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
57
+ @include button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border);
71
58
  }
72
59
  // Success appears as green
73
60
  .btn-success {
74
- .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
61
+ @include button-variant($btn-success-color, $btn-success-bg, $btn-success-border);
75
62
  }
76
63
  // Info appears as blue-green
77
64
  .btn-info {
78
- .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
65
+ @include button-variant($btn-info-color, $btn-info-bg, $btn-info-border);
66
+ }
67
+ // Warning appears as orange
68
+ .btn-warning {
69
+ @include button-variant($btn-warning-color, $btn-warning-bg, $btn-warning-border);
70
+ }
71
+ // Danger and error appear as red
72
+ .btn-danger {
73
+ @include button-variant($btn-danger-color, $btn-danger-bg, $btn-danger-border);
79
74
  }
80
75
 
81
76
 
@@ -84,7 +79,7 @@
84
79
 
85
80
  // Make a button look and behave like a link
86
81
  .btn-link {
87
- color: @link-color;
82
+ color: $link-color;
88
83
  font-weight: normal;
89
84
  cursor: pointer;
90
85
  border-radius: 0;
@@ -94,7 +89,7 @@
94
89
  &[disabled],
95
90
  fieldset[disabled] & {
96
91
  background-color: transparent;
97
- .box-shadow(none);
92
+ @include box-shadow(none);
98
93
  }
99
94
  &,
100
95
  &:hover,
@@ -104,7 +99,7 @@
104
99
  }
105
100
  &:hover,
106
101
  &:focus {
107
- color: @link-hover-color;
102
+ color: $link-hover-color;
108
103
  text-decoration: underline;
109
104
  background-color: transparent;
110
105
  }
@@ -112,7 +107,7 @@
112
107
  fieldset[disabled] & {
113
108
  &:hover,
114
109
  &:focus {
115
- color: @btn-link-disabled-color;
110
+ color: $btn-link-disabled-color;
116
111
  text-decoration: none;
117
112
  }
118
113
  }
@@ -124,15 +119,14 @@
124
119
 
125
120
  .btn-lg {
126
121
  // line-height: ensure even-numbered height of button next to large input
127
- .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
122
+ @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
128
123
  }
129
- .btn-sm,
130
- .btn-xs {
124
+ .btn-sm {
131
125
  // line-height: ensure proper height of button next to small input
132
- .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
126
+ @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
133
127
  }
134
128
  .btn-xs {
135
- padding: 1px 5px;
129
+ @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
136
130
  }
137
131
 
138
132
 
@@ -16,12 +16,12 @@
16
16
  > .item {
17
17
  display: none;
18
18
  position: relative;
19
- .transition(.6s ease-in-out left);
19
+ @include transition(.6s ease-in-out left);
20
20
 
21
21
  // Account for jankitude on images
22
22
  > img,
23
23
  > a > img {
24
- .img-responsive();
24
+ @include img-responsive();
25
25
  line-height: 1;
26
26
  }
27
27
  }
@@ -69,31 +69,32 @@
69
69
  top: 0;
70
70
  left: 0;
71
71
  bottom: 0;
72
- width: @carousel-control-width;
73
- .opacity(@carousel-control-opacity);
74
- font-size: @carousel-control-font-size;
75
- color: @carousel-control-color;
72
+ width: $carousel-control-width;
73
+ @include opacity($carousel-control-opacity);
74
+ font-size: $carousel-control-font-size;
75
+ color: $carousel-control-color;
76
76
  text-align: center;
77
- text-shadow: @carousel-text-shadow;
78
- // We can't have this transition here because webkit cancels the carousel
77
+ text-shadow: $carousel-text-shadow;
78
+ // We can't have this transition here because WebKit cancels the carousel
79
79
  // animation if you trip this while in the middle of another animation.
80
80
 
81
81
  // Set gradients for backgrounds
82
82
  &.left {
83
- #gradient > .horizontal(@start-color: rgba(0,0,0,.5); @end-color: rgba(0,0,0,.0001));
83
+ @include gradient-horizontal($start-color: rgba(0,0,0,.5), $end-color: rgba(0,0,0,.0001));
84
84
  }
85
85
  &.right {
86
86
  left: auto;
87
87
  right: 0;
88
- #gradient > .horizontal(@start-color: rgba(0,0,0,.0001); @end-color: rgba(0,0,0,.5));
88
+ @include gradient-horizontal($start-color: rgba(0,0,0,.0001), $end-color: rgba(0,0,0,.5));
89
89
  }
90
90
 
91
91
  // Hover/focus state
92
92
  &:hover,
93
93
  &:focus {
94
- color: @carousel-control-color;
94
+ outline: none;
95
+ color: $carousel-control-color;
95
96
  text-decoration: none;
96
- .opacity(.9);
97
+ @include opacity(.9);
97
98
  }
98
99
 
99
100
  // Toggles
@@ -103,11 +104,18 @@
103
104
  .glyphicon-chevron-right {
104
105
  position: absolute;
105
106
  top: 50%;
106
- left: 50%;
107
107
  z-index: 5;
108
108
  display: inline-block;
109
109
  }
110
110
  .icon-prev,
111
+ .glyphicon-chevron-left {
112
+ left: 50%;
113
+ }
114
+ .icon-next,
115
+ .glyphicon-chevron-right {
116
+ right: 50%;
117
+ }
118
+ .icon-prev,
111
119
  .icon-next {
112
120
  width: 20px;
113
121
  height: 20px;
@@ -150,15 +158,26 @@
150
158
  height: 10px;
151
159
  margin: 1px;
152
160
  text-indent: -999px;
153
- border: 1px solid @carousel-indicator-border-color;
161
+ border: 1px solid $carousel-indicator-border-color;
154
162
  border-radius: 10px;
155
163
  cursor: pointer;
164
+
165
+ // IE8-9 hack for event handling
166
+ //
167
+ // Internet Explorer 8-9 does not support clicks on elements without a set
168
+ // `background-color`. We cannot use `filter` since that's not viewed as a
169
+ // background color by the browser. Thus, a hack is needed.
170
+ //
171
+ // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
172
+ // set alpha transparency for the best results possible.
173
+ background-color: #000 \9; // IE8
174
+ background-color: rgba(0,0,0,0); // IE9
156
175
  }
157
176
  .active {
158
177
  margin: 0;
159
178
  width: 12px;
160
179
  height: 12px;
161
- background-color: @carousel-indicator-active-bg;
180
+ background-color: $carousel-indicator-active-bg;
162
181
  }
163
182
  }
164
183
 
@@ -173,9 +192,9 @@
173
192
  z-index: 10;
174
193
  padding-top: 20px;
175
194
  padding-bottom: 20px;
176
- color: @carousel-caption-color;
195
+ color: $carousel-caption-color;
177
196
  text-align: center;
178
- text-shadow: @carousel-text-shadow;
197
+ text-shadow: $carousel-text-shadow;
179
198
  & .btn {
180
199
  text-shadow: none; // No shadow for button elements in carousel-caption
181
200
  }
@@ -183,12 +202,12 @@
183
202
 
184
203
 
185
204
  // Scale up controls for tablets and up
186
- @media screen and (min-width: @screen-sm) {
205
+ @media screen and (min-width: $screen-sm-min) {
187
206
 
188
207
  // Scale up the controls a smidge
189
208
  .carousel-control {
190
209
  .glyphicons-chevron-left,
191
- .glyphicons-chevron-right
210
+ .glyphicons-chevron-right,
192
211
  .icon-prev,
193
212
  .icon-next {
194
213
  width: 30px;
@@ -0,0 +1,35 @@
1
+ //
2
+ // Close icons
3
+ // --------------------------------------------------
4
+
5
+
6
+ .close {
7
+ float: right;
8
+ font-size: ($font-size-base * 1.5);
9
+ font-weight: $close-font-weight;
10
+ line-height: 1;
11
+ color: $close-color;
12
+ text-shadow: $close-text-shadow;
13
+ @include opacity(.2);
14
+
15
+ &:hover,
16
+ &:focus {
17
+ color: $close-color;
18
+ text-decoration: none;
19
+ cursor: pointer;
20
+ @include opacity(.5);
21
+ }
22
+
23
+ // [converter] extracted button& to button.close
24
+ }
25
+
26
+ // Additional properties for button version
27
+ // iOS requires the button element instead of an anchor tag.
28
+ // If you want the anchor version, it requires `href="#"`.
29
+ button.close {
30
+ padding: 0;
31
+ cursor: pointer;
32
+ background: transparent;
33
+ border: 0;
34
+ -webkit-appearance: none;
35
+ }
@@ -0,0 +1,63 @@
1
+ //
2
+ // Code (inline and block)
3
+ // --------------------------------------------------
4
+
5
+
6
+ // Inline and block code styles
7
+ code,
8
+ kbd,
9
+ pre,
10
+ samp {
11
+ font-family: $font-family-monospace;
12
+ }
13
+
14
+ // Inline code
15
+ code {
16
+ padding: 2px 4px;
17
+ font-size: 90%;
18
+ color: $code-color;
19
+ background-color: $code-bg;
20
+ white-space: nowrap;
21
+ border-radius: $border-radius-base;
22
+ }
23
+
24
+ // User input typically entered via keyboard
25
+ kbd {
26
+ padding: 2px 4px;
27
+ font-size: 90%;
28
+ color: $kbd-color;
29
+ background-color: $kbd-bg;
30
+ border-radius: $border-radius-small;
31
+ box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);
32
+ }
33
+
34
+ // Blocks of code
35
+ pre {
36
+ display: block;
37
+ padding: (($line-height-computed - 1) / 2);
38
+ margin: 0 0 ($line-height-computed / 2);
39
+ font-size: ($font-size-base - 1); // 14px to 13px
40
+ line-height: $line-height-base;
41
+ word-break: break-all;
42
+ word-wrap: break-word;
43
+ color: $pre-color;
44
+ background-color: $pre-bg;
45
+ border: 1px solid $pre-border-color;
46
+ border-radius: $border-radius-base;
47
+
48
+ // Account for some code outputs that place code tags in pre tags
49
+ code {
50
+ padding: 0;
51
+ font-size: inherit;
52
+ color: inherit;
53
+ white-space: pre-wrap;
54
+ background-color: transparent;
55
+ border-radius: 0;
56
+ }
57
+ }
58
+
59
+ // Enable scrollable blocks of code
60
+ .pre-scrollable {
61
+ max-height: $pre-scrollable-max-height;
62
+ overflow-y: scroll;
63
+ }
@@ -9,7 +9,7 @@
9
9
 
10
10
  .fade {
11
11
  opacity: 0;
12
- .transition(opacity .15s linear);
12
+ @include transition(opacity .15s linear);
13
13
  &.in {
14
14
  opacity: 1;
15
15
  }
@@ -25,5 +25,5 @@
25
25
  position: relative;
26
26
  height: 0;
27
27
  overflow: hidden;
28
- .transition(height .35s ease);
28
+ @include transition(height .35s ease);
29
29
  }