diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-12 22:07:20 +0300 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-12 22:07:20 +0300 |
commit | ab0d5e2751cb3e25de6a1164826a6c58184e6f59 (patch) | |
tree | 043c3e6cd0ded02ca9ce23eb2ab0fce13607e52b /doc/development | |
parent | 007e470c9e192768bbb065776bcdf23a5427745a (diff) | |
parent | c07df632ec474e0eff5393467939eb455035620b (diff) |
Merge branch 'winh-cleanup-dropdowns' into 'master'
Clean up new dropdown styles
Closes #39142 and #39446
See merge request gitlab-org/gitlab-ce!13676
Diffstat (limited to 'doc/development')
-rw-r--r-- | doc/development/fe_guide/dropdowns.md | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/doc/development/fe_guide/dropdowns.md b/doc/development/fe_guide/dropdowns.md index e1660ac5caa..6314f8f38d2 100644 --- a/doc/development/fe_guide/dropdowns.md +++ b/doc/development/fe_guide/dropdowns.md @@ -4,15 +4,15 @@ ## How to style a bootstrap dropdown 1. Use the HTML structure provided by the [docs][bootstrap-dropdowns] 1. Add a specific class to the top level `.dropdown` element - - + + ```Haml .dropdown.my-dropdown %button{ type: 'button', data: { toggle: 'dropdown' }, 'aria-haspopup': true, 'aria-expanded': false } %span.dropdown-toggle-text Toggle Dropdown = icon('chevron-down') - + %ul.dropdown-menu %li %a @@ -29,10 +29,4 @@ item! ``` -1. Include the mixin in CSS - - ```SCSS - @include new-style-dropdown('.my-dropdown '); - ``` - [bootstrap-dropdowns]: https://getbootstrap.com/docs/3.3/javascript/#dropdowns |