Commit d2330777 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'ee-42908-rename-scss-files-to-use-snake-case' into 'master'

Rename .scss files to use snake_case -- EE merge edition

See merge request gitlab-org/gitlab-ee!4472
parents 5ceb0c6d 92f2eaff
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
@import "framework/flash"; @import "framework/flash";
@import "framework/forms"; @import "framework/forms";
@import "framework/gfm"; @import "framework/gfm";
@import "framework/gitlab-theme"; @import "framework/gitlab_theme";
@import "framework/header"; @import "framework/header";
@import "framework/highlight"; @import "framework/highlight";
@import "framework/issue_box"; @import "framework/issue_box";
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
@import "framework/pagination"; @import "framework/pagination";
@import "framework/panels"; @import "framework/panels";
@import "framework/popup"; @import "framework/popup";
@import "framework/secondary-navigation-elements"; @import "framework/secondary_navigation_elements";
@import "framework/selects"; @import "framework/selects";
@import "framework/sidebar"; @import "framework/sidebar";
@import "framework/contextual-sidebar"; @import "framework/contextual_sidebar";
@import "framework/tables"; @import "framework/tables";
@import "framework/notes"; @import "framework/notes";
@import "framework/tabs"; @import "framework/tabs";
...@@ -48,17 +48,17 @@ ...@@ -48,17 +48,17 @@
@import "framework/zen"; @import "framework/zen";
@import "framework/blank"; @import "framework/blank";
@import "framework/wells"; @import "framework/wells";
@import "framework/page-header"; @import "framework/page_header";
@import "framework/awards"; @import "framework/awards";
@import "framework/images"; @import "framework/images";
@import "framework/broadcast-messages"; @import "framework/broadcast_messages";
@import "framework/emojis"; @import "framework/emojis";
@import "framework/emoji-sprites"; @import "framework/emoji_sprites";
@import "framework/icons"; @import "framework/icons";
@import "framework/snippets"; @import "framework/snippets";
@import "framework/memory_graph"; @import "framework/memory_graph";
@import "framework/responsive_tables"; @import "framework/responsive_tables";
@import "framework/stacked-progress-bar"; @import "framework/stacked_progress_bar";
@import "framework/sortable"; @import "framework/sortable";
@import "framework/ci_variable_list"; @import "framework/ci_variable_list";
@import "framework/feature_highlight"; @import "framework/feature_highlight";
...@@ -115,7 +115,7 @@ namespace :gemojione do ...@@ -115,7 +115,7 @@ namespace :gemojione do
end end
end end
style_path = Rails.root.join(*%w(app assets stylesheets framework emoji-sprites.scss)) style_path = Rails.root.join(*%w(app assets stylesheets framework emoji_sprites.scss))
# Combine the resized assets into a packed sprite and re-generate the SCSS # Combine the resized assets into a packed sprite and re-generate the SCSS
SpriteFactory.cssurl = "image-url('$IMAGE')" SpriteFactory.cssurl = "image-url('$IMAGE')"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment