-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Closes #58 - Sprockets no longer handles css compilation.
It is the sass compiler's job now. Also refactored base.css.scss so that is properly contains no css elements... Because it needs to be imported into other places, it cannot contain other css - other wise it will be duplicated. modified: app/assets/stylesheets/_base.css.scss modified: app/assets/stylesheets/_layout.css.scss modified: app/assets/stylesheets/application.css.scss renamed: app/assets/stylesheets/analysis_items.css.scss -> app/assets/stylesheets/partials/_analysis_items.css.scss renamed: app/assets/stylesheets/analysis_jobs.css.scss -> app/assets/stylesheets/partials/_analysis_jobs.css.scss renamed: app/assets/stylesheets/analysis_scripts.css.scss -> app/assets/stylesheets/partials/_analysis_scripts.css.scss renamed: app/assets/stylesheets/_annotation_viewer.css.scss -> app/assets/stylesheets/partials/_annotation_viewer.css.scss renamed: app/assets/stylesheets/_audio_events.css.scss -> app/assets/stylesheets/partials/_audio_events.css.scss renamed: app/assets/stylesheets/_audio_recordings.css.scss -> app/assets/stylesheets/partials/_audio_recordings.css.scss renamed: app/assets/stylesheets/_bookmarks.css.scss -> app/assets/stylesheets/partials/_bookmarks.css.scss renamed: app/assets/stylesheets/_home.css.scss -> app/assets/stylesheets/partials/_home.css.scss renamed: app/assets/stylesheets/_listen.css.scss -> app/assets/stylesheets/partials/_listen.css.scss renamed: app/assets/stylesheets/_login_control.css.scss -> app/assets/stylesheets/partials/_login_control.css.scss renamed: app/assets/stylesheets/_permissions.css.scss -> app/assets/stylesheets/partials/_permissions.css.scss renamed: app/assets/stylesheets/_photos.css.scss -> app/assets/stylesheets/partials/_photos.css.scss renamed: app/assets/stylesheets/_progresses.css.scss -> app/assets/stylesheets/partials/_progresses.css.scss renamed: app/assets/stylesheets/_projects.css.scss -> app/assets/stylesheets/partials/_projects.css.scss renamed: app/assets/stylesheets/_record_information.css.scss -> app/assets/stylesheets/partials/_record_information.css.scss renamed: app/assets/stylesheets/_saved_searches.css.scss -> app/assets/stylesheets/partials/_saved_searches.css.scss renamed: app/assets/stylesheets/_scaffolds.css.scss -> app/assets/stylesheets/partials/_scaffolds.css.scss renamed: app/assets/stylesheets/_sites.css.scss -> app/assets/stylesheets/partials/_sites.css.scss renamed: app/assets/stylesheets/_tags.css.scss -> app/assets/stylesheets/partials/_tags.css.scss renamed: app/assets/stylesheets/_users.css.scss -> app/assets/stylesheets/partials/_users.css.scss
- Loading branch information
Showing
23 changed files
with
34 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...s/stylesheets/_annotation_viewer.css.scss → ...eets/partials/_annotation_viewer.css.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
@import "base"; | ||
@import "_dynamic.css.scss.erb"; | ||
@import "../_dynamic.css.scss.erb"; | ||
|
||
baw-annotation-viewer { | ||
|
||
|
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.