bootstrap-generators 2.0.1 → 2.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (127) hide show
  1. data/README.md +258 -33
  2. data/Rakefile +0 -59
  3. data/lib/bootstrap/generators/engine.rb +6 -1
  4. data/lib/bootstrap/generators/version.rb +1 -1
  5. data/lib/generators/bootstrap/install/install_generator.rb +10 -2
  6. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +120 -15
  7. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +206 -0
  8. data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css +2 -0
  9. data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.less +5 -4
  10. data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.scss +3 -2
  11. data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css +2 -0
  12. data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.less +5 -4
  13. data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.scss +3 -2
  14. data/lib/generators/bootstrap/install/templates/config/initializers/simple_form.rb +3 -0
  15. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb +3 -3
  16. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml +2 -2
  17. data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.erb +1 -1
  18. data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.haml +1 -1
  19. data/test/fixtures/application.js +3 -0
  20. data/test/lib/generators/bootstrap/install_generator_test.rb +4 -3
  21. data/test/test_helper.rb +8 -1
  22. data/vendor/assets/images/glyphicons-halflings-white.png +0 -0
  23. data/vendor/assets/images/glyphicons-halflings.png +0 -0
  24. data/vendor/assets/javascripts/bootstrap-alert.js +28 -32
  25. data/vendor/assets/javascripts/bootstrap-button.js +29 -33
  26. data/vendor/assets/javascripts/bootstrap-carousel.js +33 -21
  27. data/vendor/assets/javascripts/bootstrap-collapse.js +47 -26
  28. data/vendor/assets/javascripts/bootstrap-dropdown.js +18 -10
  29. data/vendor/assets/javascripts/bootstrap-modal.js +25 -17
  30. data/vendor/assets/javascripts/bootstrap-popover.js +13 -10
  31. data/vendor/assets/javascripts/bootstrap-scrollspy.js +44 -18
  32. data/vendor/assets/javascripts/bootstrap-tab.js +12 -7
  33. data/vendor/assets/javascripts/bootstrap-tooltip.js +40 -35
  34. data/vendor/assets/javascripts/bootstrap-transition.js +30 -20
  35. data/vendor/assets/javascripts/bootstrap-typeahead.js +29 -15
  36. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/accordion.less +5 -0
  37. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/alerts.less +2 -14
  38. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/bootstrap.less +2 -2
  39. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/breadcrumbs.less +2 -0
  40. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/button-groups.less +76 -33
  41. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/buttons.less +32 -24
  42. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/carousel.less +0 -0
  43. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/close.less +12 -1
  44. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/code.less +6 -6
  45. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/component-animations.less +7 -5
  46. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/dropdowns.less +58 -45
  47. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/forms.less +205 -144
  48. data/vendor/twitter/bootstrap/less/grid.less +5 -0
  49. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/hero-unit.less +3 -1
  50. data/vendor/twitter/bootstrap/less/labels-badges.less +55 -0
  51. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/layouts.less +1 -1
  52. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/mixins.less +235 -179
  53. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/modals.less +13 -6
  54. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/navbar.less +131 -72
  55. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/navs.less +53 -43
  56. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/pager.less +6 -0
  57. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/pagination.less +1 -0
  58. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/popovers.less +0 -0
  59. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/progress-bars.less +27 -5
  60. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/reset.less +8 -3
  61. data/vendor/twitter/bootstrap/less/responsive-1200px-min.less +26 -0
  62. data/vendor/twitter/bootstrap/less/responsive-767px-max.less +149 -0
  63. data/vendor/twitter/bootstrap/less/responsive-768px-979px.less +17 -0
  64. data/vendor/twitter/bootstrap/less/responsive-navbar.less +153 -0
  65. data/vendor/twitter/bootstrap/less/responsive-utilities.less +41 -0
  66. data/vendor/twitter/bootstrap/less/responsive.less +48 -0
  67. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/scaffolding.less +4 -4
  68. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/sprites.less +42 -9
  69. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/tables.less +46 -20
  70. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/thumbnails.less +14 -2
  71. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/tooltip.less +0 -0
  72. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/type.less +27 -13
  73. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/utilities.less +0 -0
  74. data/vendor/twitter/bootstrap/less/variables.less +206 -0
  75. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/wells.less +10 -0
  76. data/vendor/{assets/stylesheets/scss/accordion.scss → twitter/bootstrap/sass/_accordion.scss} +5 -0
  77. data/vendor/{assets/stylesheets/scss/alerts.scss → twitter/bootstrap/sass/_alerts.scss} +3 -15
  78. data/vendor/{assets/stylesheets/scss/breadcrumbs.scss → twitter/bootstrap/sass/_breadcrumbs.scss} +2 -0
  79. data/vendor/{assets/stylesheets/scss/button-groups.scss → twitter/bootstrap/sass/_button-groups.scss} +76 -33
  80. data/vendor/{assets/stylesheets/scss/buttons.scss → twitter/bootstrap/sass/_buttons.scss} +33 -25
  81. data/vendor/{assets/stylesheets/scss/carousel.scss → twitter/bootstrap/sass/_carousel.scss} +1 -1
  82. data/vendor/{assets/stylesheets/scss/close.scss → twitter/bootstrap/sass/_close.scss} +12 -1
  83. data/vendor/{assets/stylesheets/scss/code.scss → twitter/bootstrap/sass/_code.scss} +7 -7
  84. data/vendor/{assets/stylesheets/scss/component-animations.scss → twitter/bootstrap/sass/_component-animations.scss} +9 -7
  85. data/vendor/{assets/stylesheets/scss/dropdowns.scss → twitter/bootstrap/sass/_dropdowns.scss} +58 -45
  86. data/vendor/{assets/stylesheets/scss/forms.scss → twitter/bootstrap/sass/_forms.scss} +205 -145
  87. data/vendor/twitter/bootstrap/sass/_grid.scss +5 -0
  88. data/vendor/{assets/stylesheets/scss/hero-unit.scss → twitter/bootstrap/sass/_hero-unit.scss} +3 -1
  89. data/vendor/twitter/bootstrap/sass/_labels-badges.scss +52 -0
  90. data/vendor/{assets/stylesheets/scss/layouts.scss → twitter/bootstrap/sass/_layouts.scss} +2 -2
  91. data/vendor/{assets/stylesheets/scss/mixins.scss → twitter/bootstrap/sass/_mixins.scss} +246 -182
  92. data/vendor/{assets/stylesheets/scss/modals.scss → twitter/bootstrap/sass/_modals.scss} +14 -7
  93. data/vendor/{assets/stylesheets/scss/navbar.scss → twitter/bootstrap/sass/_navbar.scss} +132 -73
  94. data/vendor/{assets/stylesheets/scss/navs.scss → twitter/bootstrap/sass/_navs.scss} +53 -43
  95. data/vendor/{assets/stylesheets/scss/pager.scss → twitter/bootstrap/sass/_pager.scss} +6 -0
  96. data/vendor/{assets/stylesheets/scss/pagination.scss → twitter/bootstrap/sass/_pagination.scss} +1 -0
  97. data/vendor/{assets/stylesheets/scss/popovers.scss → twitter/bootstrap/sass/_popovers.scss} +0 -0
  98. data/vendor/{assets/stylesheets/scss/progress-bars.scss → twitter/bootstrap/sass/_progress-bars.scss} +27 -5
  99. data/vendor/{assets/stylesheets/scss/reset.scss → twitter/bootstrap/sass/_reset.scss} +8 -3
  100. data/vendor/twitter/bootstrap/sass/_responsive-1200px-min.scss +26 -0
  101. data/vendor/twitter/bootstrap/sass/_responsive-767px-max.scss +149 -0
  102. data/vendor/twitter/bootstrap/sass/_responsive-768px-979px.scss +17 -0
  103. data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +153 -0
  104. data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +41 -0
  105. data/vendor/{assets/stylesheets/scss/scaffolding.scss → twitter/bootstrap/sass/_scaffolding.scss} +4 -4
  106. data/vendor/{assets/stylesheets/scss/sprites.scss → twitter/bootstrap/sass/_sprites.scss} +40 -7
  107. data/vendor/{assets/stylesheets/scss/tables.scss → twitter/bootstrap/sass/_tables.scss} +37 -32
  108. data/vendor/{assets/stylesheets/scss/thumbnails.scss → twitter/bootstrap/sass/_thumbnails.scss} +14 -2
  109. data/vendor/{assets/stylesheets/scss/tooltip.scss → twitter/bootstrap/sass/_tooltip.scss} +1 -1
  110. data/vendor/{assets/stylesheets/scss/type.scss → twitter/bootstrap/sass/_type.scss} +27 -13
  111. data/vendor/{assets/stylesheets/scss/utilities.scss → twitter/bootstrap/sass/_utilities.scss} +0 -0
  112. data/vendor/twitter/bootstrap/sass/_variables.scss +204 -0
  113. data/vendor/{assets/stylesheets/scss/wells.scss → twitter/bootstrap/sass/_wells.scss} +10 -0
  114. data/vendor/{assets/stylesheets/scss → twitter/bootstrap/sass}/bootstrap.scss +3 -3
  115. data/vendor/twitter/bootstrap/sass/responsive.scss +48 -0
  116. metadata +93 -84
  117. data/lib/generators/bootstrap/install/templates/assets/javascripts/bootstrap-generators.js +0 -1
  118. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.less +0 -98
  119. data/vendor/assets/stylesheets/bootstrap.css +0 -3363
  120. data/vendor/assets/stylesheets/less/grid.less +0 -8
  121. data/vendor/assets/stylesheets/less/labels.less +0 -32
  122. data/vendor/assets/stylesheets/less/responsive.less +0 -327
  123. data/vendor/assets/stylesheets/less/variables.less +0 -107
  124. data/vendor/assets/stylesheets/scss/grid.scss +0 -8
  125. data/vendor/assets/stylesheets/scss/labels.scss +0 -32
  126. data/vendor/assets/stylesheets/scss/responsive.scss +0 -327
  127. data/vendor/assets/stylesheets/scss/variables.scss +0 -107
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap v2.0.1
2
+ * Bootstrap v2.0.4
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -52,7 +52,7 @@
52
52
 
