diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-02-03 18:02:19 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-02-03 18:02:19 +0000 |
| commit | 538a6875d3b53f909e9b5b6ef396a457cbcae760 (patch) | |
| tree | 503cf693557a3e9992a7276bc804cfd579658892 /app/assets/stylesheets | |
| parent | 3213dfd797fec7014f7fa38ef110cfb785c297a8 (diff) | |
| parent | aa91f508369a795878b3ee95556302cdb55d9f6c (diff) | |
| download | gitlab-ce-538a6875d3b53f909e9b5b6ef396a457cbcae760.tar.gz | |
Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master'
Remove Turbolinks
Closes #25624
See merge request !8570
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/progress.scss | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 3cf49f4ff1b..08f203a1bf6 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -31,7 +31,6 @@ @import "framework/modal.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 deleted file mode 100644 index e9800bd24b5..00000000000 --- a/app/assets/stylesheets/framework/progress.scss +++ /dev/null @@ -1,5 +0,0 @@ -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; -} |