bootstrap-generators 2.3.2 → 3.0.0

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 (179) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +12 -2
  3. data/{LICENSE.txt → MIT-LICENSE} +1 -3
  4. data/README.md +19 -64
  5. data/Rakefile +24 -22
  6. data/bootstrap-generators.gemspec +3 -1
  7. data/lib/bootstrap-generators.rb +12 -1
  8. data/lib/bootstrap/generators/version.rb +1 -1
  9. data/lib/generators/bootstrap/install/install_generator.rb +9 -24
  10. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +498 -179
  11. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +620 -0
  12. data/lib/generators/bootstrap/install/templates/assets/stylesheets/{fluid.css → starter.css} +6 -6
  13. data/lib/generators/bootstrap/install/templates/assets/stylesheets/{fluid.css.less → starter.less} +7 -7
  14. data/lib/generators/bootstrap/install/templates/assets/stylesheets/{fluid.css.scss → starter.scss} +7 -8
  15. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb +11 -9
  16. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml +9 -8
  17. data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb +50 -0
  18. data/lib/generators/bootstrap/install/templates/layouts/{hero.html.haml → starter.html.haml} +0 -0
  19. data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/edit.html.erb +3 -3
  20. data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/index.html.erb +25 -25
  21. data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/new.html.erb +2 -2
  22. data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/show.html.erb +5 -5
  23. data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/edit.html.haml +3 -3
  24. data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/index.html.haml +20 -19
  25. data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/new.html.haml +2 -2
  26. data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/show.html.haml +5 -5
  27. data/readme-template.md.erb +5 -48
  28. data/test/lib/generators/bootstrap/install_generator_test.rb +3 -33
  29. data/vendor/assets/fonts/glyphicons-halflings-regular.eot +0 -0
  30. data/vendor/assets/fonts/glyphicons-halflings-regular.svg +228 -0
  31. data/vendor/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
  32. data/vendor/assets/fonts/glyphicons-halflings-regular.woff +0 -0
  33. data/vendor/assets/javascripts/bootstrap-ie.js +2 -0
  34. data/vendor/assets/javascripts/bootstrap-ie/html5shiv.js +8 -0
  35. data/vendor/assets/javascripts/bootstrap-ie/respond.min.js +6 -0
  36. data/vendor/assets/javascripts/bootstrap.js +12 -13
  37. data/vendor/assets/javascripts/bootstrap/affix.js +126 -0
  38. data/vendor/assets/javascripts/{bootstrap-alert.js → bootstrap/alert.js} +35 -36
  39. data/vendor/assets/javascripts/bootstrap/button.js +109 -0
  40. data/vendor/assets/javascripts/bootstrap/carousel.js +217 -0
  41. data/vendor/assets/javascripts/bootstrap/collapse.js +179 -0
  42. data/vendor/assets/javascripts/bootstrap/dropdown.js +154 -0
  43. data/vendor/assets/javascripts/bootstrap/modal.js +246 -0
  44. data/vendor/assets/javascripts/bootstrap/popover.js +117 -0
  45. data/vendor/assets/javascripts/bootstrap/scrollspy.js +158 -0
  46. data/vendor/assets/javascripts/bootstrap/tab.js +135 -0
  47. data/vendor/assets/javascripts/bootstrap/tooltip.js +386 -0
  48. data/vendor/assets/javascripts/bootstrap/transition.js +56 -0
  49. data/vendor/assets/stylesheets/bootstrap.css +4638 -4000
  50. data/vendor/twitter/bootstrap/less/alerts.less +46 -58
  51. data/vendor/twitter/bootstrap/less/badges.less +51 -0
  52. data/vendor/twitter/bootstrap/less/bootstrap.less +27 -31
  53. data/vendor/twitter/bootstrap/less/breadcrumbs.less +7 -8
  54. data/vendor/twitter/bootstrap/less/button-groups.less +173 -154
  55. data/vendor/twitter/bootstrap/less/buttons.less +97 -165
  56. data/vendor/twitter/bootstrap/less/carousel.less +115 -64
  57. data/vendor/twitter/bootstrap/less/close.less +20 -19
  58. data/vendor/twitter/bootstrap/less/code.less +17 -22
  59. data/vendor/twitter/bootstrap/less/component-animations.less +10 -3
  60. data/vendor/twitter/bootstrap/less/dropdowns.less +92 -147
  61. data/vendor/twitter/bootstrap/less/forms.less +224 -561
  62. data/vendor/twitter/bootstrap/less/glyphicons.less +232 -0
  63. data/vendor/twitter/bootstrap/less/grid.less +336 -11
  64. data/vendor/twitter/bootstrap/less/input-groups.less +127 -0
  65. data/vendor/twitter/bootstrap/less/jumbotron.less +40 -0
  66. data/vendor/twitter/bootstrap/less/labels.less +58 -0
  67. data/vendor/twitter/bootstrap/less/list-group.less +88 -0
  68. data/vendor/twitter/bootstrap/less/media.less +8 -7
  69. data/vendor/twitter/bootstrap/less/mixins.less +487 -466
  70. data/vendor/twitter/bootstrap/less/modals.less +98 -52
  71. data/vendor/twitter/bootstrap/less/navbar.less +507 -383
  72. data/vendor/twitter/bootstrap/less/navs.less +169 -349
  73. data/vendor/twitter/bootstrap/less/normalize.less +396 -0
  74. data/vendor/twitter/bootstrap/less/pager.less +45 -33
  75. data/vendor/twitter/bootstrap/less/pagination.less +65 -105
  76. data/vendor/twitter/bootstrap/less/panels.less +148 -0
  77. data/vendor/twitter/bootstrap/less/popovers.less +51 -51
  78. data/vendor/twitter/bootstrap/less/print.less +100 -0
  79. data/vendor/twitter/bootstrap/less/progress-bars.less +28 -55
  80. data/vendor/twitter/bootstrap/less/responsive-utilities.less +195 -34
  81. data/vendor/twitter/bootstrap/less/scaffolding.less +101 -24
  82. data/vendor/twitter/bootstrap/less/tables.less +170 -178
  83. data/vendor/twitter/bootstrap/less/theme.less +232 -0
  84. data/vendor/twitter/bootstrap/less/thumbnails.less +11 -33
  85. data/vendor/twitter/bootstrap/less/tooltip.less +45 -20
  86. data/vendor/twitter/bootstrap/less/type.less +100 -109
  87. data/vendor/twitter/bootstrap/less/utilities.less +19 -7
  88. data/vendor/twitter/bootstrap/less/variables.less +498 -179
  89. data/vendor/twitter/bootstrap/less/wells.less +7 -7
  90. data/vendor/twitter/bootstrap/sass/_alerts.scss +46 -58
  91. data/vendor/twitter/bootstrap/sass/_badges.scss +51 -0
  92. data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +8 -9
  93. data/vendor/twitter/bootstrap/sass/_button-groups.scss +173 -154
  94. data/vendor/twitter/bootstrap/sass/_buttons.scss +97 -165
  95. data/vendor/twitter/bootstrap/sass/_carousel.scss +116 -65
  96. data/vendor/twitter/bootstrap/sass/_close.scss +9 -8
  97. data/vendor/twitter/bootstrap/sass/_code.scss +16 -21
  98. data/vendor/twitter/bootstrap/sass/_component-animations.scss +10 -3
  99. data/vendor/twitter/bootstrap/sass/_dropdowns.scss +94 -148
  100. data/vendor/twitter/bootstrap/sass/_forms.scss +220 -559
  101. data/vendor/twitter/bootstrap/sass/_glyphicons.scss +232 -0
  102. data/vendor/twitter/bootstrap/sass/_grid.scss +336 -11
  103. data/vendor/twitter/bootstrap/sass/_input-groups.scss +127 -0
  104. data/vendor/twitter/bootstrap/sass/_jumbotron.scss +40 -0
  105. data/vendor/twitter/bootstrap/sass/_labels.scss +58 -0
  106. data/vendor/twitter/bootstrap/sass/_list-group.scss +88 -0
  107. data/vendor/twitter/bootstrap/sass/_media.scss +8 -7
  108. data/vendor/twitter/bootstrap/sass/_mixins.scss +465 -433
  109. data/vendor/twitter/bootstrap/sass/_modals.scss +102 -52
  110. data/vendor/twitter/bootstrap/sass/_navbar.scss +511 -383
  111. data/vendor/twitter/bootstrap/sass/_navs.scss +169 -349
  112. data/vendor/twitter/bootstrap/sass/_normalize.scss +396 -0
  113. data/vendor/twitter/bootstrap/sass/_pager.scss +45 -33
  114. data/vendor/twitter/bootstrap/sass/_pagination.scss +65 -105
  115. data/vendor/twitter/bootstrap/sass/_panels.scss +148 -0
  116. data/vendor/twitter/bootstrap/sass/_popovers.scss +51 -51
  117. data/vendor/twitter/bootstrap/sass/_print.scss +100 -0
  118. data/vendor/twitter/bootstrap/sass/_progress-bars.scss +28 -55
  119. data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +180 -45
  120. data/vendor/twitter/bootstrap/sass/_scaffolding.scss +101 -24
  121. data/vendor/twitter/bootstrap/sass/_tables.scss +169 -168
  122. data/vendor/twitter/bootstrap/sass/_theme.scss +232 -0
  123. data/vendor/twitter/bootstrap/sass/_thumbnails.scss +11 -33
  124. data/vendor/twitter/bootstrap/sass/_tooltip.scss +45 -20
  125. data/vendor/twitter/bootstrap/sass/_type.scss +101 -110
  126. data/vendor/twitter/bootstrap/sass/_utilities.scss +19 -22
  127. data/vendor/twitter/bootstrap/sass/_variables.scss +498 -179
  128. data/vendor/twitter/bootstrap/sass/_wells.scss +7 -7
  129. data/vendor/twitter/bootstrap/sass/bootstrap.scss +29 -33
  130. metadata +47 -56
  131. data/lib/bootstrap/generators/engine.rb +0 -14
  132. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +0 -301
  133. data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css +0 -18
  134. data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.less +0 -19
  135. data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.scss +0 -19
  136. data/lib/generators/bootstrap/install/templates/config/initializers/simple_form.rb +0 -176
  137. data/lib/generators/bootstrap/install/templates/config/locales/simple_form.en.yml +0 -24
  138. data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.erb +0 -13
  139. data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.haml +0 -10
  140. data/lib/generators/bootstrap/install/templates/layouts/fluid.html.erb +0 -80
  141. data/lib/generators/bootstrap/install/templates/layouts/fluid.html.haml +0 -94
  142. data/lib/generators/bootstrap/install/templates/layouts/hero.html.erb +0 -53
  143. data/vendor/assets/images/glyphicons-halflings-white.png +0 -0
  144. data/vendor/assets/images/glyphicons-halflings.png +0 -0
  145. data/vendor/assets/javascripts/bootstrap-affix.js +0 -117
  146. data/vendor/assets/javascripts/bootstrap-button.js +0 -105
  147. data/vendor/assets/javascripts/bootstrap-carousel.js +0 -207
  148. data/vendor/assets/javascripts/bootstrap-collapse.js +0 -167
  149. data/vendor/assets/javascripts/bootstrap-dropdown.js +0 -169
  150. data/vendor/assets/javascripts/bootstrap-modal.js +0 -247
  151. data/vendor/assets/javascripts/bootstrap-popover.js +0 -114
  152. data/vendor/assets/javascripts/bootstrap-scrollspy.js +0 -162
  153. data/vendor/assets/javascripts/bootstrap-tab.js +0 -144
  154. data/vendor/assets/javascripts/bootstrap-tooltip.js +0 -361
  155. data/vendor/assets/javascripts/bootstrap-transition.js +0 -60
  156. data/vendor/assets/javascripts/bootstrap-typeahead.js +0 -335
  157. data/vendor/assets/stylesheets/bootstrap-responsive.css +0 -1109
  158. data/vendor/twitter/bootstrap/less/accordion.less +0 -34
  159. data/vendor/twitter/bootstrap/less/hero-unit.less +0 -25
  160. data/vendor/twitter/bootstrap/less/labels-badges.less +0 -84
  161. data/vendor/twitter/bootstrap/less/layouts.less +0 -16
  162. data/vendor/twitter/bootstrap/less/reset.less +0 -216
  163. data/vendor/twitter/bootstrap/less/responsive-1200px-min.less +0 -28
  164. data/vendor/twitter/bootstrap/less/responsive-767px-max.less +0 -193
  165. data/vendor/twitter/bootstrap/less/responsive-768px-979px.less +0 -19
  166. data/vendor/twitter/bootstrap/less/responsive-navbar.less +0 -189
  167. data/vendor/twitter/bootstrap/less/responsive.less +0 -48
  168. data/vendor/twitter/bootstrap/less/sprites.less +0 -197
  169. data/vendor/twitter/bootstrap/sass/_accordion.scss +0 -34
  170. data/vendor/twitter/bootstrap/sass/_hero-unit.scss +0 -25
  171. data/vendor/twitter/bootstrap/sass/_labels-badges.scss +0 -83
  172. data/vendor/twitter/bootstrap/sass/_layouts.scss +0 -16
  173. data/vendor/twitter/bootstrap/sass/_reset.scss +0 -216
  174. data/vendor/twitter/bootstrap/sass/_responsive-1200px-min.scss +0 -28
  175. data/vendor/twitter/bootstrap/sass/_responsive-767px-max.scss +0 -193
  176. data/vendor/twitter/bootstrap/sass/_responsive-768px-979px.scss +0 -19
  177. data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +0 -189
  178. data/vendor/twitter/bootstrap/sass/_sprites.scss +0 -197
  179. data/vendor/twitter/bootstrap/sass/responsive.scss +0 -48
