diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-29 15:21:47 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-02-29 15:21:47 +0000 |
| commit | a8f87ec877e979bed0e922d3f7d87e135e269ea9 (patch) | |
| tree | d3bbe8f21f8111030687d1320dc5cdc9f4f1899a /app/assets/stylesheets | |
| parent | 7b689fb5253194132f83fcbabc5c8be24d664127 (diff) | |
| parent | cb0e26d1f7cf44c1fb9341fc94c0c819e653a3f6 (diff) | |
| download | gitlab-ce-a8f87ec877e979bed0e922d3f7d87e135e269ea9.tar.gz | |
Merge branch 'removed-ngprogress' into 'master'
Removed NGProgress
In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator
Ref #13820
See merge request !3004
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/application.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/progress.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f51054f13dc..e2d590f4df4 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -26,12 +26,6 @@ @import "framework"; /* - * NProgress load bar css - */ -@import 'nprogress'; -@import 'nprogress-bootstrap'; - -/* * Font icons */ @import "font-awesome"; diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index fa7641b1676..e2a30f5ed34 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -26,6 +26,7 @@ @import "framework/mobile.scss"; @import "framework/nav.scss"; @import "framework/pagination.scss"; +@import "framework/progress.scss"; @import "framework/panels.scss"; @import "framework/selects.scss"; @import "framework/sidebar.scss"; diff --git a/app/assets/stylesheets/framework/progress.scss b/app/assets/stylesheets/framework/progress.scss new file mode 100644 index 00000000000..e9800bd24b5 --- /dev/null +++ b/app/assets/stylesheets/framework/progress.scss @@ -0,0 +1,5 @@ +html.turbolinks-progress-bar::before { + background-color: $progress-color!important; + height: 2px!important; + box-shadow: 0 0 10px $progress-color, 0 0 5px $progress-color; +} diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 2706d031d7b..7834cb0bfa5 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -7,7 +7,7 @@ $gl-header-color: #323232; $gl-link-color: #333c48; $md-text-color: #444; $md-link-color: #3084bb; -$nprogress-color: #c0392b; +$progress-color: #c0392b; $gl-font-size: 15px; $list-font-size: 15px; $sidebar_collapsed_width: 62px; |