diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2016-12-16 20:33:24 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2016-12-16 20:33:24 +0000 |
| commit | fb16b01faab577af781386b9a68336213117b689 (patch) | |
| tree | f8538b3671791cd4ebf63d19fe8e2050f6665535 | |
| parent | b3d5ed62de3519b42dbcef2973c189467588fc36 (diff) | |
| parent | 88e364f0f6f8d21b73f9eea786c7f8326dff61fe (diff) | |
| download | gitlab-ce-fb16b01faab577af781386b9a68336213117b689.tar.gz | |
Merge branch 'bootstrap-wells' into 'master'
Put back bootstrap wells
I removed bootstrap wells previously but we still need them for now. Will return to this later
See merge request !8150
| -rw-r--r-- | app/assets/stylesheets/framework/tw_bootstrap.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss index d998d654aa4..718dbbfea27 100644 --- a/app/assets/stylesheets/framework/tw_bootstrap.scss +++ b/app/assets/stylesheets/framework/tw_bootstrap.scss @@ -35,7 +35,7 @@ @import "bootstrap/alerts"; // @import "bootstrap/progress-bars"; @import "bootstrap/list-group"; -// @import "bootstrap/wells"; +@import "bootstrap/wells"; @import "bootstrap/close"; @import "bootstrap/panels"; |