diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-06 13:27:56 -0600 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-12-14 20:01:01 -0500 |
| commit | fd3be70dcd1bd625a69701a7be17ae4e733d1512 (patch) | |
| tree | 7788567a314ac84e293163206b0386810ee434f9 /app/assets/stylesheets/framework.scss | |
| parent | 4e68b88193b561faa9ab6b54573970d994e7de60 (diff) | |
| download | gitlab-ce-fd3be70dcd1bd625a69701a7be17ae4e733d1512.tar.gz | |
Shift emojis and icons styles into framework
Diffstat (limited to 'app/assets/stylesheets/framework.scss')
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index c82a9a2b9e3..928ef408722 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -44,3 +44,5 @@ @import "framework/awards.scss"; @import "framework/images.scss"; @import "framework/broadcast-messages"; +@import "framework/emojis.scss"; +@import "framework/icons.scss"; |