From: Tomas Sedovic tsedovic@redhat.com
--- src/app/stylesheets/_base.scss | 3 +++ src/app/stylesheets/screen.scss | 8 -------- src/app/views/layouts/aggregator.haml | 3 --- 3 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 src/app/stylesheets/screen.scss
diff --git a/src/app/stylesheets/_base.scss b/src/app/stylesheets/_base.scss index 6c86b0f..8e475a8 100644 --- a/src/app/stylesheets/_base.scss +++ b/src/app/stylesheets/_base.scss @@ -1,3 +1,6 @@ +@import "grid"; +@import "text"; + @mixin border-radius($radius) { border-radius: $radius; -moz-border-radius: $radius; diff --git a/src/app/stylesheets/screen.scss b/src/app/stylesheets/screen.scss deleted file mode 100644 index be2e0cb..0000000 --- a/src/app/stylesheets/screen.scss +++ /dev/null @@ -1,8 +0,0 @@ -/* This is a placeholder for the Compass/Blueprint stuff. It shows how it's - * supposed to work. Uncomment the last lines to enable the Compass Reset - * plugin and the Blueprint Typography. */ - -// @import compass/reset -// @import blueprint - -// +blueprint-typography diff --git a/src/app/views/layouts/aggregator.haml b/src/app/views/layouts/aggregator.haml index b9fd4df..8173c33 100644 --- a/src/app/views/layouts/aggregator.haml +++ b/src/app/views/layouts/aggregator.haml @@ -6,9 +6,6 @@ Deltacloud = yield :title
- = stylesheet_link_tag 'compiled/grid.css', :media => 'screen, projection' - = stylesheet_link_tag 'compiled/text.css', :media => 'screen, projection' - = stylesheet_link_tag 'compiled/screen.css', :media => 'screen, projection' = stylesheet_link_tag 'compiled/layout' = stylesheet_link_tag 'compiled/components' = stylesheet_link_tag 'compiled/dcloud'