@@ -6,223 +6,155 @@
6
6
  // Base styles
7
7
  // --------------------------------------------------
8
8
 
9
- // Core
9
+ // Core styles
10
10
  .btn {
11
11
  display: inline-block;
12
- @include ie7-inline-block();
13
- padding: 4px 12px;
12
+ padding: $padding-base-vertical $padding-base-horizontal;
14
13
  margin-bottom: 0; // For input.btn
15
- font-size: $baseFontSize;
16
- line-height: $baseLineHeight;
14
+ font-size: $font-size-base;
15
+ font-weight: $btn-font-weight;
16
+ line-height: $line-height-base;
17
17
  text-align: center;
18
18
  vertical-align: middle;
19
19
  cursor: pointer;
20
- @include buttonBackground($btnBackground, $btnBackgroundHighlight, $grayDark, 0 1px 1px rgba(255,255,255,.75));
21
- border: 1px solid $btnBorder;
22
- *border: 0; // Remove the border to prevent IE7's black border on input:focus
23
- border-bottom-color: darken($btnBorder, 10%);
24
- @include border-radius($baseBorderRadius);
25
- @include ie7-restore-left-whitespace(); // Give IE7 some love
26
- @include box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
27
-
28
- // Hover/focus state
29
- &:hover,
30
- &:focus {
31
- color: $grayDark;
32
- text-decoration: none;
33
- background-position: 0 -15px;
20
+ border: 1px solid transparent;
21
+ border-radius: $border-radius-base;
22
+ white-space: nowrap;
23
+ @include user-select(none);
34
24
 
35
- // transition is only when going to hover/focus, otherwise the background
36
- // behind the gradient (there for IE<=9 fallback) gets mismatched
37
- @include transition(background-position .1s linear);
25
+ &:focus {
26
+ @include tab-focus();
38
27
  }
39
28
 
40
- // Focus state for keyboard and accessibility
29
+ &:hover,
41
30
  &:focus {
42
- @include tab-focus();
31
+ color: $btn-default-color;
32
+ text-decoration: none;
43
33
  }
44
34
 
45
- // Active state
46
- &.active,
47
- &:active {
48
- background-image: none;
35
+ &:active,
36
+ &.active {
49
37
  outline: 0;
50
- @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
38
+ background-image: none;
39
+ @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
51
40
  }
52
41
 
53
- // Disabled state
54
42
  &.disabled,
55
- &[disabled] {
56
- cursor: default;
57
- background-image: none;
58
- @include opacity(65);
43
+ &[disabled],
44
+ fieldset[disabled] & {
45
+ cursor: not-allowed;
46
+ pointer-events: none; // Future-proof disabling of clicks
47
+ @include opacity(.65);
59
48
  @include box-shadow(none);
60
49
  }
61
50
 
62
51
  }
63
52
 
64
53
 
65
-
66
- // Button Sizes
67
- // --------------------------------------------------
68
-
69
- // Large
70
- .btn-large {
71
- padding: $paddingLarge;
72
- font-size: $fontSizeLarge;
73
- @include border-radius($borderRadiusLarge);
74
- }
75
- .btn-large [class^="icon-"],
76
- .btn-large [class*=" icon-"] {
77
- margin-top: 4px;
78
- }
79
-
80
- // Small
81
- .btn-small {
82
- padding: $paddingSmall;
83
- font-size: $fontSizeSmall;
84
- @include border-radius($borderRadiusSmall);
85
- }
86
- .btn-small [class^="icon-"],
87
- .btn-small [class*=" icon-"] {
88
- margin-top: 0;
89
- }
90
- .btn-mini [class^="icon-"],
91
- .btn-mini [class*=" icon-"] {
92
- margin-top: -1px;
93
- }
94
-
95
- // Mini
96
- .btn-mini {
97
- padding: $paddingMini;
98
- font-size: $fontSizeMini;
99
- @include border-radius($borderRadiusSmall);
100
- }
101
-
102
-
103
- // Block button
104
- // -------------------------
105
-
106
- .btn-block {
107
- display: block;
108
- width: 100%;
109
- padding-left: 0;
110
- padding-right: 0;
111
- @include box-sizing(border-box);
112
- }
113
-
114
- // Vertically space out multiple block buttons
115
- .btn-block + .btn-block {
116
- margin-top: 5px;
117
- }
118
-
119
- // Specificity overrides
120
- input[type="submit"],
121
- input[type="reset"],
122
- input[type="button"] {
123
- &.btn-block {
124
- width: 100%;
125
- }
126
- }
127
-
128
-
129
-
130
54
  // Alternate buttons
131
55
  // --------------------------------------------------
132
56
 
133
- // Provide *some* extra contrast for those who can get it
134
- .btn-primary.active,
135
- .btn-warning.active,
136
- .btn-danger.active,
137
- .btn-success.active,
138
- .btn-info.active,
139
- .btn-inverse.active {
140
- color: rgba(255,255,255,.75);
57
+ .btn-default {
58
+ @include button-variant($btn-default-color, $btn-default-bg, $btn-default-border);
141
59
  }
142
-
143
- // Set the backgrounds
144
- // -------------------------
145
60
  .btn-primary {
146
- @include buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight);
61
+ @include button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border);
147
62
  }
148
- // Warning appears are orange
63
+ // Warning appears as orange
149
64
  .btn-warning {
150
- @include buttonBackground($btnWarningBackground, $btnWarningBackgroundHighlight);
65
+ @include button-variant($btn-warning-color, $btn-warning-bg, $btn-warning-border);
151
66
  }
152
67
  // Danger and error appear as red
153
68
  .btn-danger {
154
- @include buttonBackground($btnDangerBackground, $btnDangerBackgroundHighlight);
69
+ @include button-variant($btn-danger-color, $btn-danger-bg, $btn-danger-border);
155
70
  }
156
71
  // Success appears as green
157
72
  .btn-success {
158
- @include buttonBackground($btnSuccessBackground, $btnSuccessBackgroundHighlight);
73
+ @include button-variant($btn-success-color, $btn-success-bg, $btn-success-border);
159
74
  }
160
- // Info appears as a neutral blue
75
+ // Info appears as blue-green
161
76
  .btn-info {
162
- @include buttonBackground($btnInfoBackground, $btnInfoBackgroundHighlight);
163
- }
164
- // Inverse appears as dark gray
165
- .btn-inverse {
166
- @include buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight);
77
+ @include button-variant($btn-info-color, $btn-info-bg, $btn-info-border);
167
78
  }
168
79
 
169
80
 
170
- // Cross-browser Jank
171
- // --------------------------------------------------
81
+ // Link buttons
82
+ // -------------------------
172
83
 
173
- button.btn,
174
- input[type="submit"].btn {
84
+ // Make a button look and behave like a link
85
+ .btn-link {
86
+ color: $link-color;
87
+ font-weight: normal;
88
+ cursor: pointer;
89
+ border-radius: 0;
175
90
 
176
- // Firefox 3.6 only I believe
177
- &::-moz-focus-inner {
178
- padding: 0;
179
- border: 0;
91
+ &,
92
+ &:active,
93
+ &[disabled],
94
+ fieldset[disabled] & {
95
+ background-color: transparent;
96
+ @include box-shadow(none);
180
97
  }
181
-
182
- // IE7 has some default padding on button controls
183
- *padding-top: 3px;
184
- *padding-bottom: 3px;
185
-
186
- &.btn-large {
187
- *padding-top: 7px;
188
- *padding-bottom: 7px;
98
+ &,
99
+ &:hover,
100
+ &:focus,
101
+ &:active {
102
+ border-color: transparent;
189
103
  }
190
- &.btn-small {
191
- *padding-top: 3px;
192
- *padding-bottom: 3px;
104
+ &:hover,
105
+ &:focus {
106
+ color: $link-hover-color;
107
+ text-decoration: underline;
108
+ background-color: transparent;
193
109
  }
194
- &.btn-mini {
195
- *padding-top: 1px;
196
- *padding-bottom: 1px;
110
+ &[disabled],
111
+ fieldset[disabled] & {
112
+ &:hover,
113
+ &:focus {
114
+ color: $btn-link-disabled-color;
115
+ text-decoration: none;
116
+ }
197
117
  }
198
118
  }
199
119
 
200
120
 
201
- // Link buttons
121
+ // Button Sizes
202
122
  // --------------------------------------------------
203
123
 
204
- // Make a button look and behave like a link
205
- .btn-link,
206
- .btn-link:active,
207
- .btn-link[disabled] {
208
- background-color: transparent;
209
- background-image: none;
210
- @include box-shadow(none);
124
+ .btn-lg {
125
+ // line-height: ensure even-numbered height of button next to large input
126
+ @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
211
127
  }
212
- .btn-link {
213
- border-color: transparent;
214
- cursor: pointer;
215
- color: $linkColor;
216
- @include border-radius(0);
128
+ .btn-sm,
129
+ .btn-xs {
130
+ // line-height: ensure proper height of button next to small input
131
+ @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
217
132
  }
218
- .btn-link:hover,
219
- .btn-link:focus {
220
- color: $linkColorHover;
221
- text-decoration: underline;
222
- background-color: transparent;
133
+ .btn-xs {
134
+ padding: 1px 5px;
223
135
  }
224
- .btn-link[disabled]:hover,
225
- .btn-link[disabled]:focus {
226
- color: $grayDark;
227
- text-decoration: none;
136
+
137
+
138
+ // Block button
139
+ // --------------------------------------------------
140
+
141
+ .btn-block {
142
+ display: block;
143
+ width: 100%;
144
+ padding-left: 0;
145
+ padding-right: 0;
146
+ }
147
+
148
+ // Vertically space out multiple block buttons
149
+ .btn-block + .btn-block {
150
+ margin-top: 5px;
151
+ }
152
+
153
+ // Specificity overrides
154
+ input[type="submit"],
155
+ input[type="reset"],
156
+ input[type="button"] {
157
+ &.btn-block {
158
+ width: 100%;
159
+ }
228
160
  }
@@ -3,29 +3,25 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
+ // Wrapper for the slide container and indicators
6
7
  .carousel {
7
8
  position: relative;
8
- margin-bottom: $baseLineHeight;
9
- line-height: 1;
10
9
  }
11
10
 
12
11
  .carousel-inner {
12
+ position: relative;
13
13
  overflow: hidden;
14
14
  width: 100%;
15
- position: relative;
16
- }
17
-
18
- .carousel-inner {
19
15
 
20
16
  > .item {
21
17
  display: none;
22
18
  position: relative;
23
19
  @include transition(.6s ease-in-out left);
24
20
 
25
- // Account for jankitude on images
21
+ // Account for jankitude on images
26
22
  > img,
27
23
  > a > img {
28
- display: block;
24
+ @include img-responsive();
29
25
  line-height: 1;
30
26
  }
31
27
  }
@@ -70,89 +66,144 @@
70
66
 
71
67
  .carousel-control {
72
68
  position: absolute;
73
- top: 40%;
74
- left: 15px;
75
- width: 40px;
76
- height: 40px;
77
- margin-top: -20px;
78
- font-size: 60px;
79
- font-weight: 100;
80
- line-height: 30px;
81
- color: $white;
69
+ top: 0;
70
+ left: 0;
71
+ bottom: 0;
72
+ width: $carousel-control-width;
73
+ @include opacity($carousel-control-opacity);
74
+ font-size: $carousel-control-font-size;
75
+ color: $carousel-control-color;
82
76
  text-align: center;
83
- background: $grayDarker;
84
- border: 3px solid $white;
85
- @include border-radius(23px);
86
- @include opacity(50);
87
-
88
- // we can't have this transition here
89
- // because webkit cancels the carousel
90
- // animation if you trip this while
91
- // in the middle of another animation
92
- // ;_;
93
- // .transition(opacity .2s linear);
94
-
95
- // Reposition the right one
77
+ text-shadow: $carousel-text-shadow;
78
+ // We can't have this transition here because webkit cancels the carousel
79
+ // animation if you trip this while in the middle of another animation.
80
+
81
+ // Set gradients for backgrounds
82
+ &.left {
83
+ @include gradient-horizontal($start-color: rgba(0,0,0,.5), $end-color: rgba(0,0,0,.0001));
84
+ }
96
85
  &.right {
97
86
  left: auto;
98
- right: 15px;
87
+ right: 0;
88
+ @include gradient-horizontal($start-color: rgba(0,0,0,.0001), $end-color: rgba(0,0,0,.5));
99
89
  }
100
90
 
101
91
  // Hover/focus state
102
92
  &:hover,
103
93
  &:focus {
104
- color: $white;
94
+ color: $carousel-control-color;
105
95
  text-decoration: none;
106
- @include opacity(90);
96
+ @include opacity(.9);
97
+ }
98
+
99
+ // Toggles
100
+ .icon-prev,
101
+ .icon-next,
102
+ .glyphicon-chevron-left,
103
+ .glyphicon-chevron-right {
104
+ position: absolute;
105
+ top: 50%;
106
+ left: 50%;
107
+ z-index: 5;
108
+ display: inline-block;
109
+ }
110
+ .icon-prev,
111
+ .icon-next {
112
+ width: 20px;
113
+ height: 20px;
114
+ margin-top: -10px;
115
+ margin-left: -10px;
116
+ font-family: serif;
117
+ }
118
+
119
+ .icon-prev {
120
+ &:before {
121
+ content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
122
+ }
123
+ }
124
+ .icon-next {
125
+ &:before {
126
+ content: '\203a';// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)
127
+ }
107
128
  }
108
129
  }
109
130
 
110
- // Carousel indicator pips
111
- // -----------------------------
131
+ // Optional indicator pips
132
+ //
133
+ // Add an unordered list with the following class and add a list item for each
134
+ // slide your carousel holds.
135
+
112
136
  .carousel-indicators {
113
137
  position: absolute;
114
- top: 15px;
115
- right: 15px;
116
- z-index: 5;
117
- margin: 0;
138
+ bottom: 10px;
139
+ left: 50%;
140
+ z-index: 15;
141
+ width: 60%;
142
+ margin-left: -30%;
143
+ padding-left: 0;
118
144
  list-style: none;
145
+ text-align: center;
119
146
 
120
147
  li {
121
- display: block;
122
- float: left;
123
- width: 10px;
148
+ display: inline-block;
149
+ width: 10px;
124
150
  height: 10px;
125
- margin-left: 5px;
151
+ margin: 1px;
126
152
  text-indent: -999px;
127
- background-color: #ccc;
128
- background-color: rgba(255,255,255,.25);
129
- border-radius: 5px;
153
+ border: 1px solid $carousel-indicator-border-color;
154
+ border-radius: 10px;
155
+ cursor: pointer;
130
156
  }
131
157
  .active {
132
- background-color: #fff;
158
+ margin: 0;
159
+ width: 12px;
160
+ height: 12px;
161
+ background-color: $carousel-indicator-active-bg;
133
162
  }
134
163
  }
135
164
 
136
- // Caption for text below images
165
+ // Optional captions
137
166
  // -----------------------------
138
-
167
+ // Hidden by default for smaller viewports
139
168
  .carousel-caption {
140
169
  position: absolute;
141
- left: 0;
142
- right: 0;
143
- bottom: 0;
144
- padding: 15px;
145
- background: $grayDark;
146
- background: rgba(0,0,0,.75);
147
- }
148
- .carousel-caption h4,
149
- .carousel-caption p {
150
- color: $white;
151
- line-height: $baseLineHeight;
152
- }
153
- .carousel-caption h4 {
154
- margin: 0 0 5px;
170
+ left: 15%;
171
+ right: 15%;
172
+ bottom: 20px;
173
+ z-index: 10;
174
+ padding-top: 20px;
175
+ padding-bottom: 20px;
176
+ color: $carousel-caption-color;
177
+ text-align: center;
178
+ text-shadow: $carousel-text-shadow;
179
+ & .btn {
180
+ text-shadow: none; // No shadow for button elements in carousel-caption
181
+ }
155
182
  }
156
- .carousel-caption p {
157
- margin-bottom: 0;
183
+
184
+
185
+ // Scale up controls for tablets and up
186
+ @media screen and (min-width: $screen-tablet) {
187
+
188
+ // Scale up the controls a smidge
189
+ .carousel-control .icon-prev,
190
+ .carousel-control .icon-next {
191
+ width: 30px;
192
+ height: 30px;
193
+ margin-top: -15px;
194
+ margin-left: -15px;
195
+ font-size: 30px;
196
+ }
197
+
198
+ // Show and left align the captions
199
+ .carousel-caption {
200
+ left: 20%;
201
+ right: 20%;
202
+ padding-bottom: 30px;
203
+ }
204
+
205
+ // Move up the indicators
206
+ .carousel-indicators {
207
+ bottom: 20px;
208
+ }
158
209
  }