Skip to content

Commit 9f4477f

Browse files
committed
dropdown is not the default value for our Dropdown plugin, we should now specify which one we want (dropdown, dropup, dropleft, dropright)
1 parent 28ea06d commit 9f4477f

File tree

3 files changed

+31
-29
lines changed

3 files changed

+31
-29
lines changed

docs/4.0/components/dropdowns.md

+23-23
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ And with `<a>` elements:
6262
The best part is you can do this with any button variant, too:
6363

6464
<div class="bd-example">
65-
<div class="btn-group">
65+
<div class="btn-group dropdown">
6666
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Primary</button>
6767
<div class="dropdown-menu">
6868
<a class="dropdown-item" href="#">Action</a>
@@ -72,7 +72,7 @@ The best part is you can do this with any button variant, too:
7272
<a class="dropdown-item" href="#">Separated link</a>
7373
</div>
7474
</div><!-- /btn-group -->
75-
<div class="btn-group">
75+
<div class="btn-group dropdown">
7676
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Secondary</button>
7777
<div class="dropdown-menu">
7878
<a class="dropdown-item" href="#">Action</a>
@@ -82,7 +82,7 @@ The best part is you can do this with any button variant, too:
8282
<a class="dropdown-item" href="#">Separated link</a>
8383
</div>
8484
</div><!-- /btn-group -->
85-
<div class="btn-group">
85+
<div class="btn-group dropdown">
8686
<button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Success</button>
8787
<div class="dropdown-menu">
8888
<a class="dropdown-item" href="#">Action</a>
@@ -92,7 +92,7 @@ The best part is you can do this with any button variant, too:
9292
<a class="dropdown-item" href="#">Separated link</a>
9393
</div>
9494
</div><!-- /btn-group -->
95-
<div class="btn-group">
95+
<div class="btn-group dropdown">
9696
<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Info</button>
9797
<div class="dropdown-menu">
9898
<a class="dropdown-item" href="#">Action</a>
@@ -102,7 +102,7 @@ The best part is you can do this with any button variant, too:
102102
<a class="dropdown-item" href="#">Separated link</a>
103103
</div>
104104
</div><!-- /btn-group -->
105-
<div class="btn-group">
105+
<div class="btn-group dropdown">
106106
<button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Warning</button>
107107
<div class="dropdown-menu">
108108
<a class="dropdown-item" href="#">Action</a>
@@ -112,7 +112,7 @@ The best part is you can do this with any button variant, too:
112112
<a class="dropdown-item" href="#">Separated link</a>
113113
</div>
114114
</div><!-- /btn-group -->
115-
<div class="btn-group">
115+
<div class="btn-group dropdown">
116116
<button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Danger</button>
117117
<div class="dropdown-menu">
118118
<a class="dropdown-item" href="#">Action</a>
@@ -126,7 +126,7 @@ The best part is you can do this with any button variant, too:
126126

127127
{% highlight html %}
128128
<!-- Example single danger button -->
129-
<div class="btn-group">
129+
<div class="btn-group dropdown">
130130
<button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
131131
Action
132132
</button>
@@ -147,7 +147,7 @@ Similarly, create split button dropdowns with virtually the same markup as singl
147147
We use this extra class to reduce the horizontal `padding` on either side of the caret by 25% and remove the `margin-left` that's added for regular button dropdowns. Those extra changes keep the caret centered in the split button and provide a more appropriately sized hit area next to the main button.
148148

149149
<div class="bd-example">
150-
<div class="btn-group">
150+
<div class="btn-group dropdown">
151151
<button type="button" class="btn btn-primary">Primary</button>
152152
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
153153
<span class="sr-only">Toggle Dropdown</span>
@@ -160,7 +160,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
160160
<a class="dropdown-item" href="#">Separated link</a>
161161
</div>
162162
</div><!-- /btn-group -->
163-
<div class="btn-group">
163+
<div class="btn-group dropdown">
164164
<button type="button" class="btn btn-secondary">Secondary</button>
165165
<button type="button" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
166166
<span class="sr-only">Toggle Dropdown</span>
@@ -173,7 +173,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
173173
<a class="dropdown-item" href="#">Separated link</a>
174174
</div>
175175
</div><!-- /btn-group -->
176-
<div class="btn-group">
176+
<div class="btn-group dropdown">
177177
<button type="button" class="btn btn-success">Success</button>
178178
<button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
179179
<span class="sr-only">Toggle Dropdown</span>
@@ -186,7 +186,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
186186
<a class="dropdown-item" href="#">Separated link</a>
187187
</div>
188188
</div><!-- /btn-group -->
189-
<div class="btn-group">
189+
<div class="btn-group dropdown">
190190
<button type="button" class="btn btn-info">Info</button>
191191
<button type="button" class="btn btn-info dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
192192
<span class="sr-only">Toggle Dropdown</span>
@@ -199,7 +199,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
199199
<a class="dropdown-item" href="#">Separated link</a>
200200
</div>
201201
</div><!-- /btn-group -->
202-
<div class="btn-group">
202+
<div class="btn-group dropdown">
203203
<button type="button" class="btn btn-warning">Warning</button>
204204
<button type="button" class="btn btn-warning dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
205205
<span class="sr-only">Toggle Dropdown</span>
@@ -212,7 +212,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
212212
<a class="dropdown-item" href="#">Separated link</a>
213213
</div>
214214
</div><!-- /btn-group -->
215-
<div class="btn-group">
215+
<div class="btn-group dropdown">
216216
<button type="button" class="btn btn-danger">Danger</button>
217217
<button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
218218
<span class="sr-only">Toggle Dropdown</span>
@@ -229,7 +229,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
229229

