diff options
| author | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2016-12-16 11:28:35 +0000 |
|---|---|---|
| committer | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2016-12-16 11:28:35 +0000 |
| commit | 4af64c3e4e198fa0499dae585f830c814193cb5e (patch) | |
| tree | 91387aa64d93f21ac04825822e7d4a07288b545f /app/assets/stylesheets/framework.scss | |
| parent | 586c40ad697dc01eeaf078e918e85cf2985e1444 (diff) | |
| parent | 45bd2263698892b9de6eb7956e3085a61054f49f (diff) | |
| download | gitlab-ce-4af64c3e4e198fa0499dae585f830c814193cb5e.tar.gz | |
Merge branch 'master' into 'badge-color-on-white-bg'
# Conflicts:
# app/assets/stylesheets/framework/nav.scss
# app/assets/stylesheets/pages/environments.scss
# app/views/layouts/nav/_group.html.haml
# app/views/layouts/nav/_project.html.haml
Diffstat (limited to 'app/assets/stylesheets/framework.scss')
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index bf626d7383b..3cf49f4ff1b 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -6,6 +6,7 @@ @import "framework/animations.scss"; @import "framework/avatar.scss"; +@import "framework/asciidoctor.scss"; @import "framework/blocks.scss"; @import "framework/buttons.scss"; @import "framework/badges.scss"; @@ -41,3 +42,9 @@ @import "framework/blank"; @import "framework/wells.scss"; @import "framework/page-header.scss"; +@import "framework/awards.scss"; +@import "framework/images.scss"; +@import "framework/broadcast-messages"; +@import "framework/emojis.scss"; +@import "framework/icons.scss"; +@import "framework/snippets.scss"; |