Skip to content

Commit

Permalink
Closes #58 - Sprockets no longer handles css compilation.
Browse files Browse the repository at this point in the history
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
atruskie committed Jan 10, 2013
1 parent 254f1f1 commit f524e6d
Show file tree
Hide file tree
Showing 23 changed files with 34 additions and 28 deletions.
20 changes: 1 addition & 19 deletions app/assets/stylesheets/_base.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,7 @@ $footer-height: 40px;
@mixin rounded-corners($args...) {
@include vendor-prefix(border-radius, $args);
}
.rounded-corners {
border-style: $border-style;
border-width: $border-width;
@include rounded-corners($standard-border-radius);
}


/*
*
Expand All @@ -106,20 +102,6 @@ $footer-height: 40px;
@include vendor-prefix(transition-delay, join($delay, (), comma));
}

.standard-transition{
@include transition();
}

.ui-show {
//@extend .standard-transition;

}
.ui-hide {
opacity: 0;
//@extend .standard-transition;
display: none;

}

@mixin glow($color) {
$alphaed: rgba($color, $standard-glow-alpha);
Expand Down
23 changes: 23 additions & 0 deletions app/assets/stylesheets/_layout.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,29 @@ body:before {

.select2-container {
min-width: 150px;
width: 100%;
}

.rounded-corners {
border-style: $border-style;
border-width: $border-width;
@include rounded-corners($standard-border-radius);
}


.standard-transition{
@include transition();
}

.ui-show {
//@extend .standard-transition;

}
.ui-hide {
opacity: 0;
//@extend .standard-transition;
display: none;

}

/* Form Styles
Expand Down
17 changes: 9 additions & 8 deletions app/assets/stylesheets/application.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
* require jquery.ui.all # disabled because slow
*= require_tree ../../../vendor/assets/javascripts/.
*= require_tree ../images/.
*= require_tree .
*= depend_on "_base"
* require_tree .
* depend_on "_base"
*/


//@import "base";
//@import "layout";
//@import "_dynamic.css.scss.erb";
//
//
//@import "/partials/*";
@import "base";
@import "layout";
@import "_dynamic.css.scss.erb";


@import "partials/*";

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 {

Expand Down
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.

0 comments on commit f524e6d

Please sign in to comment.