diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-09-28 21:33:41 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-28 21:33:41 +0300 |
| commit | cb1e4a8abb33a32da9bec300e0259d50fa2afea9 (patch) | |
| tree | c4fdd4076025bb5b612bc88debab62709c311e5f /app/assets/stylesheets/application.scss | |
| parent | 2a6e33d838caa813e248de6af603201f5addb7eb (diff) | |
| parent | d5734de3d60983fcb3d3f3099d47fe9831e453ad (diff) | |
Merge branch 'master' into 'remove-dropzonejs-rails'
# Conflicts:
# Gemfile.lock
Diffstat (limited to 'app/assets/stylesheets/application.scss')
| -rw-r--r-- | app/assets/stylesheets/application.scss | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 7b450b7ab95..ffe65ce780e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -37,7 +37,11 @@ /* * Code highlight */ -@import "highlight/**/*"; +@import "highlight/dark"; +@import "highlight/monokai"; +@import "highlight/solarized_dark"; +@import "highlight/solarized_light"; +@import "highlight/white"; /* * Styles for JS behaviors. |