From e29dfa4ab7dafe9e1493e2dd01abb498486bbdbf Mon Sep 17 00:00:00 2001 From: Nate Steiner Date: Fri, 10 Aug 2012 11:29:19 -0400 Subject: [PATCH 1/3] adding smacss submodule --- .gitmodules | 3 +++ middleman-more/lib/middleman-more/templates/smacss | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 middleman-more/lib/middleman-more/templates/smacss diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..8190eb5f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "middleman-more/lib/middleman-more/templates/smacss"] + path = middleman-more/lib/middleman-more/templates/smacss + url = git@github.com:nsteiner/middleman-smacss.git diff --git a/middleman-more/lib/middleman-more/templates/smacss b/middleman-more/lib/middleman-more/templates/smacss new file mode 160000 index 00000000..52ac581e --- /dev/null +++ b/middleman-more/lib/middleman-more/templates/smacss @@ -0,0 +1 @@ +Subproject commit 52ac581eeec080462c3667ff51c8851d1257badd From 893b7baafdc10270b69ee4d72e82eac9b17f269f Mon Sep 17 00:00:00 2001 From: Nate Steiner Date: Fri, 10 Aug 2012 14:17:10 -0400 Subject: [PATCH 2/3] removing smacss submodule --- middleman-more/lib/middleman-more/templates/smacss | 1 - 1 file changed, 1 deletion(-) delete mode 160000 middleman-more/lib/middleman-more/templates/smacss diff --git a/middleman-more/lib/middleman-more/templates/smacss b/middleman-more/lib/middleman-more/templates/smacss deleted file mode 160000 index 52ac581e..00000000 --- a/middleman-more/lib/middleman-more/templates/smacss +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 52ac581eeec080462c3667ff51c8851d1257badd From 7fb6766d4d36b008087922ff9334cb1790143fa6 Mon Sep 17 00:00:00 2001 From: Nate Steiner Date: Fri, 10 Aug 2012 14:19:20 -0400 Subject: [PATCH 3/3] adding smacss as files instead of a submodule --- .../templates/smacss/source/_footer.haml | 1 + .../templates/smacss/source/index.html.haml | 1 + .../templates/smacss/source/layouts/layout.haml | 13 +++++++++++++ .../smacss/source/stylesheets/_0.site-settings.scss | 0 .../smacss/source/stylesheets/_1.base.scss | 2 ++ .../smacss/source/stylesheets/_2.layout.scss | 2 ++ .../smacss/source/stylesheets/_3.states.scss | 2 ++ .../smacss/source/stylesheets/_4.themes.scss | 2 ++ .../smacss/source/stylesheets/modules/_btn.scss | 2 ++ .../smacss/source/stylesheets/style.css.scss | 7 +++++++ 10 files changed, 32 insertions(+) create mode 100644 middleman-more/lib/middleman-more/templates/smacss/source/_footer.haml create mode 100644 middleman-more/lib/middleman-more/templates/smacss/source/index.html.haml create mode 100644 middleman-more/lib/middleman-more/templates/smacss/source/layouts/layout.haml create mode 100644 middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_0.site-settings.scss create mode 100644 middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_1.base.scss create mode 100644 middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_2.layout.scss create mode 100644 middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_3.states.scss create mode 100644 middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_4.themes.scss create mode 100644 middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/modules/_btn.scss create mode 100644 middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/_footer.haml b/middleman-more/lib/middleman-more/templates/smacss/source/_footer.haml new file mode 100644 index 00000000..c518c393 --- /dev/null +++ b/middleman-more/lib/middleman-more/templates/smacss/source/_footer.haml @@ -0,0 +1 @@ +%footer © 2012 \ No newline at end of file diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/index.html.haml b/middleman-more/lib/middleman-more/templates/smacss/source/index.html.haml new file mode 100644 index 00000000..88a918cc --- /dev/null +++ b/middleman-more/lib/middleman-more/templates/smacss/source/index.html.haml @@ -0,0 +1 @@ +%h1 Middleman diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/layouts/layout.haml b/middleman-more/lib/middleman-more/templates/smacss/source/layouts/layout.haml new file mode 100644 index 00000000..7e54cc78 --- /dev/null +++ b/middleman-more/lib/middleman-more/templates/smacss/source/layouts/layout.haml @@ -0,0 +1,13 @@ +!!! 5 +%html + %head + %title Middleman + %meta{:charset => "utf-8"} + %meta{:content => "Middleman", :name => "description"} + %meta{:content => "on", "http-equiv" => "cleartype"} + %meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"} + %link{:href => "stylesheets/style.css", :rel => "stylesheet"} + + %body + = yield + = render_partial 'footer' diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_0.site-settings.scss b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_0.site-settings.scss new file mode 100644 index 00000000..e69de29b diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_1.base.scss b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_1.base.scss new file mode 100644 index 00000000..a3f24d17 --- /dev/null +++ b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_1.base.scss @@ -0,0 +1,2 @@ +/* Base +================================================== */ diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_2.layout.scss b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_2.layout.scss new file mode 100644 index 00000000..4bc2f190 --- /dev/null +++ b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_2.layout.scss @@ -0,0 +1,2 @@ +/* Layout +================================================== */ diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_3.states.scss b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_3.states.scss new file mode 100644 index 00000000..3bf069d1 --- /dev/null +++ b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_3.states.scss @@ -0,0 +1,2 @@ +/* States +================================================== */ diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_4.themes.scss b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_4.themes.scss new file mode 100644 index 00000000..b1ab10b2 --- /dev/null +++ b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/_4.themes.scss @@ -0,0 +1,2 @@ +/* Themes +================================================== */ diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/modules/_btn.scss b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/modules/_btn.scss new file mode 100644 index 00000000..11acd5d6 --- /dev/null +++ b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/modules/_btn.scss @@ -0,0 +1,2 @@ +/* Buttons +================================================== */ diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss new file mode 100644 index 00000000..2aecffa1 --- /dev/null +++ b/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss @@ -0,0 +1,7 @@ +@import + "0.site-settings", + "1.base", + "2.layout", + "3.states", + "4.themes", + "modules/btn"; \ No newline at end of file