From 9b48a46e3022ad5c37693fabf0b2474fc0424fc6 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 2 Jan 2012 14:42:01 -0800 Subject: [PATCH] core default template shouldn't use scss --- .../lib/middleman-core/templates/default.rb | 5 +- .../default/source/layouts/layout.erb | 2 +- .../default/source/stylesheets/_animate.scss | 23 -------- .../default/source/stylesheets/all.css | 55 +++++++++++++++++++ .../default/source/stylesheets/all.css.scss | 40 -------------- .../{_normalize.scss => normalize.css} | 0 6 files changed, 58 insertions(+), 67 deletions(-) delete mode 100644 middleman-core/lib/middleman-core/templates/default/source/stylesheets/_animate.scss create mode 100644 middleman-core/lib/middleman-core/templates/default/source/stylesheets/all.css delete mode 100644 middleman-core/lib/middleman-core/templates/default/source/stylesheets/all.css.scss rename middleman-core/lib/middleman-core/templates/default/source/stylesheets/{_normalize.scss => normalize.css} (100%) diff --git a/middleman-core/lib/middleman-core/templates/default.rb b/middleman-core/lib/middleman-core/templates/default.rb index f7fbc658..233acdde 100644 --- a/middleman-core/lib/middleman-core/templates/default.rb +++ b/middleman-core/lib/middleman-core/templates/default.rb @@ -14,9 +14,8 @@ class Middleman::Templates::Default < Middleman::Templates::Base copy_file "default/source/index.html.erb", File.join(location, "source/index.html.erb") copy_file "default/source/layouts/layout.erb", File.join(location, "source/layouts/layout.erb") empty_directory File.join(location, "source", options[:css_dir]) - copy_file "default/source/stylesheets/all.css.scss", File.join(location, "source", options[:css_dir], "all.css.scss") - copy_file "default/source/stylesheets/_animate.scss", File.join(location, "source", options[:css_dir], "_animate.scss") - copy_file "default/source/stylesheets/_normalize.scss", File.join(location, "source", options[:css_dir], "_normalize.scss") + copy_file "default/source/stylesheets/all.css", File.join(location, "source", options[:css_dir], "all.css") + copy_file "default/source/stylesheets/normalize.css", File.join(location, "source", options[:css_dir], "normalize.css") empty_directory File.join(location, "source", options[:js_dir]) copy_file "default/source/javascripts/all.js", File.join(location, "source", options[:js_dir], "all.js") empty_directory File.join(location, "source", options[:images_dir]) diff --git a/middleman-core/lib/middleman-core/templates/default/source/layouts/layout.erb b/middleman-core/lib/middleman-core/templates/default/source/layouts/layout.erb index 43df2daf..365985b7 100644 --- a/middleman-core/lib/middleman-core/templates/default/source/layouts/layout.erb +++ b/middleman-core/lib/middleman-core/templates/default/source/layouts/layout.erb @@ -9,7 +9,7 @@ <%= data.page.title || "The Middleman" %> - <%= stylesheet_link_tag "all" %> + <%= stylesheet_link_tag "normalize", "all" %> <%= javascript_include_tag "all" %> diff --git a/middleman-core/lib/middleman-core/templates/default/source/stylesheets/_animate.scss b/middleman-core/lib/middleman-core/templates/default/source/stylesheets/_animate.scss deleted file mode 100644 index bc87b07c..00000000 --- a/middleman-core/lib/middleman-core/templates/default/source/stylesheets/_animate.scss +++ /dev/null @@ -1,23 +0,0 @@ -.welcome { - -webkit-animation-name: welcome; - -webkit-animation-duration: .9s; -} - -@-webkit-keyframes welcome { - from { - -webkit-transform: scale(0); - opacity: 0; - } - 50% { - -webkit-transform: scale(0); - opacity: 0; - } - 82.5% { - -webkit-transform: scale(1.03); - -webkit-animation-timing-function: ease-out; - opacity: 1; - } - to { - -webkit-transform: scale(1); - } -} \ No newline at end of file diff --git a/middleman-core/lib/middleman-core/templates/default/source/stylesheets/all.css b/middleman-core/lib/middleman-core/templates/default/source/stylesheets/all.css new file mode 100644 index 00000000..6ff94cf9 --- /dev/null +++ b/middleman-core/lib/middleman-core/templates/default/source/stylesheets/all.css @@ -0,0 +1,55 @@ +@charset "utf-8"; + +body { + background: #d4d4d4 url("../images/background.png"); + text-align: center; + font-family: sans-serif; } + +h1 { + color: rgba(0, 0, 0, .3); + font-weight: bold; + font-size: 32px; + letter-spacing: -1px; + text-transform: uppercase; + text-shadow: 0 1px 0 rgba(255, 255, 255, .5); + background: url("../images/middleman.png") no-repeat center 100px; + padding: 350px 0 10px; + margin: 0; } + +.doc { + font-size: 14px; + margin: 0; } + .doc:before, + .doc:after { + opacity: .2; + padding: 6px; + font-style: normal; + position: relative; + content: "•"; } + .doc a { + color: rgba(0, 0, 0, 0.3); } + .doc a:hover { + color: #666; } + +.welcome { + -webkit-animation-name: welcome; + -webkit-animation-duration: .9s; } + +@-webkit-keyframes welcome { + from { + -webkit-transform: scale(0); + opacity: 0; + } + 50% { + -webkit-transform: scale(0); + opacity: 0; + } + 82.5% { + -webkit-transform: scale(1.03); + -webkit-animation-timing-function: ease-out; + opacity: 1; + } + to { + -webkit-transform: scale(1); + } +} \ No newline at end of file diff --git a/middleman-core/lib/middleman-core/templates/default/source/stylesheets/all.css.scss b/middleman-core/lib/middleman-core/templates/default/source/stylesheets/all.css.scss deleted file mode 100644 index 8c091dec..00000000 --- a/middleman-core/lib/middleman-core/templates/default/source/stylesheets/all.css.scss +++ /dev/null @@ -1,40 +0,0 @@ -@charset "utf-8"; - -@import "normalize"; -@import "compass"; - -body { - background: #d4d4d4 image-url("background.png"); - text-align: center; - font-family: sans-serif; -} - -h1 { - color: rgba(black, .3); - font-weight: bold; - @include adjust-font-size-to(32px); - letter-spacing: -1px; - text-transform: uppercase; - text-shadow: 0 1px 0 rgba(white, .5); - background: image-url("middleman.png") no-repeat center 100px; - padding: 350px 0 10px; - margin: 0; -} - -.doc { - @include adjust-font-size-to(14px); - margin: 0; - &:before, - &:after { - opacity: .2; - padding: 6px; - font-style: normal; - position: relative; - content: "•"; - } - a { - @include link-colors( rgba( black, .3 ) , #666); - } -} - -@import "animate"; \ No newline at end of file diff --git a/middleman-core/lib/middleman-core/templates/default/source/stylesheets/_normalize.scss b/middleman-core/lib/middleman-core/templates/default/source/stylesheets/normalize.css similarity index 100% rename from middleman-core/lib/middleman-core/templates/default/source/stylesheets/_normalize.scss rename to middleman-core/lib/middleman-core/templates/default/source/stylesheets/normalize.css