summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-07-12 01:09:12 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-07-12 01:09:12 +0000
commit2b827d05786a2175281b8f3319570a839b66a627 (patch)
tree24e7d1259a3dbdfeaa7c498ebc5c5cb4807b1d53 /app
parente963205c81858b58872e6ac936198f420c3d31c0 (diff)
parenteb36a9f0f1b7bf2b880ca535c5e2ad48b1560d75 (diff)
downloadgitlab-ce-2b827d05786a2175281b8f3319570a839b66a627.tar.gz
Merge branch 'remove-nprogress-gleaning' into 'master'
Remove CSS for nprogress removed See merge request !12737
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/common.scss6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 00c981f64c5..5e374360359 100644
--- 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;
}
-