53
53
  // Components: Misc
54
54
  @import "thumbnails.less";
55
- @import "labels.less";
55
+ @import "labels-badges.less";
56
56
  @import "progress-bars.less";
57
57
  @import "accordion.less";
58
58
  @import "carousel.less";
@@ -4,12 +4,14 @@
4
4
  .breadcrumb {
5
5
  padding: 7px 14px;
6
6
  margin: 0 0 @baseLineHeight;
7
+ list-style: none;
7
8
  #gradient > .vertical(@white, #f5f5f5);
8
9
  border: 1px solid #ddd;
9
10
  .border-radius(3px);
10
11
  .box-shadow(inset 0 1px 0 @white);
11
12
  li {
12
13
  display: inline-block;
14
+ .ie7-inline-block();
13
15
  text-shadow: 0 1px 0 @white;
14
16
  }
15
17
  .divider {
@@ -25,14 +25,14 @@
25
25
  }
26
26
 
27
27
  // Float them, remove border radius, then re-add to first and last elements
28
- .btn-group .btn {
28
+ .btn-group > .btn {
29
29
  position: relative;
30
30
  float: left;
31
31
  margin-left: -1px;
32
32
  .border-radius(0);
33
33
  }
34
34
  // 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
35
- .btn-group .btn:first-child {
35
+ .btn-group > .btn:first-child {
36
36
  margin-left: 0;
37
37
  -webkit-border-top-left-radius: 4px;
38
38
  -moz-border-radius-topleft: 4px;
@@ -41,8 +41,9 @@
41
41
  -moz-border-radius-bottomleft: 4px;
42
42
  border-bottom-left-radius: 4px;
43
43
  }
44
- .btn-group .btn:last-child,
45
- .btn-group .dropdown-toggle {
44
+ // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
45
+ .btn-group > .btn:last-child,
46
+ .btn-group > .dropdown-toggle {
46
47
  -webkit-border-top-right-radius: 4px;
47
48
  -moz-border-radius-topright: 4px;
48
49
  border-top-right-radius: 4px;
@@ -51,7 +52,7 @@
51
52
  border-bottom-right-radius: 4px;
52
53
  }
53
54
  // Reset corners for large buttons
54
- .btn-group .btn.large:first-child {
55
+ .btn-group > .btn.large:first-child {
55
56
  margin-left: 0;
56
57
  -webkit-border-top-left-radius: 6px;
57
58
  -moz-border-radius-topleft: 6px;
@@ -60,8 +61,8 @@
60
61
  -moz-border-radius-bottomleft: 6px;
61
62
  border-bottom-left-radius: 6px;
62
63
  }
63
- .btn-group .btn.large:last-child,
64
- .btn-group .large.dropdown-toggle {
64
+ .btn-group > .btn.large:last-child,
65
+ .btn-group > .large.dropdown-toggle {
65
66
  -webkit-border-top-right-radius: 6px;
66
67
  -moz-border-radius-topright: 6px;
67
68
  border-top-right-radius: 6px;
@@ -71,10 +72,10 @@
71
72
  }
72
73
 
73
74
  // On hover/focus/active, bring the proper btn to front
74
- .btn-group .btn:hover,
75
- .btn-group .btn:focus,
76
- .btn-group .btn:active,
77
- .btn-group .btn.active {
75
+ .btn-group > .btn:hover,
76
+ .btn-group > .btn:focus,
77
+ .btn-group > .btn:active,
78
+ .btn-group > .btn.active {
78
79
  z-index: 2;
79
80
  }
80
81
 
@@ -90,34 +91,60 @@
90
91
  // ----------------------
91
92
 
92
93
  // Give the line between buttons some depth
93
- .btn-group .dropdown-toggle {
94
+ .btn-group > .dropdown-toggle {
94
95
  padding-left: 8px;
95
96
  padding-right: 8px;
96
- @shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
97
- .box-shadow(@shadow);
98
- *padding-top: 5px;
99
- *padding-bottom: 5px;
97
+ .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
98
+ *padding-top: 4px;
99
+ *padding-bottom: 4px;
100
+ }
101
+ .btn-group > .btn-mini.dropdown-toggle {
102
+ padding-left: 5px;
103
+ padding-right: 5px;
104
+ }
105
+ .btn-group > .btn-small.dropdown-toggle {
106
+ *padding-top: 4px;
107
+ *padding-bottom: 4px;
108
+ }
109
+ .btn-group > .btn-large.dropdown-toggle {
110
+ padding-left: 12px;
111
+ padding-right: 12px;
100
112
  }
101
113
 
102
114
  .btn-group.open {
103
- // IE7's z-index only goes to the nearest positioned ancestor, which would
104
- // make the menu appear below buttons that appeared later on the page
105
- *z-index: @zindexDropdown;
106
-
107
- // Reposition menu on open and round all corners
108
- .dropdown-menu {
109
- display: block;
110
- margin-top: 1px;
111
- .border-radius(5px);
112
- }
113
115
 
116
+ // The clickable button for toggling the menu
117
+ // Remove the gradient and set the same inset shadow as the :active state
114
118
  .dropdown-toggle {
115
119
  background-image: none;
116
- @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
117
- .box-shadow(@shadow);
120
+ .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
121
+ }
122
+
123
+ // Keep the hover's background when dropdown is open
124
+ .btn.dropdown-toggle {
125
+ background-color: @btnBackgroundHighlight;
126
+ }
127
+ .btn-primary.dropdown-toggle {
128
+ background-color: @btnPrimaryBackgroundHighlight;
129
+ }
130
+ .btn-warning.dropdown-toggle {
131
+ background-color: @btnWarningBackgroundHighlight;
132
+ }
133
+ .btn-danger.dropdown-toggle {
134
+ background-color: @btnDangerBackgroundHighlight;
135
+ }
136
+ .btn-success.dropdown-toggle {
137
+ background-color: @btnSuccessBackgroundHighlight;
138
+ }
139
+ .btn-info.dropdown-toggle {
140
+ background-color: @btnInfoBackgroundHighlight;
141
+ }
142
+ .btn-inverse.dropdown-toggle {
143
+ background-color: @btnInverseBackgroundHighlight;
118
144
  }
119
145
  }
120
146
 
147
+
121
148
  // Reposition the caret
122
149
  .btn .caret {
123
150
  margin-top: 7px;
@@ -127,22 +154,38 @@
127
154
  .open.btn-group .caret {
128
155
  .opacity(100);
129
156
  }
157
+ // Carets in other button sizes
158
+ .btn-mini .caret {
159
+ margin-top: 5px;
160
+ }
161
+ .btn-small .caret {
162
+ margin-top: 6px;
163
+ }
164
+ .btn-large .caret {
165
+ margin-top: 6px;
166
+ border-left-width: 5px;
167
+ border-right-width: 5px;
168
+ border-top-width: 5px;
169
+ }
170
+ // Upside down carets for .dropup
171
+ .dropup .btn-large .caret {
172
+ border-bottom: 5px solid @black;
173
+ border-top: 0;
174
+ }
175
+
130
176
 
131
177
 
132
178
  // Account for other colors
133
179
  .btn-primary,
180
+ .btn-warning,
134
181
  .btn-danger,
135
182
  .btn-info,
136
183
  .btn-success,
137
184
  .btn-inverse {
138
185
  .caret {
139
186
  border-top-color: @white;
187
+ border-bottom-color: @white;
140
188
  .opacity(75);
141
189
  }
142
190
  }
143
191
 
144
- // Small button dropdowns
145
- .btn-small .caret {
146
- margin-top: 4px;
147
- }
148
-
@@ -8,25 +8,24 @@
8
8
  // Core
9
9
  .btn {
10
10
  display: inline-block;
11
+ .ie7-inline-block();
11
12
  padding: 4px 10px 4px;
12
13
  margin-bottom: 0; // For input.btn
13
14
  font-size: @baseFontSize;
14
15
  line-height: @baseLineHeight;
16
+ *line-height: 20px;
15
17
  color: @grayDark;
16
18
  text-align: center;
17
19
  text-shadow: 0 1px 1px rgba(255,255,255,.75);
18
20
  vertical-align: middle;
19
- .buttonBackground(@white, darken(@white, 10%));
20
- border: 1px solid #ccc;
21
- border-bottom-color: #bbb;
22
- .border-radius(4px);
23
- @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
24
- .box-shadow(@shadow);
25
21
  cursor: pointer;
26
-
27
- // Give IE7 some love
28
- .reset-filter();
29
- .ie7-restore-left-whitespace();
22
+ .buttonBackground(@btnBackground, @btnBackgroundHighlight);
23
+ border: 1px solid @btnBorder;
24
+ *border: 0; // Remove the border to prevent IE7's black border on input:focus
25
+ border-bottom-color: darken(@btnBorder, 10%);
26
+ .border-radius(4px);
27
+ .ie7-restore-left-whitespace(); // Give IE7 some love
28
+ .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
30
29
  }
31
30
 
32
31
  // Hover state
@@ -34,6 +33,7 @@
34
33
  color: @grayDark;
35
34
  text-decoration: none;
36
35
  background-color: darken(@white, 10%);
36
+ *background-color: darken(@white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */
37
37
  background-position: 0 -15px;
38
38
 
39
39
  // transition is only when going to hover, otherwise the background
@@ -49,20 +49,19 @@
49
49
  // Active state
50
50
  .btn.active,
51
51
  .btn:active {
52
- background-image: none;
53
- @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
54
- .box-shadow(@shadow);
55
52
  background-color: darken(@white, 10%);
56
53
  background-color: darken(@white, 15%) e("\9");
54
+ background-image: none;
57
55
  outline: 0;
56
+ .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
58
57
  }
59
58
 
60
59
  // Disabled state
61
60
  .btn.disabled,
62
61
  .btn[disabled] {
63
62
  cursor: default;
64
- background-image: none;
65
63
  background-color: darken(@white, 10%);
64
+ background-image: none;
66
65
  .opacity(65);
67
66
  .box-shadow(none);
68
67
  }
@@ -117,8 +116,8 @@
117
116
  .btn-info:hover,
118
117
  .btn-inverse,
119
118
  .btn-inverse:hover {
120
- text-shadow: 0 -1px 0 rgba(0,0,0,.25);
121
119
  color: @white;
120
+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
122
121
  }
123
122
  // Provide *some* extra contrast for those who can get it
124
123
  .btn-primary.active,
@@ -126,34 +125,39 @@
126
125
  .btn-danger.active,
127
126
  .btn-success.active,
128
127
  .btn-info.active,
129
- .btn-dark.active {
128
+ .btn-inverse.active {
130
129
  color: rgba(255,255,255,.75);
131
130
  }
132
131
 
133
132
  // Set the backgrounds
134
133
  // -------------------------
134
+ .btn {
135
+ // reset here as of 2.0.3 due to Recess property order
136
+ border-color: #ccc;
137
+ border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);
138
+ }
135
139
  .btn-primary {
136
- .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20));
140
+ .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
137
141
  }
138
142
  // Warning appears are orange
139
143
  .btn-warning {
140
- .buttonBackground(lighten(@orange, 15%), @orange);
144
+ .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight);
141
145
  }
142
146
  // Danger and error appear as red
143
147
  .btn-danger {
144
- .buttonBackground(#ee5f5b, #bd362f);
148
+ .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight);
145
149
  }
146
150
  // Success appears as green
147
151
  .btn-success {
148
- .buttonBackground(#62c462, #51a351);
152
+ .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight);
149
153
  }
150
154
  // Info appears as a neutral blue
151
155
  .btn-info {
152
- .buttonBackground(#5bc0de, #2f96b4);
156
+ .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight);
153
157
  }
154
158
  // Inverse appears as dark gray
155
159
  .btn-inverse {
156
- .buttonBackground(#454545, #262626);
160
+ .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight);
157
161
  }
158
162
 
159
163
 
@@ -172,12 +176,16 @@ input[type="submit"].btn {
172
176
  // IE7 has some default padding on button controls
173
177
  *padding-top: 2px;
174
178
  *padding-bottom: 2px;
175
- &.large {
179
+ &.btn-large {
176
180
  *padding-top: 7px;
177
181
  *padding-bottom: 7px;
178
182
  }
179
- &.small {
183
+ &.btn-small {
180
184
  *padding-top: 3px;
181
185
  *padding-bottom: 3px;
182
186
  }
187
+ &.btn-mini {
188
+ *padding-top: 1px;
189
+ *padding-bottom: 1px;
190
+ }
183
191
  }
@@ -12,7 +12,18 @@
12
12
  &:hover {
13
13
  color: @black;
14
14
  text-decoration: none;
15
- .opacity(40);
16
15
  cursor: pointer;
16
+ .opacity(40);
17
17
  }
18
18
  }
19
+
20
+ // Additional properties for button version
21
+ // iOS requires the button element instead of an anchor tag.
22
+ // If you want the anchor version, it requires `href="#"`.
23
+ button.close {
24
+ padding: 0;
25
+ cursor: pointer;
26
+ background: transparent;
27
+ border: 0;
28
+ -webkit-appearance: none;
29
+ }
@@ -14,7 +14,7 @@ pre {
14
14
 
15
15
  // Inline code
16
16
  code {
17
- padding: 3px 4px;
17
+ padding: 2px 4px;
18
18
  color: #d14;
19
19
  background-color: #f7f7f9;
20
20
  border: 1px solid #e1e1e8;
@@ -25,16 +25,16 @@ pre {
25
25
  display: block;
26
26
  padding: (@baseLineHeight - 1) / 2;
27
27
  margin: 0 0 @baseLineHeight / 2;
28
- font-size: 12px;
28
+ font-size: @baseFontSize * .925; // 13px to 12px
29
29
  line-height: @baseLineHeight;
30
+ word-break: break-all;
31
+ word-wrap: break-word;
32
+ white-space: pre;
33
+ white-space: pre-wrap;
30
34
  background-color: #f5f5f5;
31
35
  border: 1px solid #ccc; // fallback for IE7-8
32
36
  border: 1px solid rgba(0,0,0,.15);
33
37
  .border-radius(4px);
34
- white-space: pre;
35
- white-space: pre-wrap;
36
- word-break: break-all;
37
- word-wrap: break-word;
38
38
 
39
39
  // Make prettyprint styles more spaced out for readability
40
40
  &.prettyprint {
@@ -2,17 +2,19 @@
2
2
  // --------------------
3
3
 
4
4
  .fade {
5
- .transition(opacity .15s linear);
6
5
  opacity: 0;
6
+ .transition(opacity .15s linear);
7
7
  &.in {
8
8
  opacity: 1;
9
9
  }
10
10
  }
11
11
 
12
12
  .collapse {
13
- .transition(height .35s ease);
14
- position:relative;
15
- overflow:hidden;
13
+ position: relative;
16
14
  height: 0;
17
- &.in { height: auto; }
15
+ overflow: hidden;
16
+ .transition(height .35s ease);
17
+ &.in {
18
+ height: auto;
19
+ }
18
20
  }
@@ -2,6 +2,7 @@
2
2
  // --------------
3
3
 
4
4
  // Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
5
+ .dropup,
5
6
  .dropdown {
6
7
  position: relative;
7
8
  }
@@ -13,77 +14,64 @@
13
14
  .open .dropdown-toggle {
14
15
  outline: 0;
15
16
  }
17
+
16
18
  // Dropdown arrow/caret
19
+ // --------------------
17
20
  .caret {
18
21
  display: inline-block;
19
22
  width: 0;
20
23
  height: 0;
21
- text-indent: -99999px;
22
- // IE7 won't do the border trick if there's a text indent, but it doesn't
23
- // do the content that text-indent is hiding, either, so we're ok.
24
- *text-indent: 0;
25
24
  vertical-align: top;
26
- border-left: 4px solid transparent;
27
- border-right: 4px solid transparent;
28
25
  border-top: 4px solid @black;
26
+ border-right: 4px solid transparent;
27
+ border-left: 4px solid transparent;
28
+ content: "";
29
29
  .opacity(30);
30
- content: "\2193";
31
30
  }
31
+
32
+ // Place the caret
32
33
  .dropdown .caret {
33
34
  margin-top: 8px;
34
35
  margin-left: 2px;
35
36
  }
36
37
  .dropdown:hover .caret,
37
- .open.dropdown .caret {
38
+ .open .caret {
38
39
  .opacity(100);
39
40
  }
41
+
40
42
  // The dropdown menu (ul)
43
+ // ----------------------
41
44
  .dropdown-menu {
42
45
  position: absolute;
43
46
  top: 100%;
44
47
  left: 0;
45
48
  z-index: @zindexDropdown;
46
- float: left;
47
49
  display: none; // none by default, but block on "open" of the menu
50
+ float: left;
48
51
  min-width: 160px;
49
- _width: 160px;
50
52
  padding: 4px 0;
51
- margin: 0; // override default ul
53
+ margin: 1px 0 0; // override default ul
52
54
  list-style: none;
53
- background-color: @white;
54
- border-color: #ccc;
55
- border-color: rgba(0,0,0,.2);
56
- border-style: solid;
57
- border-width: 1px;
58
- .border-radius(0 0 5px 5px);
55
+ background-color: @dropdownBackground;
56
+ border: 1px solid #ccc;
57
+ border: 1px solid rgba(0,0,0,.2);
58
+ *border-right-width: 2px;
59
+ *border-bottom-width: 2px;
60
+ .border-radius(5px);
59
61
  .box-shadow(0 5px 10px rgba(0,0,0,.2));
60
62
  -webkit-background-clip: padding-box;
61
63
  -moz-background-clip: padding;
62
64
  background-clip: padding-box;
63
- *border-right-width: 2px;
64
- *border-bottom-width: 2px;
65
65
 
66
- // Allow for dropdowns to go bottom up (aka, dropup-menu)
67
- &.bottom-up {
68
- top: auto;
69
- bottom: 100%;
70
- margin-bottom: 2px;
66
+ // Aligns the dropdown menu to right
67
+ &.pull-right {
68
+ right: 0;
69
+ left: auto;
71
70
  }
72
71
 
73
72
  // Dividers (basically an hr) within the dropdown
74
73
  .divider {
75
- height: 1px;
76
- margin: 5px 1px;
77
- overflow: hidden;
78
- background-color: #e5e5e5;
79
- border-bottom: 1px solid @white;
80
-
81
- // IE7 needs a set width since we gave a height. Restricting just
82
- // to IE7 to keep the 1px left/right space in other browsers.
83
- // It is unclear where IE is getting the extra space that we need
84
- // to negative-margin away, but so it goes.
85
- *width: 100%;
86
- *margin: -5px 0 5px;
74
+ .nav-divider(@dropdownDividerTop, @dropdownDividerBottom);
87
75
  }
88
76
 
89
77
  // Links within the dropdown menu
@@ -93,37 +81,62 @@
93
81
  clear: both;
94
82
  font-weight: normal;
95
83
  line-height: @baseLineHeight;
96
- color: @gray;
84
+ color: @dropdownLinkColor;
97
85
  white-space: nowrap;
98
86
  }
99
87
  }
100
88
 
101
89
  // Hover state
90
+ // -----------
102
91
  .dropdown-menu li > a:hover,
103
92
  .dropdown-menu .active > a,
104
93
  .dropdown-menu .active > a:hover {
105
- color: @white;
94
+ color: @dropdownLinkColorHover;
106
95
  text-decoration: none;
107
- background-color: @linkColor;
96
+ background-color: @dropdownLinkBackgroundHover;
108
97
  }
109
98
 
110
99
  // Open state for the dropdown
111
- .dropdown.open {
100
+ // ---------------------------
101
+ .open {
112
102
  // IE7's z-index only goes to the nearest positioned ancestor, which would
113
103
  // make the menu appear below buttons that appeared later on the page
114
104
  *z-index: @zindexDropdown;
115
105
 
116
- .dropdown-toggle {
117
- color: @white;
118
- background: #ccc;
119
- background: rgba(0,0,0,.3);
106
+ & > .dropdown-menu {
107
+ display: block;
108
+ }
109
+ }
110
+
111
+ // Right aligned dropdowns
112
+ // ---------------------------
113
+ .pull-right > .dropdown-menu {
114
+ right: 0;
115
+ left: auto;
116
+ }
117
+
118
+ // Allow for dropdowns to go bottom up (aka, dropup-menu)
119
+ // ------------------------------------------------------
120
+ // Just add .dropup after the standard .dropdown class and you're set, bro.
121
+ // TODO: abstract this so that the navbar fixed styles are not placed here?
122
+ .dropup,
123
+ .navbar-fixed-bottom .dropdown {
124
+ // Reverse the caret
125
+ .caret {
126
+ border-top: 0;
127
+ border-bottom: 4px solid @black;
128
+ content: "\2191";
120
129
  }
130
+ // Different positioning for bottom up menu
121
131
  .dropdown-menu {
122
- display: block;
132
+ top: auto;
133
+ bottom: 100%;
134
+ margin-bottom: 1px;
123
135
  }
124
136
  }
125
137
 
126
138
  // Typeahead
139
+ // ---------
127
140
  .typeahead {
128
141
  margin-top: 2px; // give it some space to breathe
129
142
  .border-radius(4px);