bootstrap-generators 2.2.1 → 2.2.2

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 (60) hide show
  1. data/README.md +1 -1
  2. data/lib/bootstrap/generators/version.rb +1 -1
  3. data/vendor/assets/javascripts/bootstrap-affix.js +12 -1
  4. data/vendor/assets/javascripts/bootstrap-alert.js +12 -1
  5. data/vendor/assets/javascripts/bootstrap-button.js +12 -1
  6. data/vendor/assets/javascripts/bootstrap-carousel.js +11 -2
  7. data/vendor/assets/javascripts/bootstrap-collapse.js +15 -4
  8. data/vendor/assets/javascripts/bootstrap-dropdown.js +16 -3
  9. data/vendor/assets/javascripts/bootstrap-modal.js +12 -1
  10. data/vendor/assets/javascripts/bootstrap-popover.js +14 -3
  11. data/vendor/assets/javascripts/bootstrap-scrollspy.js +13 -2
  12. data/vendor/assets/javascripts/bootstrap-tab.js +12 -1
  13. data/vendor/assets/javascripts/bootstrap-tooltip.js +12 -1
  14. data/vendor/assets/javascripts/bootstrap-transition.js +1 -1
  15. data/vendor/assets/javascripts/bootstrap-typeahead.js +23 -10
  16. data/vendor/assets/stylesheets/bootstrap-responsive.css +37 -3
  17. data/vendor/assets/stylesheets/bootstrap.css +643 -378
  18. data/vendor/twitter/bootstrap/less/alerts.less +14 -0
  19. data/vendor/twitter/bootstrap/less/bootstrap.less +1 -1
  20. data/vendor/twitter/bootstrap/less/breadcrumbs.less +6 -6
  21. data/vendor/twitter/bootstrap/less/button-groups.less +27 -42
  22. data/vendor/twitter/bootstrap/less/buttons.less +5 -7
  23. data/vendor/twitter/bootstrap/less/carousel.less +15 -15
  24. data/vendor/twitter/bootstrap/less/code.less +3 -0
  25. data/vendor/twitter/bootstrap/less/dropdowns.less +5 -9
  26. data/vendor/twitter/bootstrap/less/forms.less +12 -8
  27. data/vendor/twitter/bootstrap/less/labels-badges.less +8 -0
  28. data/vendor/twitter/bootstrap/less/mixins.less +1 -1
  29. data/vendor/twitter/bootstrap/less/modals.less +4 -3
  30. data/vendor/twitter/bootstrap/less/navbar.less +21 -6
  31. data/vendor/twitter/bootstrap/less/navs.less +6 -0
  32. data/vendor/twitter/bootstrap/less/popovers.less +50 -38
  33. data/vendor/twitter/bootstrap/less/reset.less +82 -4
  34. data/vendor/twitter/bootstrap/less/responsive.less +10 -1
  35. data/vendor/twitter/bootstrap/less/tables.less +35 -34
  36. data/vendor/twitter/bootstrap/less/type.less +29 -21
  37. data/vendor/twitter/bootstrap/less/variables.less +4 -4
  38. data/vendor/twitter/bootstrap/sass/_alerts.scss +14 -0
  39. data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +5 -5
  40. data/vendor/twitter/bootstrap/sass/_button-groups.scss +27 -42
  41. data/vendor/twitter/bootstrap/sass/_buttons.scss +5 -7
  42. data/vendor/twitter/bootstrap/sass/_carousel.scss +15 -15
  43. data/vendor/twitter/bootstrap/sass/_code.scss +3 -0
  44. data/vendor/twitter/bootstrap/sass/_dropdowns.scss +5 -9
  45. data/vendor/twitter/bootstrap/sass/_forms.scss +12 -8
  46. data/vendor/twitter/bootstrap/sass/_labels-badges.scss +25 -15
  47. data/vendor/twitter/bootstrap/sass/_mixins.scss +3 -3
  48. data/vendor/twitter/bootstrap/sass/_modals.scss +1 -1
  49. data/vendor/twitter/bootstrap/sass/_navbar.scss +22 -4
  50. data/vendor/twitter/bootstrap/sass/_navs.scss +6 -0
  51. data/vendor/twitter/bootstrap/sass/_popovers.scss +50 -38
  52. data/vendor/twitter/bootstrap/sass/_reset.scss +82 -4
  53. data/vendor/twitter/bootstrap/sass/_tables.scss +36 -35
  54. data/vendor/twitter/bootstrap/sass/_type.scss +29 -21
  55. data/vendor/twitter/bootstrap/sass/_variables.scss +9 -9
  56. data/vendor/twitter/bootstrap/sass/bootstrap.scss +1 -1
  57. data/vendor/twitter/bootstrap/sass/responsive.scss +10 -1
  58. metadata +10 -12
  59. data/vendor/assets/stylesheets/bootstrap-responsive.min.css +0 -9
  60. data/vendor/assets/stylesheets/bootstrap.min.css +0 -9
