Skip to content

Commit

Permalink
Move Bootstrap CSS to webui namespace
Browse files Browse the repository at this point in the history
Rename main css file from "webui.css.scss" to "application.scss".
Remove `webui2/icons.scss` because the one in `webui` already has the
right content (sponsor logos and icons for obs_factory).

Co-authored-by: David Kang <dkang@suse.com>
  • Loading branch information
saraycp and David Kang committed Sep 13, 2019
1 parent 4b41a82 commit d158b37
Show file tree
Hide file tree
Showing 48 changed files with 4 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
*= require codemirror
*= require peek
*/

@import 'codemirror';
@import 'peek';
@import 'bootstrap_variables/breakpoints';
@import 'bootstrap_variables/colors';
@import 'bootstrap_variables/spacers';
Expand Down
7 changes: 0 additions & 7 deletions src/api/app/assets/stylesheets/webui2/icons.scss

This file was deleted.

2 changes: 1 addition & 1 deletion src/api/app/views/layouts/webui/webui.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
%meta{ property: 'errbit:key', content: CONFIG['errbit_javascript_api_key'] }
%meta{ property: 'errbit:host', content: CONFIG['errbit_javascript_host'] }

= stylesheet_link_tag 'webui2/webui2'
= stylesheet_link_tag 'webui/application'
= javascript_include_tag 'webui2/application'

= yield :content_for_head
Expand Down
2 changes: 1 addition & 1 deletion src/api/config/initializers/assets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
Rails.application.config.assets.precompile += ['webui2/webui2.css', 'webui2/application.js', 'webui/obs_factory/application.css', 'webui2/cm2/*.js']
Rails.application.config.assets.precompile += ['webui/application.css', 'webui2/application.js', 'webui/obs_factory/application.css', 'webui2/cm2/*.js']

0 comments on commit d158b37

Please sign in to comment.