diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-06 22:27:56 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-12-15 04:01:01 +0300 |
| commit | fd3be70dcd1bd625a69701a7be17ae4e733d1512 (patch) | |
| tree | 7788567a314ac84e293163206b0386810ee434f9 | |
| parent | 4e68b88193b561faa9ab6b54573970d994e7de60 (diff) | |
Shift emojis and icons styles into framework
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/emojis.scss (renamed from app/assets/stylesheets/pages/emojis.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/icons.scss (renamed from app/assets/stylesheets/pages/icons.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/explore.scss | 8 | ||||
| -rw-r--r-- | app/views/explore/_head.html.haml | 4 |
5 files changed, 4 insertions, 10 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"; diff --git a/app/assets/stylesheets/pages/emojis.scss b/app/assets/stylesheets/framework/emojis.scss index f17797b2381..f17797b2381 100644 --- a/app/assets/stylesheets/pages/emojis.scss +++ b/app/assets/stylesheets/framework/emojis.scss diff --git a/app/assets/stylesheets/pages/icons.scss b/app/assets/stylesheets/framework/icons.scss index 226bd2ead31..226bd2ead31 100644 --- a/app/assets/stylesheets/pages/icons.scss +++ b/app/assets/stylesheets/framework/icons.scss diff --git a/app/assets/stylesheets/pages/explore.scss b/app/assets/stylesheets/pages/explore.scss deleted file mode 100644 index 9b92128624c..00000000000 --- a/app/assets/stylesheets/pages/explore.scss +++ /dev/null @@ -1,8 +0,0 @@ -.explore-title { - text-align: center; - - h3 { - font-weight: normal; - font-size: 30px; - } -} diff --git a/app/views/explore/_head.html.haml b/app/views/explore/_head.html.haml index d8a57560788..a3b0709e261 100644 --- a/app/views/explore/_head.html.haml +++ b/app/views/explore/_head.html.haml @@ -1,5 +1,5 @@ -.explore-title - %h3 +.explore-title.text-center + %h2 Explore GitLab %p.lead Discover projects, groups and snippets. Share your projects with others |