From e25b31ac81eb9cbd4e6eefb24a1f83e735bd628d Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Wed, 21 Dec 2016 20:45:36 +0000 Subject: Merge branch '25938-progress-bar-gone' into 'master' Put back progress bar CSS Closes #25938 See merge request !8237 --- app/assets/stylesheets/framework/tw_bootstrap.scss | 2 +- changelogs/unreleased/25938-progress-bar-gone.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/25938-progress-bar-gone.yml diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss index 718dbbfea27..55bc325b858 100644 --- a/app/assets/stylesheets/framework/tw_bootstrap.scss +++ b/app/assets/stylesheets/framework/tw_bootstrap.scss @@ -33,7 +33,7 @@ @import "bootstrap/labels"; @import "bootstrap/badges"; @import "bootstrap/alerts"; -// @import "bootstrap/progress-bars"; +@import "bootstrap/progress-bars"; @import "bootstrap/list-group"; @import "bootstrap/wells"; @import "bootstrap/close"; diff --git a/changelogs/unreleased/25938-progress-bar-gone.yml b/changelogs/unreleased/25938-progress-bar-gone.yml new file mode 100644 index 00000000000..841c4d445c6 --- /dev/null +++ b/changelogs/unreleased/25938-progress-bar-gone.yml @@ -0,0 +1,4 @@ +--- +title: Adds back CSS for progress-bars +merge_request: 8237 +author: -- cgit v1.2.1