@@ -20,33 +20,27 @@ p {
20
20
  // Emphasis & misc
21
21
  // -------------------------
22
22
 
23
- small {
24
- font-size: 85%; // Ex: 14px base font * 85% = about 12px
25
- }
26
- strong {
27
- font-weight: bold;
28
- }
29
- em {
30
- font-style: italic;
31
- }
32
- cite {
33
- font-style: normal;
34
- }
23
+ // Ex: 14px base font * 85% = about 12px
24
+ small { font-size: 85%; }
25
+
26
+ strong { font-weight: bold; }
27
+ em { font-style: italic; }
28
+ cite { font-style: normal; }
35
29
 
36
30
  // Utility classes
37
- .muted {
38
- color: @grayLight;
39
- }
40
- .text-warning { color: @warningText; }
31
+ .muted { color: @grayLight; }
32
+ a.muted:hover { color: darken(@grayLight, 10%); }
33
+
34
+ .text-warning { color: @warningText; }
41
35
  a.text-warning:hover { color: darken(@warningText, 10%); }
42
36
 
43
- .text-error { color: @errorText; }
44
- a.text-error:hover { color: darken(@errorText, 10%); }
37
+ .text-error { color: @errorText; }
38
+ a.text-error:hover { color: darken(@errorText, 10%); }
45
39
 
46
- .text-info { color: @infoText; }
47
- a.text-info:hover { color: darken(@infoText, 10%); }
40
+ .text-info { color: @infoText; }
41
+ a.text-info:hover { color: darken(@infoText, 10%); }
48
42
 
49
- .text-success { color: @successText; }
43
+ .text-success { color: @successText; }
50
44
  a.text-success:hover { color: darken(@successText, 10%); }
51
45
 
52
46
 
@@ -112,12 +106,26 @@ ol ul {
112
106
  li {
113
107
  line-height: @baseLineHeight;
114
108
  }
109
+
110
+ // Remove default list styles
115
111
  ul.unstyled,
116
112
  ol.unstyled {
117
113
  margin-left: 0;
118
114
  list-style: none;
119
115
  }
120
116
 
117
+ // Single-line list items
118
+ ul.inline,
119
+ ol.inline {
120
+ margin-left: 0;
121
+ list-style: none;
122
+ & > li {
123
+ display: inline-block;
124
+ padding-left: 5px;
125
+ padding-right: 5px;
126
+ }
127
+ }
128
+
121
129
  // Description Lists
122
130
  dl {
123
131
  margin-bottom: @baseLineHeight;
@@ -68,7 +68,7 @@
68
68
 
69
69
  @paddingLarge: 11px 19px; // 44px
70
70
  @paddingSmall: 2px 10px; // 26px
71
- @paddingMini: 1px 6px; // 24px
71
+ @paddingMini: 0 6px; // 22px
72
72
 
73
73
  @baseBorderRadius: 4px;
74
74
  @borderRadiusLarge: 6px;
@@ -126,7 +126,7 @@
126
126
 
127
127
  @dropdownLinkColor: @grayDark;
128
128
  @dropdownLinkColorHover: @white;
129
- @dropdownLinkColorActive: @dropdownLinkColor;
129
+ @dropdownLinkColorActive: @white;
130
130
 
131
131
  @dropdownLinkBackgroundActive: @linkColor;
132
132
  @dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
@@ -151,8 +151,8 @@
151
151
 
152
152
  // Sprite icons path
153
153
  // -------------------------
154
- @iconSpritePath: "glyphicons-halflings.png";
155
- @iconWhiteSpritePath: "glyphicons-halflings-white.png";
154
+ @iconSpritePath: "../img/glyphicons-halflings.png";
155
+ @iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
156
156
 
157
157
 
158
158
  // Input placeholder text color
@@ -13,6 +13,10 @@
13
13
  background-color: $warningBackground;
14
14
  border: 1px solid $warningBorder;
15
15
  @include border-radius($baseBorderRadius);
16
+ }
17
+ .alert,
18
+ .alert h4 {
19
+ // Specified for the h4 to prevent conflicts of changing $headingsColor
16
20
  color: $warningText;
17
21
  }
18
22
  .alert h4 {
@@ -36,17 +40,27 @@
36
40
  border-color: $successBorder;
37
41
  color: $successText;
38
42
  }
43
+ .alert-success h4 {
44
+ color: $successText;
45
+ }
39
46
  .alert-danger,
40
47
  .alert-error {
41
48
  background-color: $errorBackground;
42
49
  border-color: $errorBorder;
43
50
  color: $errorText;
44
51
  }
52
+ .alert-danger h4,
53
+ .alert-error h4 {
54
+ color: $errorText;
55
+ }
45
56
  .alert-info {
46
57
  background-color: $infoBackground;
47
58
  border-color: $infoBorder;
48
59
  color: $infoText;
49
60
  }
61
+ .alert-info h4 {
62
+ color: $infoText;
63
+ }
50
64
 
51
65
 
52
66
  // Block alerts
@@ -9,14 +9,14 @@
9
9
  list-style: none;
10
10
  background-color: #f5f5f5;
11
11
  @include border-radius($baseBorderRadius);
12
- li {
12
+ > li {
13
13
  display: inline-block;
14
14
  @include ie7-inline-block();
15
15
  text-shadow: 0 1px 0 $white;
16
- }
17
- .divider {
18
- padding: 0 5px;
19
- color: #ccc;
16
+ > .divider {
17
+ padding: 0 5px;
18
+ color: #ccc;
19
+ }
20
20
  }
21
21
  .active {
22
22
  color: $grayLight;
@@ -24,9 +24,9 @@
24
24
  font-size: 0; // Hack to remove whitespace that results from using inline-block
25
25
  margin-top: $baseLineHeight / 2;
26
26
  margin-bottom: $baseLineHeight / 2;
27
- .btn + .btn,
28
- .btn-group + .btn,
29
- .btn + .btn-group {
27
+ > .btn + .btn,
28
+ > .btn-group + .btn,
29
+ > .btn + .btn-group {
30
30
  margin-left: 5px;
31
31
  }
32
32
  }
@@ -40,59 +40,44 @@
40
40
  margin-left: -1px;
41
41
  }
42
42
  .btn-group > .btn,
43
- .btn-group > .dropdown-menu {
43
+ .btn-group > .dropdown-menu,
44
+ .btn-group > .popover {
44
45
  font-size: $baseFontSize; // redeclare as part 2 of font-size inline-block hack
45
46
  }
46
47
 
47
48
  // Reset fonts for other sizes
48
49
  .btn-group > .btn-mini {
49
- font-size: 11px;
50
+ font-size: $fontSizeMini;
50
51
  }
51
52
  .btn-group > .btn-small {
52
- font-size: 12px;
53
+ font-size: $fontSizeSmall;
53
54
  }
54
55
  .btn-group > .btn-large {
55
- font-size: 16px;
56
+ font-size: $fontSizeLarge;
56
57
  }
57
58
 
58
59
  // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
59
60
  .btn-group > .btn:first-child {
60
61
  margin-left: 0;
61
- -webkit-border-top-left-radius: 4px;
62
- -moz-border-radius-topleft: 4px;
63
- border-top-left-radius: 4px;
64
- -webkit-border-bottom-left-radius: 4px;
65
- -moz-border-radius-bottomleft: 4px;
66
- border-bottom-left-radius: 4px;
62
+ @include border-top-left-radius($baseBorderRadius);
63
+ @include border-bottom-left-radius($baseBorderRadius);
67
64
  }
68
65
  // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
69
66
  .btn-group > .btn:last-child,
70
67
  .btn-group > .dropdown-toggle {
71
- -webkit-border-top-right-radius: 4px;
72
- -moz-border-radius-topright: 4px;
73
- border-top-right-radius: 4px;
74
- -webkit-border-bottom-right-radius: 4px;
75
- -moz-border-radius-bottomright: 4px;
76
- border-bottom-right-radius: 4px;
68
+ @include border-top-right-radius($baseBorderRadius);
69
+ @include border-bottom-right-radius($baseBorderRadius);
77
70
  }
78
71
  // Reset corners for large buttons
79
72
  .btn-group > .btn.large:first-child {
80
73
  margin-left: 0;
81
- -webkit-border-top-left-radius: 6px;
82
- -moz-border-radius-topleft: 6px;
83
- border-top-left-radius: 6px;
84
- -webkit-border-bottom-left-radius: 6px;
85
- -moz-border-radius-bottomleft: 6px;
86
- border-bottom-left-radius: 6px;
74
+ @include border-top-left-radius($borderRadiusLarge);
75
+ @include border-bottom-left-radius($borderRadiusLarge);
87
76
  }
88
77
  .btn-group > .btn.large:last-child,
89
78
  .btn-group > .large.dropdown-toggle {
90
- -webkit-border-top-right-radius: 6px;
91
- -moz-border-radius-topright: 6px;
92
- border-top-right-radius: 6px;
93
- -webkit-border-bottom-right-radius: 6px;
94
- -moz-border-radius-bottomright: 6px;
95
- border-bottom-right-radius: 6px;
79
+ @include border-top-right-radius($borderRadiusLarge);
80
+ @include border-bottom-right-radius($borderRadiusLarge);
96
81
  }
97
82
 
98
83
  // On hover/focus/active, bring the proper btn to front
@@ -218,25 +203,25 @@
218
203
  display: inline-block; // makes buttons only take up the width they need
219
204
  @include ie7-inline-block();
220
205
  }
221
- .btn-group-vertical .btn {
206
+ .btn-group-vertical > .btn {
222
207
  display: block;
223
208
  float: none;
224
- width: 100%;
209
+ max-width: 100%;
225
210
  @include border-radius(0);
226
211
  }
227
- .btn-group-vertical .btn + .btn {
212
+ .btn-group-vertical > .btn + .btn {
228
213
  margin-left: 0;
229
214
  margin-top: -1px;
230
215
  }
231
- .btn-group-vertical .btn:first-child {
232
- @include border-radius(4px 4px 0 0);
216
+ .btn-group-vertical > .btn:first-child {
217
+ @include border-radius($baseBorderRadius $baseBorderRadius 0 0);
233
218
  }
234
- .btn-group-vertical .btn:last-child {
235
- @include border-radius(0 0 4px 4px);
219
+ .btn-group-vertical > .btn:last-child {
220
+ @include border-radius(0 0 $baseBorderRadius $baseBorderRadius);
236
221
  }
237
- .btn-group-vertical .btn-large:first-child {
238
- @include border-radius(6px 6px 0 0);
222
+ .btn-group-vertical > .btn-large:first-child {
223
+ @include border-radius($borderRadiusLarge $borderRadiusLarge 0 0);
239
224
  }
240
- .btn-group-vertical .btn-large:last-child {
241
- @include border-radius(0 0 6px 6px);
225
+ .btn-group-vertical > .btn-large:last-child {
226
+ @include border-radius(0 0 $borderRadiusLarge $borderRadiusLarge);
242
227
  }
@@ -14,7 +14,6 @@
14
14
  margin-bottom: 0; // For input.btn
15
15
  font-size: $baseFontSize;
16
16
  line-height: $baseLineHeight;
17
- *line-height: $baseLineHeight;
18
17
  text-align: center;
19
18
  vertical-align: middle;
20
19
  cursor: pointer;
@@ -30,8 +29,6 @@
30
29
  &:hover {
31
30
  color: $grayDark;
32
31
  text-decoration: none;
33
- background-color: darken($white, 10%);
34
- *background-color: darken($white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */
35
32
  background-position: 0 -15px;
36
33
 
37
34
  // transition is only when going to hover, otherwise the background
@@ -47,8 +44,6 @@
47
44
  // Active state
48
45
  &.active,
49
46
  &:active {
50
- background-color: darken($white, 10%);
51
- background-color: darken($white, 15%) \9;
52
47
  background-image: none;
53
48
  outline: 0;
54
49
  @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
@@ -58,7 +53,6 @@
58
53
  &.disabled,
59
54
  &[disabled] {
60
55
  cursor: default;
61
- background-color: darken($white, 10%);
62
56
  background-image: none;
63
57
  @include opacity(65);
64
58
  @include box-shadow(none);
@@ -79,7 +73,7 @@
79
73
  }
80
74
  .btn-large [class^="icon-"],
81
75
  .btn-large [class*=" icon-"] {
82
- margin-top: 2px;
76
+ margin-top: 4px;
83
77
  }
84
78
 
85
79
  // Small
@@ -92,6 +86,10 @@
92
86
  .btn-small [class*=" icon-"] {
93
87
  margin-top: 0;
94
88
  }
89
+ .btn-mini [class^="icon-"],
90
+ .btn-mini [class*=" icon-"] {
91
+ margin-top: -1px;
92
+ }
95
93
 
96
94
  // Mini
97
95
  .btn-mini {
@@ -15,50 +15,50 @@
15
15
  position: relative;
16
16
  }
17
17
 
18
- .carousel {
18
+ .carousel-inner {
19
19
 
20
- .item {
20
+ > .item {
21
21
  display: none;
22
22
  position: relative;
23
23
  @include transition(.6s ease-in-out left);
24
24
  }
25
25
 
26
26
  // Account for jankitude on images
27
- .item > img {
27
+ > .item > img {
28
28
  display: block;
29
29
  line-height: 1;
30
30
  }
31
31
 
32
- .active,
33
- .next,
34
- .prev { display: block; }
32
+ > .active,
33
+ > .next,
34
+ > .prev { display: block; }
35
35
 
36
- .active {
36
+ > .active {
37
37
  left: 0;
38
38
  }
39
39
 
40
- .next,
41
- .prev {
40
+ > .next,
41
+ > .prev {
42
42
  position: absolute;
43
43
  top: 0;
44
44
  width: 100%;
45
45
  }
46
46
 
47
- .next {
47
+ > .next {
48
48
  left: 100%;
49
49
  }
50
- .prev {
50
+ > .prev {
51
51
  left: -100%;
52
52
  }
53
- .next.left,
54
- .prev.right {
53
+ > .next.left,
54
+ > .prev.right {
55
55
  left: 0;
56
56
  }
57
57
 
58
- .active.left {
58
+ > .active.left {
59
59
  left: -100%;
60
60
  }
61
- .active.right {
61
+ > .active.right {
62
62
  left: 100%;
63
63
  }
64
64
 
@@ -19,6 +19,7 @@ code {
19
19
  color: #d14;
20
20
  background-color: #f7f7f9;
21
21
  border: 1px solid #e1e1e8;
22
+ white-space: nowrap;
22
23
  }
23
24
 
24
25
  // Blocks of code
@@ -46,6 +47,8 @@ pre {
46
47
  code {
47
48
  padding: 0;
48
49
  color: inherit;
50
+ white-space: pre;
51
+ white-space: pre-wrap;
49
52
  background-color: transparent;
50
53
  border: 0;
51
54
  }
@@ -115,6 +115,7 @@
115
115
  text-decoration: none;
116
116
  background-color: transparent;
117
117
  background-image: none; // Remove CSS gradient
118
+ @include reset-filter();
118
119
  cursor: default;
119
120
  }
120
121
 
@@ -168,9 +169,7 @@
168
169
  left: 100%;
169
170
  margin-top: -6px;
170
171
  margin-left: -1px;
171
- -webkit-border-radius: 0 6px 6px 6px;
172
- -moz-border-radius: 0 6px 6px 6px;
173
- border-radius: 0 6px 6px 6px;
172
+ @include border-radius(0 6px 6px 6px);
174
173
  }
175
174
  .dropdown-submenu:hover > .dropdown-menu {
176
175
  display: block;
@@ -182,9 +181,7 @@
182
181
  bottom: 0;
183
182
  margin-top: 0;
184
183
  margin-bottom: -2px;
185
- -webkit-border-radius: 5px 5px 5px 0;
186
- -moz-border-radius: 5px 5px 5px 0;
187
- border-radius: 5px 5px 5px 0;
184
+ @include border-radius(5px 5px 5px 0);
188
185
  }
189
186
 
190
187
  // Caret to indicate there is a submenu
@@ -215,9 +212,7 @@
215
212
  > .dropdown-menu {
216
213
  left: -100%;
217
214
  margin-left: 10px;
218
- -webkit-border-radius: 6px 0 6px 6px;
219
- -moz-border-radius: 6px 0 6px 6px;
220
- border-radius: 6px 0 6px 6px;
215
+ @include border-radius(6px 0 6px 6px);
221
216
  }
222
217
  }
223
218
 
@@ -232,6 +227,7 @@
232
227
  // Typeahead
233
228
  // ---------
234
229
  .typeahead {
230
+ z-index: 1051;
235
231
  margin-top: 2px; // give it some space to breathe
236
232
  @include border-radius($baseBorderRadius);
237
233
  }