diff --git a/app/assets/stylesheets/_settings.css.scss b/app/assets/stylesheets/_settings.css.scss index 5aa8309be..e93d6dbb8 100644 --- a/app/assets/stylesheets/_settings.css.scss +++ b/app/assets/stylesheets/_settings.css.scss @@ -11,7 +11,7 @@ // Colors Settings -// $mainColor: #2ba6cb; +$mainColor: #009900; // $secondaryColor: #e9e9e9; // $alertColor: #c60f13; // $successColor: #5da423; @@ -24,8 +24,8 @@ // Typography Settings -// $headerFontFamily: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif; -// $headerFontWeight: bold; +$headerFontFamily: "Sevillana", "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif; +$headerFontWeight: normal; // $headerFontColor: #222; // $bodyFontFamily: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif; // $bodyFontWeight: normal; @@ -73,4 +73,4 @@ // $tapToCloseFontWeight: normal; // $tapToCloseFontColor: #888; // $tooltipFontSizeScreenSmall: 14; -// $tooltipBackgroundOpacityScreenSmall: 0.85; \ No newline at end of file +// $tooltipBackgroundOpacityScreenSmall: 0.85; diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb new file mode 100644 index 000000000..98bfd7da6 --- /dev/null +++ b/app/views/home/index.html.erb @@ -0,0 +1,30 @@ +<% content_for :title, "Growstuff dev site" %> + +
+
+ +
+
+
+
+

Growstuff dev site

+

We're a community of gardeners

+
+
+
+
+ +
+
+ + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index 76c5250c9..000000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - -<%= content_for?(:title) ? yield(:title) : "Untitled" %> - -<%= stylesheet_link_tag "application" %> - - -<%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> - - - <%= yield %> - - diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index de789490e..1dcbe3225 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,6 +1,11 @@ %html %head - %title Growstuff + + + + + + %title = content_for?(:title) ? yield(:title) : "Growstuff" = stylesheet_link_tag "application", :media => "all" = javascript_include_tag "application" = csrf_meta_tags