diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-06 08:29:01 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-06 08:32:20 -0600 |
| commit | 4aaf6af3cc7970cbe5414d323f290b4a94e479d0 (patch) | |
| tree | 2ea70733e2b7b15d74dd343204124405eac52630 | |
| parent | 4447652e8191cd0f1543568813c854bfdc2c8a61 (diff) | |
| download | gitlab-ce-4aaf6af3cc7970cbe5414d323f290b4a94e479d0.tar.gz | |
Move award emojis to framwork
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/awards.scss (renamed from app/assets/stylesheets/pages/awards.scss) | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 4aaff7d04f1..c0ddaacd558 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -40,3 +40,5 @@ @import "framework/blank"; @import "framework/wells.scss"; @import "framework/page-header.scss"; +@import "framework/awards.scss"; +@import "framework/images.scss"; diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/framework/awards.scss index c13cb4a02b2..c13cb4a02b2 100644 --- a/app/assets/stylesheets/pages/awards.scss +++ b/app/assets/stylesheets/framework/awards.scss |