Merge branch 'remove-nprogress-gleaning' into 'master'

Remove CSS for nprogress removed See merge request !12737

Merge branch 'remove-nprogress-gleaning' into 'master'
2b827d05 · Clement Ho · e963205c · eb36a9f0 · 2b827d05 · 2b827d05
Commit 2b827d05 authored Jul 12, 2017 by Clement Ho
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

common.scss app/assets/stylesheets/framework/common.scss +0 -6

remove-nprogress-gleaning.yml changelogs/unreleased/remove-nprogress-gleaning.yml +4 -0

No files found.
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -336,11 +336,6 @@ table {
  text-align: center;
 }

-#nprogress .spinner {
-  top: 15px !important;
-  right: 10px !important;
-}
-
 .header-with-avatar {
  h3 {
    margin: 0;
@@ -450,4 +445,3 @@ table {
  pointer-events: none;
  opacity: .5;
 }
-
--- a/changelogs/unreleased/remove-nprogress-gleaning.yml
+++ b/changelogs/unreleased/remove-nprogress-gleaning.yml
+---
+title: Remove CSS for nprogress removed
+merge_request: 12737
+author: Takuya Noguchi