diff options
| author | connorshea <connor.james.shea@gmail.com> | 2016-04-12 16:11:58 -0600 |
|---|---|---|
| committer | connorshea <connor.james.shea@gmail.com> | 2016-04-12 16:14:15 -0600 |
| commit | d8296f873871120b7f4134bdcf8854a09b9e8be8 (patch) | |
| tree | 52c9871c89109e5c3a53ed815481fbc1821913c5 | |
| parent | 64d71b4dfc4513b70eac61cbb9bb718aee3f09e9 (diff) | |
| download | gitlab-ce-d8296f873871120b7f4134bdcf8854a09b9e8be8.tar.gz | |
Remove Bootstrap Carousel
The Bootstrap carousel module is used for image carousels, and we don't
use it anywhere on the site. Also separated the Bootstrap JavaScript into separate components and removed the carousel component.
Fixes #14670.
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 12 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/tw_bootstrap.scss | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index b05138ac1ac..6f435e4c542 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -22,7 +22,17 @@ #= require cal-heatmap #= require turbolinks #= require autosave -#= require bootstrap +#= require bootstrap/affix +#= require bootstrap/alert +#= require bootstrap/button +#= require bootstrap/collapse +#= require bootstrap/dropdown +#= require bootstrap/modal +#= require bootstrap/scrollspy +#= require bootstrap/tab +#= require bootstrap/transition +#= require bootstrap/tooltip +#= require bootstrap/popover #= require select2 #= require raphael #= require g.raphael diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss index dd42db1840f..96bab7880c2 100644 --- a/app/assets/stylesheets/framework/tw_bootstrap.scss +++ b/app/assets/stylesheets/framework/tw_bootstrap.scss @@ -43,7 +43,6 @@ @import "bootstrap/modals"; @import "bootstrap/tooltip"; @import "bootstrap/popovers"; -@import "bootstrap/carousel"; // Utility classes .clearfix { |