From 20682af8ff834c39e4cadbe14cf5f6c26b16eb89 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 15 May 2014 15:34:00 +0100 Subject: Make sure sass files have the proper extensions. Otherwise the rake assets:precompile task fails --- app/assets/stylesheets/responsive/_utils.css | 35 -------------- app/assets/stylesheets/responsive/_utils.scss | 35 ++++++++++++++ app/assets/stylesheets/responsive/all.css | 68 --------------------------- app/assets/stylesheets/responsive/all.scss | 68 +++++++++++++++++++++++++++ app/assets/stylesheets/responsive/custom.css | 0 app/assets/stylesheets/responsive/custom.scss | 0 6 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 app/assets/stylesheets/responsive/_utils.css create mode 100644 app/assets/stylesheets/responsive/_utils.scss delete mode 100644 app/assets/stylesheets/responsive/all.css create mode 100644 app/assets/stylesheets/responsive/all.scss delete mode 100644 app/assets/stylesheets/responsive/custom.css create mode 100644 app/assets/stylesheets/responsive/custom.scss diff --git a/app/assets/stylesheets/responsive/_utils.css b/app/assets/stylesheets/responsive/_utils.css deleted file mode 100644 index 68884fa7a..000000000 --- a/app/assets/stylesheets/responsive/_utils.css +++ /dev/null @@ -1,35 +0,0 @@ -$fix-mqs: false !default; - -@mixin respond-min($width) { - // If we're outputting for a fixed media query set... - @if $fix-mqs { - // ...and if we should apply these rules... - @if $fix-mqs >= $width { - // ...output the content the user gave us. - @content; - } - } - @else { - // Otherwise, output it using a regular media query - @media(min-width: $width) { - @content; - } - } -} - -$ie8: false !default; -$lte-ie7: false !default; - -@mixin ie8 { - // Only use this content if we're dealing with IE8 - @if $ie8 { - @content; - } -} - -@mixin lte-ie7 { - // Only use this content if we're dealing with oldest IE (<= 7) - @if $lte-ie7 { - @content; - } -} diff --git a/app/assets/stylesheets/responsive/_utils.scss b/app/assets/stylesheets/responsive/_utils.scss new file mode 100644 index 000000000..68884fa7a --- /dev/null +++ b/app/assets/stylesheets/responsive/_utils.scss @@ -0,0 +1,35 @@ +$fix-mqs: false !default; + +@mixin respond-min($width) { + // If we're outputting for a fixed media query set... + @if $fix-mqs { + // ...and if we should apply these rules... + @if $fix-mqs >= $width { + // ...output the content the user gave us. + @content; + } + } + @else { + // Otherwise, output it using a regular media query + @media(min-width: $width) { + @content; + } + } +} + +$ie8: false !default; +$lte-ie7: false !default; + +@mixin ie8 { + // Only use this content if we're dealing with IE8 + @if $ie8 { + @content; + } +} + +@mixin lte-ie7 { + // Only use this content if we're dealing with oldest IE (<= 7) + @if $lte-ie7 { + @content; + } +} diff --git a/app/assets/stylesheets/responsive/all.css b/app/assets/stylesheets/responsive/all.css deleted file mode 100644 index 4c935bed3..000000000 --- a/app/assets/stylesheets/responsive/all.css +++ /dev/null @@ -1,68 +0,0 @@ -@import "foundation/functions"; -@import "_settings"; - -@import "foundation/components/grid"; -@import "foundation/components/block-grid"; -@import "foundation/components/forms"; - - -// Our own style components -@import "_utils"; - -// Global styles -@import "_global_layout"; -@import "_global_style"; - -@import "_header_layout"; -@import "_header_style"; - -@import "_popups_layout"; -@import "_popups_style"; - -@import "_footer_layout"; -@import "_footer_style"; - -@import "_lists_layout"; -@import "_lists_style"; - -// Styles that are only used on particular pages -@import "_attachments_layout"; -@import "_attachments_style"; - -@import "_blog_layout"; -@import "_blog_style"; - -@import "_categorization_game_style"; -@import "_categorization_game_layout"; - -@import "_contact_style"; -@import "_contact_layout"; - -@import "_frontpage_layout"; -@import "_frontpage_style"; - -@import "_help_style"; -@import "_help_layout"; - -@import "_new_request_layout"; -@import "_new_request_style"; - -@import "_search_layout"; -@import "_search_style"; - -@import "_request_layout"; -@import "_request_style"; - -@import "_signin_layout"; -@import "_signin_style"; - -@import "_public_body_layout"; -@import "_public_body_style"; - -@import "_public_body_stats_layout"; -@import "_public_body_stats_style"; - -@import "_user_style"; -@import "_user_layout"; - -@import "custom"; diff --git a/app/assets/stylesheets/responsive/all.scss b/app/assets/stylesheets/responsive/all.scss new file mode 100644 index 000000000..4c935bed3 --- /dev/null +++ b/app/assets/stylesheets/responsive/all.scss @@ -0,0 +1,68 @@ +@import "foundation/functions"; +@import "_settings"; + +@import "foundation/components/grid"; +@import "foundation/components/block-grid"; +@import "foundation/components/forms"; + + +// Our own style components +@import "_utils"; + +// Global styles +@import "_global_layout"; +@import "_global_style"; + +@import "_header_layout"; +@import "_header_style"; + +@import "_popups_layout"; +@import "_popups_style"; + +@import "_footer_layout"; +@import "_footer_style"; + +@import "_lists_layout"; +@import "_lists_style"; + +// Styles that are only used on particular pages +@import "_attachments_layout"; +@import "_attachments_style"; + +@import "_blog_layout"; +@import "_blog_style"; + +@import "_categorization_game_style"; +@import "_categorization_game_layout"; + +@import "_contact_style"; +@import "_contact_layout"; + +@import "_frontpage_layout"; +@import "_frontpage_style"; + +@import "_help_style"; +@import "_help_layout"; + +@import "_new_request_layout"; +@import "_new_request_style"; + +@import "_search_layout"; +@import "_search_style"; + +@import "_request_layout"; +@import "_request_style"; + +@import "_signin_layout"; +@import "_signin_style"; + +@import "_public_body_layout"; +@import "_public_body_style"; + +@import "_public_body_stats_layout"; +@import "_public_body_stats_style"; + +@import "_user_style"; +@import "_user_layout"; + +@import "custom"; diff --git a/app/assets/stylesheets/responsive/custom.css b/app/assets/stylesheets/responsive/custom.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/assets/stylesheets/responsive/custom.scss b/app/assets/stylesheets/responsive/custom.scss new file mode 100644 index 000000000..e69de29bb -- cgit v1.2.3