From 91fbcf8f9416a753c16a7ef6b26eaa0731d7011c Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 19 Apr 2011 22:36:55 +1200 Subject: [PATCH] MINOR Added SASS files --- .gitignore | 1 + code/controller/CMSMain.php | 2 +- config.rb | 2 +- css/CMSMain.css | 0 css/ReportAdmin.css | 0 scss/CMSMain.scss | 0 scss/ReportAdmin.scss | 0 7 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 css/CMSMain.css create mode 100644 css/ReportAdmin.css create mode 100644 scss/CMSMain.scss create mode 100644 scss/ReportAdmin.scss diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..9ba470db --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.sass-cache \ No newline at end of file diff --git a/code/controller/CMSMain.php b/code/controller/CMSMain.php index 94bf8dc8..24363b25 100755 --- a/code/controller/CMSMain.php +++ b/code/controller/CMSMain.php @@ -88,7 +88,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr Requirements::javascript(CMS_DIR . '/javascript/CMSMain.EditForm.js'); Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang'); - // Requirements::css(CMS_DIR . '/css/CMSMain.css'); + Requirements::css(CMS_DIR . '/css/CMSMain.css'); // navigator // Requirements::css(CMS_DIR . '/css/SilverStripeNavigator.css'); diff --git a/config.rb b/config.rb index 7c4436f4..d84164e3 100644 --- a/config.rb +++ b/config.rb @@ -5,7 +5,7 @@ project_type = :stand_alone # Set this to the root of your project when deployed: http_path = "/" css_dir = "css" -sass_dir = "sass" +sass_dir = "scss" images_dir = "images" javascripts_dir = "javascript" output_style = :compact diff --git a/css/CMSMain.css b/css/CMSMain.css new file mode 100644 index 00000000..e69de29b diff --git a/css/ReportAdmin.css b/css/ReportAdmin.css new file mode 100644 index 00000000..e69de29b diff --git a/scss/CMSMain.scss b/scss/CMSMain.scss new file mode 100644 index 00000000..e69de29b diff --git a/scss/ReportAdmin.scss b/scss/ReportAdmin.scss new file mode 100644 index 00000000..e69de29b