230230
{% highlight html %}
231231
<!-- Example split danger button -->
232-
<div class="btn-group">
232+
<div class="btn-group dropdown">
233233
<button type="button" class="btn btn-danger">Action</button>
234234
<button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
235235
<span class="sr-only">Toggle Dropdown</span>
@@ -250,7 +250,7 @@ Button dropdowns work with buttons of all sizes, including default and split dro
250250

251251
<div class="bd-example">
252252
<div class="btn-toolbar" role="toolbar">
253-
<div class="btn-group">
253+
<div class="btn-group dropdown">
254254
<button class="btn btn-secondary btn-lg dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
255255
Large button
256256
</button>
@@ -262,7 +262,7 @@ Button dropdowns work with buttons of all sizes, including default and split dro
262262
<a class="dropdown-item" href="#">Separated link</a>
263263
</div>
264264
</div><!-- /btn-group -->
265-
<div class="btn-group ml-2">
265+
<div class="btn-group dropdown ml-2">
266266
<button type="button" class="btn btn-lg btn-secondary">Large split button</button>
267267
<button type="button" class="btn btn-lg btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
268268
<span class="sr-only">Toggle Dropdown</span>
@@ -277,7 +277,7 @@ Button dropdowns work with buttons of all sizes, including default and split dro
277277
</div><!-- /btn-group -->
278278
</div><!-- /btn-toolbar -->
279279
<div class="btn-toolbar" role="toolbar">
280-
<div class="btn-group">
280+
<div class="btn-group dropdown">
281281
<button class="btn btn-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
282282
Small button
283283
</button>
@@ -289,7 +289,7 @@ Button dropdowns work with buttons of all sizes, including default and split dro
289289
<a class="dropdown-item" href="#">Separated link</a>
290290
</div>
291291
</div><!-- /btn-group -->
292-
<div class="btn-group ml-2">
292+
<div class="btn-group dropdown ml-2">
293293
<button type="button" class="btn btn-sm btn-secondary">Small split button</button>
294294
<button type="button" class="btn btn-sm btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
295295
<span class="sr-only">Toggle Dropdown</span>
@@ -307,15 +307,15 @@ Button dropdowns work with buttons of all sizes, including default and split dro
307307

308308
{% highlight html %}
309309
<!-- Large button groups (default and split) -->
310-
<div class="btn-group">
310+
<div class="btn-group dropdown">
311311
<button class="btn btn-secondary btn-lg dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
312312
Large button
313313
</button>
314314
<div class="dropdown-menu">
315315
...
316316
</div>
317317
</div>
318-
<div class="btn-group">
318+
<div class="btn-group dropdown">
319319
<button class="btn btn-secondary btn-lg" type="button">
320320
Large button
321321
</button>
@@ -328,15 +328,15 @@ Button dropdowns work with buttons of all sizes, including default and split dro
328328
</div>
329329

330330
<!-- Small button groups (default and split) -->
331-
<div class="btn-group">
331+
<div class="btn-group dropdown">
332332
<button class="btn btn-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
333333
Small button
334334
</button>
335335
<div class="dropdown-menu">
336336
...
337337
</div>
338338
</div>
339-
<div class="btn-group">
339+
<div class="btn-group dropdown">
340340
<button class="btn btn-secondary btn-sm" type="button">
341341
Small button
342342
</button>
@@ -562,7 +562,7 @@ By default, a dropdown menu is automatically positioned 100% from the top and al
562562
{% endcallout %}
563563

564564
{% example html %}
565-
<div class="btn-group">
565+
<div class="btn-group dropdown">
566566
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
567567
This dropdown's menu is right-aligned
568568
</button>

js/tests/visual/dropdown.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ <h1>Dropdown <small>Bootstrap Visual Test</small></h1>
8282
</div>
8383
</div>
8484

85-
<div class="btn-group">
85+
<div class="btn-group dropdown">
8686
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
8787
This dropdown's menu is right-aligned
8888
</button>

scss/_dropdown.scss

+7-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
position: relative;
55
}
66

7-
.dropdown-toggle {
8-
// Generate the caret automatically
9-
@include caret;
10-
}
11-
127
// The dropdown menu
138
.dropdown-menu {
149
position: absolute;
@@ -31,6 +26,13 @@
3126
@include box-shadow($dropdown-box-shadow);
3227
}
3328

29+
.dropdown {
30+
.dropdown-toggle {
31+
// Generate the caret automatically
32+
@include caret(down);
33+
}
34+
}
35+
3436
// Allow for dropdowns to go bottom up (aka, dropup-menu)
3537
// Just add .dropup after the standard .dropdown class and you're set.
3638
.dropup {

0 commit comments

Comments
 (0)