bootstrap-generators 2.0.4 → 2.1.1
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +211 -63
- data/lib/bootstrap/generators/version.rb +1 -1
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +102 -28
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +104 -31
- data/vendor/assets/images/glyphicons-halflings.png +0 -0
- data/vendor/assets/javascripts/bootstrap-affix.js +104 -0
- data/vendor/assets/javascripts/bootstrap-alert.js +1 -1
- data/vendor/assets/javascripts/bootstrap-button.js +2 -2
- data/vendor/assets/javascripts/bootstrap-carousel.js +12 -5
- data/vendor/assets/javascripts/bootstrap-collapse.js +4 -3
- data/vendor/assets/javascripts/bootstrap-dropdown.js +66 -16
- data/vendor/assets/javascripts/bootstrap-modal.js +95 -74
- data/vendor/assets/javascripts/bootstrap-popover.js +9 -4
- data/vendor/assets/javascripts/bootstrap-scrollspy.js +9 -9
- data/vendor/assets/javascripts/bootstrap-tab.js +2 -2
- data/vendor/assets/javascripts/bootstrap-tooltip.js +15 -15
- data/vendor/assets/javascripts/bootstrap-transition.js +2 -3
- data/vendor/assets/javascripts/bootstrap-typeahead.js +51 -36
- data/vendor/assets/javascripts/bootstrap.js +1 -1
- data/vendor/assets/stylesheets/bootstrap-responsive.css +1058 -0
- data/vendor/assets/stylesheets/bootstrap-responsive.min.css +9 -0
- data/vendor/assets/stylesheets/bootstrap.css +5774 -0
- data/vendor/assets/stylesheets/bootstrap.min.css +9 -0
- data/vendor/twitter/bootstrap/less/accordion.less +3 -2
- data/vendor/twitter/bootstrap/less/alerts.less +16 -9
- data/vendor/twitter/bootstrap/less/bootstrap.less +1 -1
- data/vendor/twitter/bootstrap/less/breadcrumbs.less +10 -10
- data/vendor/twitter/bootstrap/less/button-groups.less +79 -25
- data/vendor/twitter/bootstrap/less/buttons.less +107 -67
- data/vendor/twitter/bootstrap/less/carousel.less +13 -3
- data/vendor/twitter/bootstrap/less/close.less +4 -2
- data/vendor/twitter/bootstrap/less/code.less +6 -5
- data/vendor/twitter/bootstrap/less/component-animations.less +4 -2
- data/vendor/twitter/bootstrap/less/dropdowns.less +82 -15
- data/vendor/twitter/bootstrap/less/forms.less +124 -57
- data/vendor/twitter/bootstrap/less/grid.less +17 -1
- data/vendor/twitter/bootstrap/less/hero-unit.less +4 -2
- data/vendor/twitter/bootstrap/less/labels-badges.less +19 -2
- data/vendor/twitter/bootstrap/less/layouts.less +1 -2
- data/vendor/twitter/bootstrap/less/mixins.less +112 -77
- data/vendor/twitter/bootstrap/less/modals.less +12 -4
- data/vendor/twitter/bootstrap/less/navbar.less +245 -128
- data/vendor/twitter/bootstrap/less/navs.less +38 -17
- data/vendor/twitter/bootstrap/less/pager.less +11 -7
- data/vendor/twitter/bootstrap/less/pagination.less +23 -15
- data/vendor/twitter/bootstrap/less/popovers.less +101 -33
- data/vendor/twitter/bootstrap/less/progress-bars.less +18 -13
- data/vendor/twitter/bootstrap/less/reset.less +10 -4
- data/vendor/twitter/bootstrap/less/responsive-1200px-min.less +9 -7
- data/vendor/twitter/bootstrap/less/responsive-767px-max.less +95 -70
- data/vendor/twitter/bootstrap/less/responsive-768px-979px.less +7 -5
- data/vendor/twitter/bootstrap/less/responsive-navbar.less +30 -6
- data/vendor/twitter/bootstrap/less/responsive-utilities.less +17 -15
- data/vendor/twitter/bootstrap/less/responsive.less +5 -5
- data/vendor/twitter/bootstrap/less/scaffolding.less +27 -4
- data/vendor/twitter/bootstrap/less/sprites.less +21 -19
- data/vendor/twitter/bootstrap/less/tables.less +81 -12
- data/vendor/twitter/bootstrap/less/thumbnails.less +9 -4
- data/vendor/twitter/bootstrap/less/tooltip.less +47 -12
- data/vendor/twitter/bootstrap/less/type.less +75 -86
- data/vendor/twitter/bootstrap/less/utilities.less +9 -2
- data/vendor/twitter/bootstrap/less/variables.less +104 -31
- data/vendor/twitter/bootstrap/less/wells.less +7 -5
- data/vendor/twitter/bootstrap/sass/_accordion.scss +3 -2
- data/vendor/twitter/bootstrap/sass/_alerts.scss +15 -8
- data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +10 -10
- data/vendor/twitter/bootstrap/sass/_button-groups.scss +77 -23
- data/vendor/twitter/bootstrap/sass/_buttons.scss +106 -66
- data/vendor/twitter/bootstrap/sass/_carousel.scss +13 -3
- data/vendor/twitter/bootstrap/sass/_close.scss +5 -3
- data/vendor/twitter/bootstrap/sass/_code.scss +7 -6
- data/vendor/twitter/bootstrap/sass/_component-animations.scss +5 -3
- data/vendor/twitter/bootstrap/sass/_dropdowns.scss +85 -18
- data/vendor/twitter/bootstrap/sass/_forms.scss +121 -53
- data/vendor/twitter/bootstrap/sass/_grid.scss +17 -1
- data/vendor/twitter/bootstrap/sass/_hero-unit.scss +4 -2
- data/vendor/twitter/bootstrap/sass/_labels-badges.scss +29 -12
- data/vendor/twitter/bootstrap/sass/_layouts.scss +2 -3
- data/vendor/twitter/bootstrap/sass/_mixins.scss +163 -127
- data/vendor/twitter/bootstrap/sass/_modals.scss +12 -4
- data/vendor/twitter/bootstrap/sass/_navbar.scss +243 -127
- data/vendor/twitter/bootstrap/sass/_navs.scss +36 -15
- data/vendor/twitter/bootstrap/sass/_pager.scss +12 -8
- data/vendor/twitter/bootstrap/sass/_pagination.scss +23 -15
- data/vendor/twitter/bootstrap/sass/_popovers.scss +101 -33
- data/vendor/twitter/bootstrap/sass/_progress-bars.scss +18 -13
- data/vendor/twitter/bootstrap/sass/_reset.scss +8 -3
- data/vendor/twitter/bootstrap/sass/_responsive-1200px-min.scss +9 -7
- data/vendor/twitter/bootstrap/sass/_responsive-767px-max.scss +95 -70
- data/vendor/twitter/bootstrap/sass/_responsive-768px-979px.scss +8 -6
- data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +29 -5
- data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +32 -15
- data/vendor/twitter/bootstrap/sass/_scaffolding.scss +29 -4
- data/vendor/twitter/bootstrap/sass/_sprites.scss +21 -19
- data/vendor/twitter/bootstrap/sass/_tables.scss +79 -11
- data/vendor/twitter/bootstrap/sass/_thumbnails.scss +9 -4
- data/vendor/twitter/bootstrap/sass/_tooltip.scss +47 -12
- data/vendor/twitter/bootstrap/sass/_type.scss +74 -85
- data/vendor/twitter/bootstrap/sass/_utilities.scss +24 -2
- data/vendor/twitter/bootstrap/sass/_variables.scss +102 -28
- data/vendor/twitter/bootstrap/sass/_wells.scss +7 -5
- data/vendor/twitter/bootstrap/sass/bootstrap.scss +1 -1
- data/vendor/twitter/bootstrap/sass/responsive.scss +5 -5
- metadata +15 -10
@@ -1,5 +1,7 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Utility classes
|
3
|
+
// --------------------------------------------------
|
4
|
+
|
3
5
|
|
4
6
|
// Quick floats
|
5
7
|
.pull-right {
|
@@ -21,3 +23,8 @@
|
|
21
23
|
.invisible {
|
22
24
|
visibility: hidden;
|
23
25
|
}
|
26
|
+
|
27
|
+
// For Affix plugin
|
28
|
+
.affix {
|
29
|
+
position: fixed;
|
30
|
+
}
|
@@ -1,10 +1,9 @@
|
|
1
|
-
//
|
2
|
-
// Variables
|
3
|
-
//
|
4
|
-
|
1
|
+
//
|
2
|
+
// Variables
|
3
|
+
// --------------------------------------------------
|
5
4
|
|
6
5
|
|
7
|
-
//
|
6
|
+
// Global values
|
8
7
|
// --------------------------------------------------
|
9
8
|
|
10
9
|
|
@@ -47,18 +46,17 @@
|
|
47
46
|
// -------------------------
|
48
47
|
@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
49
48
|
@serifFontFamily: Georgia, "Times New Roman", Times, serif;
|
50
|
-
@monoFontFamily:
|
49
|
+
@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace;
|
51
50
|
|
52
|
-
@baseFontSize:
|
51
|
+
@baseFontSize: 14px;
|
53
52
|
@baseFontFamily: @sansFontFamily;
|
54
|
-
@baseLineHeight:
|
53
|
+
@baseLineHeight: 20px;
|
55
54
|
@altFontFamily: @serifFontFamily;
|
56
55
|
|
57
56
|
@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
|
58
57
|
@headingsFontWeight: bold; // instead of browser default, bold
|
59
58
|
@headingsColor: inherit; // empty to use BS default, @textColor
|
60
59
|
|
61
|
-
|
62
60
|
// Tables
|
63
61
|
// -------------------------
|
64
62
|
@tableBackground: transparent; // overall background-color
|
@@ -66,15 +64,14 @@
|
|
66
64
|
@tableBackgroundHover: #f5f5f5; // for hover
|
67
65
|
@tableBorder: #ddd; // table and cell border
|
68
66
|
|
69
|
-
|
70
67
|
// Buttons
|
71
68
|
// -------------------------
|
72
69
|
@btnBackground: @white;
|
73
70
|
@btnBackgroundHighlight: darken(@white, 10%);
|
74
|
-
@btnBorder: #
|
71
|
+
@btnBorder: #bbb;
|
75
72
|
|
76
73
|
@btnPrimaryBackground: @linkColor;
|
77
|
-
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground,
|
74
|
+
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%);
|
78
75
|
|
79
76
|
@btnInfoBackground: #5bc0de;
|
80
77
|
@btnInfoBackgroundHighlight: #2f96b4;
|
@@ -88,7 +85,7 @@
|
|
88
85
|
@btnDangerBackground: #ee5f5b;
|
89
86
|
@btnDangerBackgroundHighlight: #bd362f;
|
90
87
|
|
91
|
-
@btnInverseBackground:
|
88
|
+
@btnInverseBackground: #444;
|
92
89
|
@btnInverseBackgroundHighlight: @grayDarker;
|
93
90
|
|
94
91
|
|
@@ -104,12 +101,16 @@
|
|
104
101
|
// -------------------------
|
105
102
|
@dropdownBackground: @white;
|
106
103
|
@dropdownBorder: rgba(0,0,0,.2);
|
107
|
-
@dropdownLinkColor: @grayDark;
|
108
|
-
@dropdownLinkColorHover: @white;
|
109
|
-
@dropdownLinkBackgroundHover: @linkColor;
|
110
104
|
@dropdownDividerTop: #e5e5e5;
|
111
105
|
@dropdownDividerBottom: @white;
|
112
106
|
|
107
|
+
@dropdownLinkColor: @grayDark;
|
108
|
+
@dropdownLinkColorHover: @white;
|
109
|
+
@dropdownLinkColorActive: @dropdownLinkColor;
|
110
|
+
|
111
|
+
@dropdownLinkBackgroundActive: @linkColor;
|
112
|
+
@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
|
113
|
+
|
113
114
|
|
114
115
|
|
115
116
|
// COMPONENT VARIABLES
|
@@ -121,7 +122,7 @@
|
|
121
122
|
// Try to avoid customizing these :)
|
122
123
|
@zindexDropdown: 1000;
|
123
124
|
@zindexPopover: 1010;
|
124
|
-
@zindexTooltip:
|
125
|
+
@zindexTooltip: 1030;
|
125
126
|
@zindexFixedNavbar: 1030;
|
126
127
|
@zindexModalBackdrop: 1040;
|
127
128
|
@zindexModal: 1050;
|
@@ -143,25 +144,60 @@
|
|
143
144
|
@hrBorder: @grayLighter;
|
144
145
|
|
145
146
|
|
147
|
+
// Horizontal forms & lists
|
148
|
+
// -------------------------
|
149
|
+
@horizontalComponentOffset: 180px;
|
150
|
+
|
151
|
+
|
152
|
+
// Wells
|
153
|
+
// -------------------------
|
154
|
+
@wellBackground: #f5f5f5;
|
155
|
+
|
156
|
+
|
146
157
|
// Navbar
|
147
158
|
// -------------------------
|
148
|
-
@
|
149
|
-
@navbarBackground: @grayDarker;
|
150
|
-
@navbarBackgroundHighlight: @grayDark;
|
159
|
+
@navbarCollapseWidth: 979px;
|
151
160
|
|
152
|
-
@
|
153
|
-
@
|
154
|
-
@
|
155
|
-
@
|
161
|
+
@navbarHeight: 40px;
|
162
|
+
@navbarBackgroundHighlight: #ffffff;
|
163
|
+
@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
|
164
|
+
@navbarBorder: darken(@navbarBackground, 12%);
|
165
|
+
|
166
|
+
@navbarText: #777;
|
167
|
+
@navbarLinkColor: #777;
|
168
|
+
@navbarLinkColorHover: @grayDark;
|
169
|
+
@navbarLinkColorActive: @gray;
|
156
170
|
@navbarLinkBackgroundHover: transparent;
|
157
|
-
@navbarLinkBackgroundActive: @navbarBackground;
|
171
|
+
@navbarLinkBackgroundActive: darken(@navbarBackground, 5%);
|
158
172
|
|
159
|
-
@navbarSearchBackground: lighten(@navbarBackground, 25%);
|
160
|
-
@navbarSearchBackgroundFocus: @white;
|
161
|
-
@navbarSearchBorder: darken(@navbarSearchBackground, 30%);
|
162
|
-
@navbarSearchPlaceholderColor: #ccc;
|
163
173
|
@navbarBrandColor: @navbarLinkColor;
|
164
174
|
|
175
|
+
// Inverted navbar
|
176
|
+
@navbarInverseBackground: #111111;
|
177
|
+
@navbarInverseBackgroundHighlight: #222222;
|
178
|
+
@navbarInverseBorder: #252525;
|
179
|
+
|
180
|
+
@navbarInverseText: @grayLight;
|
181
|
+
@navbarInverseLinkColor: @grayLight;
|
182
|
+
@navbarInverseLinkColorHover: @white;
|
183
|
+
@navbarInverseLinkColorActive: @navbarInverseLinkColorHover;
|
184
|
+
@navbarInverseLinkBackgroundHover: transparent;
|
185
|
+
@navbarInverseLinkBackgroundActive: @navbarInverseBackground;
|
186
|
+
|
187
|
+
@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%);
|
188
|
+
@navbarInverseSearchBackgroundFocus: @white;
|
189
|
+
@navbarInverseSearchBorder: @navbarInverseBackground;
|
190
|
+
@navbarInverseSearchPlaceholderColor: #ccc;
|
191
|
+
|
192
|
+
@navbarInverseBrandColor: @navbarInverseLinkColor;
|
193
|
+
|
194
|
+
|
195
|
+
// Pagination
|
196
|
+
// -------------------------
|
197
|
+
@paginationBackground: #fff;
|
198
|
+
@paginationBorder: #ddd;
|
199
|
+
@paginationActiveBackground: #f5f5f5;
|
200
|
+
|
165
201
|
|
166
202
|
// Hero unit
|
167
203
|
// -------------------------
|
@@ -189,10 +225,28 @@
|
|
189
225
|
@infoBorder: darken(spin(@infoBackground, -10), 7%);
|
190
226
|
|
191
227
|
|
228
|
+
// Tooltips and popovers
|
229
|
+
// -------------------------
|
230
|
+
@tooltipColor: #fff;
|
231
|
+
@tooltipBackground: #000;
|
232
|
+
@tooltipArrowWidth: 5px;
|
233
|
+
@tooltipArrowColor: @tooltipBackground;
|
234
|
+
|
235
|
+
@popoverBackground: #fff;
|
236
|
+
@popoverArrowWidth: 10px;
|
237
|
+
@popoverArrowColor: #fff;
|
238
|
+
@popoverTitleBackground: darken(@popoverBackground, 3%);
|
239
|
+
|
240
|
+
// Special enhancement for popovers
|
241
|
+
@popoverArrowOuterWidth: @popoverArrowWidth + 1;
|
242
|
+
@popoverArrowOuterColor: rgba(0,0,0,.25);
|
243
|
+
|
244
|
+
|
192
245
|
|
193
246
|
// GRID
|
194
247
|
// --------------------------------------------------
|
195
248
|
|
249
|
+
|
196
250
|
// Default 940px grid
|
197
251
|
// -------------------------
|
198
252
|
@gridColumns: 12;
|
@@ -200,7 +254,26 @@
|
|
200
254
|
@gridGutterWidth: 20px;
|
201
255
|
@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
|
202
256
|
|
257
|
+
// 1200px min
|
258
|
+
@gridColumnWidth1200: 70px;
|
259
|
+
@gridGutterWidth1200: 30px;
|
260
|
+
@gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
|
261
|
+
|
262
|
+
// 768px-979px
|
263
|
+
@gridColumnWidth768: 42px;
|
264
|
+
@gridGutterWidth768: 20px;
|
265
|
+
@gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
|
266
|
+
|
267
|
+
|
203
268
|
// Fluid grid
|
204
269
|
// -------------------------
|
205
|
-
@fluidGridColumnWidth:
|
206
|
-
@fluidGridGutterWidth:
|
270
|
+
@fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth);
|
271
|
+
@fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth);
|
272
|
+
|
273
|
+
// 1200px min
|
274
|
+
@fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200);
|
275
|
+
@fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200);
|
276
|
+
|
277
|
+
// 768px-979px
|
278
|
+
@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
|
279
|
+
@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);
|
@@ -1,13 +1,15 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Wells
|
3
|
+
// --------------------------------------------------
|
3
4
|
|
5
|
+
|
6
|
+
// Base class
|
4
7
|
.well {
|
5
8
|
min-height: 20px;
|
6
9
|
padding: 19px;
|
7
10
|
margin-bottom: 20px;
|
8
|
-
background-color:
|
9
|
-
border: 1px solid
|
10
|
-
border: 1px solid rgba(0,0,0,.05);
|
11
|
+
background-color: @wellBackground;
|
12
|
+
border: 1px solid darken(@wellBackground, 7%);
|
11
13
|
.border-radius(4px);
|
12
14
|
.box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
|
13
15
|
blockquote {
|
@@ -1,7 +1,11 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Alerts
|
3
|
+
// --------------------------------------------------
|
4
|
+
|
5
|
+
|
6
|
+
// Base styles
|
7
|
+
// -------------------------
|
3
8
|
|
4
|
-
// Base alert styles
|
5
9
|
.alert {
|
6
10
|
padding: 8px 35px 8px 14px;
|
7
11
|
margin-bottom: $baseLineHeight;
|
@@ -11,8 +15,8 @@
|
|
11
15
|
@include border-radius(4px);
|
12
16
|
color: $warningText;
|
13
17
|
}
|
14
|
-
.alert
|
15
|
-
|
18
|
+
.alert h4 {
|
19
|
+
margin: 0;
|
16
20
|
}
|
17
21
|
|
18
22
|
// Adjust close link position
|
@@ -20,11 +24,12 @@
|
|
20
24
|
position: relative;
|
21
25
|
top: -2px;
|
22
26
|
right: -21px;
|
23
|
-
line-height:
|
27
|
+
line-height: $baseLineHeight;
|
24
28
|
}
|
25
29
|
|
30
|
+
|
26
31
|
// Alternate styles
|
27
|
-
//
|
32
|
+
// -------------------------
|
28
33
|
|
29
34
|
.alert-success {
|
30
35
|
background-color: $successBackground;
|
@@ -43,8 +48,10 @@
|
|
43
48
|
color: $infoText;
|
44
49
|
}
|
45
50
|
|
51
|
+
|
46
52
|
// Block alerts
|
47
|
-
//
|
53
|
+
// -------------------------
|
54
|
+
|
48
55
|
.alert-block {
|
49
56
|
padding-top: 14px;
|
50
57
|
padding-bottom: 14px;
|
@@ -1,14 +1,14 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Breadcrumbs
|
3
|
+
// --------------------------------------------------
|
4
|
+
|
3
5
|
|
4
6
|
.breadcrumb {
|
5
|
-
padding:
|
7
|
+
padding: 8px 15px;
|
6
8
|
margin: 0 0 $baseLineHeight;
|
7
9
|
list-style: none;
|
8
|
-
|
9
|
-
border
|
10
|
-
@include border-radius(3px);
|
11
|
-
@include box-shadow(inset 0 1px 0 $white);
|
10
|
+
background-color: #f5f5f5;
|
11
|
+
@include border-radius(4px);
|
12
12
|
li {
|
13
13
|
display: inline-block;
|
14
14
|
@include ie7-inline-block();
|
@@ -16,9 +16,9 @@
|
|
16
16
|
}
|
17
17
|
.divider {
|
18
18
|
padding: 0 5px;
|
19
|
-
color:
|
19
|
+
color: #ccc;
|
20
20
|
}
|
21
|
-
.active
|
22
|
-
color: $
|
21
|
+
.active {
|
22
|
+
color: $grayLight;
|
23
23
|
}
|
24
24
|
}
|
@@ -1,11 +1,14 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Button groups
|
3
|
+
// --------------------------------------------------
|
3
4
|
|
4
5
|
|
5
6
|
// Make the div behave like a button
|
6
7
|
.btn-group {
|
7
8
|
position: relative;
|
8
|
-
|
9
|
+
font-size: 0; // remove as part 1 of font-size inline-block hack
|
10
|
+
vertical-align: middle; // match .btn alignment given font-size hack above
|
11
|
+
white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
|
9
12
|
@include ie7-restore-left-whitespace();
|
10
13
|
}
|
11
14
|
|
@@ -16,21 +19,44 @@
|
|
16
19
|
|
17
20
|
// Optional: Group multiple button groups together for a toolbar
|
18
21
|
.btn-toolbar {
|
22
|
+
font-size: 0; // Hack to remove whitespace that results from using inline-block
|
19
23
|
margin-top: $baseLineHeight / 2;
|
20
24
|
margin-bottom: $baseLineHeight / 2;
|
21
25
|
.btn-group {
|
22
26
|
display: inline-block;
|
23
27
|
@include ie7-inline-block();
|
24
28
|
}
|
29
|
+
.btn + .btn,
|
30
|
+
.btn-group + .btn,
|
31
|
+
.btn + .btn-group {
|
32
|
+
margin-left: 5px;
|
33
|
+
}
|
25
34
|
}
|
26
35
|
|
27
36
|
// Float them, remove border radius, then re-add to first and last elements
|
28
37
|
.btn-group > .btn {
|
29
38
|
position: relative;
|
30
|
-
float: left;
|
31
|
-
margin-left: -1px;
|
32
39
|
@include border-radius(0);
|
33
40
|
}
|
41
|
+
.btn-group > .btn + .btn {
|
42
|
+
margin-left: -1px;
|
43
|
+
}
|
44
|
+
.btn-group > .btn,
|
45
|
+
.btn-group > .dropdown-menu {
|
46
|
+
font-size: $baseFontSize; // redeclare as part 2 of font-size inline-block hack
|
47
|
+
}
|
48
|
+
|
49
|
+
// Reset fonts for other sizes
|
50
|
+
.btn-group > .btn-mini {
|
51
|
+
font-size: 11px;
|
52
|
+
}
|
53
|
+
.btn-group > .btn-small {
|
54
|
+
font-size: 12px;
|
55
|
+
}
|
56
|
+
.btn-group > .btn-large {
|
57
|
+
font-size: 16px;
|
58
|
+
}
|
59
|
+
|
34
60
|
// 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
61
|
.btn-group > .btn:first-child {
|
36
62
|
margin-left: 0;
|
@@ -91,24 +117,28 @@
|
|
91
117
|
// ----------------------
|
92
118
|
|
93
119
|
// Give the line between buttons some depth
|
94
|
-
.btn-group > .dropdown-toggle {
|
120
|
+
.btn-group > .btn + .dropdown-toggle {
|
95
121
|
padding-left: 8px;
|
96
122
|
padding-right: 8px;
|
97
123
|
@include 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:
|
99
|
-
*padding-bottom:
|
124
|
+
*padding-top: 5px;
|
125
|
+
*padding-bottom: 5px;
|
100
126
|
}
|
101
|
-
.btn-group > .btn-mini.dropdown-toggle {
|
127
|
+
.btn-group > .btn-mini + .dropdown-toggle {
|
102
128
|
padding-left: 5px;
|
103
129
|
padding-right: 5px;
|
130
|
+
*padding-top: 2px;
|
131
|
+
*padding-bottom: 2px;
|
104
132
|
}
|
105
|
-
.btn-group > .btn-small.dropdown-toggle {
|
106
|
-
*padding-top:
|
133
|
+
.btn-group > .btn-small + .dropdown-toggle {
|
134
|
+
*padding-top: 5px;
|
107
135
|
*padding-bottom: 4px;
|
108
136
|
}
|
109
|
-
.btn-group > .btn-large.dropdown-toggle {
|
137
|
+
.btn-group > .btn-large + .dropdown-toggle {
|
110
138
|
padding-left: 12px;
|
111
139
|
padding-right: 12px;
|
140
|
+
*padding-top: 7px;
|
141
|
+
*padding-bottom: 7px;
|
112
142
|
}
|
113
143
|
|
114
144
|
.btn-group.open {
|
@@ -147,22 +177,16 @@
|
|
147
177
|
|
148
178
|
// Reposition the caret
|
149
179
|
.btn .caret {
|
150
|
-
margin-top:
|
180
|
+
margin-top: 8px;
|
151
181
|
margin-left: 0;
|
152
182
|
}
|
153
|
-
.btn:hover .caret,
|
154
|
-
.open.btn-group .caret {
|
155
|
-
@include opacity(100);
|
156
|
-
}
|
157
183
|
// Carets in other button sizes
|
158
|
-
.btn-mini .caret
|
159
|
-
|
160
|
-
|
161
|
-
.btn-small .caret {
|
184
|
+
.btn-mini .caret,
|
185
|
+
.btn-small .caret,
|
186
|
+
.btn-large .caret {
|
162
187
|
margin-top: 6px;
|
163
188
|
}
|
164
189
|
.btn-large .caret {
|
165
|
-
margin-top: 6px;
|
166
190
|
border-left-width: 5px;
|
167
191
|
border-right-width: 5px;
|
168
192
|
border-top-width: 5px;
|
@@ -185,7 +209,37 @@
|
|
185
209
|
.caret {
|
186
210
|
border-top-color: $white;
|
187
211
|
border-bottom-color: $white;
|
188
|
-
@include opacity(75);
|
189
212
|
}
|
190
213
|
}
|
191
214
|
|
215
|
+
|
216
|
+
|
217
|
+
// Vertical button groups
|
218
|
+
// ----------------------
|
219
|
+
|
220
|
+
.btn-group-vertical {
|
221
|
+
display: inline-block; // makes buttons only take up the width they need
|
222
|
+
@include ie7-inline-block();
|
223
|
+
}
|
224
|
+
.btn-group-vertical .btn {
|
225
|
+
display: block;
|
226
|
+
float: none;
|
227
|
+
width: 100%;
|
228
|
+
@include border-radius(0);
|
229
|
+
}
|
230
|
+
.btn-group-vertical .btn + .btn {
|
231
|
+
margin-left: 0;
|
232
|
+
margin-top: -1px;
|
233
|
+
}
|
234
|
+
.btn-group-vertical .btn:first-child {
|
235
|
+
@include border-radius(4px 4px 0 0);
|
236
|
+
}
|
237
|
+
.btn-group-vertical .btn:last-child {
|
238
|
+
@include border-radius(0 0 4px 4px);
|
239
|
+
}
|
240
|
+
.btn-group-vertical .btn-large:first-child {
|
241
|
+
@include border-radius(6px 6px 0 0);
|
242
|
+
}
|
243
|
+
.btn-group-vertical .btn-large:last-child {
|
244
|
+
@include border-radius(0 0 6px 6px);
|
245
|
+
}
|