From 0b63b7e660a22649477a0b59be3beca3c24a6fb1 Mon Sep 17 00:00:00 2001 From: yafeilee Date: Fri, 10 Oct 2014 10:27:36 +0800 Subject: [PATCH] replace to scss style --- ...e_welcome.css.scss => aboutme_welcome.scss} | 0 .../{dashboard.css.scss => dashboard.scss} | 0 .../admin/{posts.css.scss => posts.scss} | 0 .../{angularjs.css.scss => angularjs.scss} | 0 app/assets/stylesheets/application.css | 8 -------- app/assets/stylesheets/application.scss | 18 ++++++++++++++++++ .../{archives.css.scss => archives.scss} | 0 .../stylesheets/{blogs.css.scss => blogs.scss} | 0 .../{comments.css.scss => comments.scss} | 0 .../{footer.css.scss => footer.scss} | 0 .../stylesheets/{head.css.scss => head.scss} | 0 .../{highlight.css.scss => highlight.scss} | 0 ...nd_weixin.css.scss => like_and_weixin.scss} | 0 .../{markdown.css.scss => markdown.scss} | 0 .../{qrcodes.css.scss => qrcodes.scss} | 0 15 files changed, 18 insertions(+), 8 deletions(-) rename app/assets/stylesheets/{aboutme_welcome.css.scss => aboutme_welcome.scss} (100%) rename app/assets/stylesheets/admin/{dashboard.css.scss => dashboard.scss} (100%) rename app/assets/stylesheets/admin/{posts.css.scss => posts.scss} (100%) rename app/assets/stylesheets/{angularjs.css.scss => angularjs.scss} (100%) delete mode 100644 app/assets/stylesheets/application.css create mode 100644 app/assets/stylesheets/application.scss rename app/assets/stylesheets/{archives.css.scss => archives.scss} (100%) rename app/assets/stylesheets/{blogs.css.scss => blogs.scss} (100%) rename app/assets/stylesheets/{comments.css.scss => comments.scss} (100%) rename app/assets/stylesheets/{footer.css.scss => footer.scss} (100%) rename app/assets/stylesheets/{head.css.scss => head.scss} (100%) rename app/assets/stylesheets/{highlight.css.scss => highlight.scss} (100%) rename app/assets/stylesheets/{like_and_weixin.css.scss => like_and_weixin.scss} (100%) rename app/assets/stylesheets/{markdown.css.scss => markdown.scss} (100%) rename app/assets/stylesheets/{qrcodes.css.scss => qrcodes.scss} (100%) diff --git a/app/assets/stylesheets/aboutme_welcome.css.scss b/app/assets/stylesheets/aboutme_welcome.scss similarity index 100% rename from app/assets/stylesheets/aboutme_welcome.css.scss rename to app/assets/stylesheets/aboutme_welcome.scss diff --git a/app/assets/stylesheets/admin/dashboard.css.scss b/app/assets/stylesheets/admin/dashboard.scss similarity index 100% rename from app/assets/stylesheets/admin/dashboard.css.scss rename to app/assets/stylesheets/admin/dashboard.scss diff --git a/app/assets/stylesheets/admin/posts.css.scss b/app/assets/stylesheets/admin/posts.scss similarity index 100% rename from app/assets/stylesheets/admin/posts.css.scss rename to app/assets/stylesheets/admin/posts.scss diff --git a/app/assets/stylesheets/angularjs.css.scss b/app/assets/stylesheets/angularjs.scss similarity index 100% rename from app/assets/stylesheets/angularjs.css.scss rename to app/assets/stylesheets/angularjs.scss diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index 09f1af9..0000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,8 +0,0 @@ -//= require_self -//= require foundation_and_overrides - -//= require_tree . - -.inner-wrap { - min-height: 100%; -} diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 0000000..e5fe770 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,18 @@ +//.inner-wrap { + //min-height: 100%; +//} + +@import 'foundation_and_overrides'; + +@import 'aboutme_welcome'; +@import 'archives'; +@import 'markdown'; +@import 'blogs'; +@import 'head'; +@import 'qrcodes'; +@import 'angularjs'; +@import 'comments'; +@import 'highlight'; +@import 'footer'; +@import 'like_and_weixin'; +@import 'admin/*'; diff --git a/app/assets/stylesheets/archives.css.scss b/app/assets/stylesheets/archives.scss similarity index 100% rename from app/assets/stylesheets/archives.css.scss rename to app/assets/stylesheets/archives.scss diff --git a/app/assets/stylesheets/blogs.css.scss b/app/assets/stylesheets/blogs.scss similarity index 100% rename from app/assets/stylesheets/blogs.css.scss rename to app/assets/stylesheets/blogs.scss diff --git a/app/assets/stylesheets/comments.css.scss b/app/assets/stylesheets/comments.scss similarity index 100% rename from app/assets/stylesheets/comments.css.scss rename to app/assets/stylesheets/comments.scss diff --git a/app/assets/stylesheets/footer.css.scss b/app/assets/stylesheets/footer.scss similarity index 100% rename from app/assets/stylesheets/footer.css.scss rename to app/assets/stylesheets/footer.scss diff --git a/app/assets/stylesheets/head.css.scss b/app/assets/stylesheets/head.scss similarity index 100% rename from app/assets/stylesheets/head.css.scss rename to app/assets/stylesheets/head.scss diff --git a/app/assets/stylesheets/highlight.css.scss b/app/assets/stylesheets/highlight.scss similarity index 100% rename from app/assets/stylesheets/highlight.css.scss rename to app/assets/stylesheets/highlight.scss diff --git a/app/assets/stylesheets/like_and_weixin.css.scss b/app/assets/stylesheets/like_and_weixin.scss similarity index 100% rename from app/assets/stylesheets/like_and_weixin.css.scss rename to app/assets/stylesheets/like_and_weixin.scss diff --git a/app/assets/stylesheets/markdown.css.scss b/app/assets/stylesheets/markdown.scss similarity index 100% rename from app/assets/stylesheets/markdown.css.scss rename to app/assets/stylesheets/markdown.scss diff --git a/app/assets/stylesheets/qrcodes.css.scss b/app/assets/stylesheets/qrcodes.scss similarity index 100% rename from app/assets/stylesheets/qrcodes.css.scss rename to app/assets/stylesheets/qrcodes.scss