diff --git a/Gemfile b/Gemfile index d0ccdd90b7..baee9f27bd 100644 --- a/Gemfile +++ b/Gemfile @@ -41,4 +41,5 @@ gem 'devise', '>= 2.0' gem 'whenever' gem 'mysql2' gem 'therubyracer' -gem "acts_as_list" \ No newline at end of file +gem "acts_as_list" +gem 'web-app-theme', :git => 'https://github.com/pilu/web-app-theme.git' diff --git a/app/assets/stylesheets/habits.css.scss b/app/assets/stylesheets/habits.css.scss index 8628fd75b0..ea594b060e 100644 --- a/app/assets/stylesheets/habits.css.scss +++ b/app/assets/stylesheets/habits.css.scss @@ -2,7 +2,10 @@ // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ -.bad { background-color:rgb(224, 102, 102); color:white; } +.bad, .bad a{ + background-color:rgb(224, 102, 102); + color:white !important; + } .iffy { background-color:rgb(246, 178, 107); } .ok { background-color:rgb(255, 217, 102); } .good { background-color:rgb(147, 196, 125); } @@ -15,7 +18,7 @@ .panel ul { padding:0px; - margin-left:10px; + margin-left:0px; } .habit { @@ -26,6 +29,7 @@ border: 1px solid black; margin-bottom: 5px; padding:5px; + text-shadow:none; } .habit:hover { diff --git a/app/assets/stylesheets/web_app_theme.css b/app/assets/stylesheets/web_app_theme.css new file mode 100644 index 0000000000..2d6c2f05e2 --- /dev/null +++ b/app/assets/stylesheets/web_app_theme.css @@ -0,0 +1,9 @@ +/* + * This css will include all web-app-theme css you need + * + *= require web-app-theme/base + *= require web-app-theme/themes/default/style.css + *= require_self + */ + +/* Write here your css for overriding the theme's rules */ diff --git a/app/views/habits/index.html.erb b/app/views/habits/index.html.erb index cc5ad121b2..612203272c 100644 --- a/app/views/habits/index.html.erb +++ b/app/views/habits/index.html.erb @@ -1,26 +1,40 @@ -

Score: <%= @score %>

+<% content_for :score do %> + Score: <%= @score %> +<% end %> + + <%= link_to 'New Habit', new_habit_path %> - - - -
HabitsDaily
-
    - <% @habits.each do |habit| %> - <%= render :partial => "habit", :locals => { :habit => habit } %> - <% end %> -
+
+
+

Habits

+
+
    + <% @habits.each do |habit| %> + <%= render :partial => "habit", :locals => { :habit => habit } %> + <% end %> +
+
+
+
-
    - <% @daily.each do |habit| %> - <%= render :partial => "habit", :locals => { :habit => habit } %> - <% end %> -
+
+
+

Daily

+
+
    + <% @daily.each do |habit| %> + <%= render :partial => "habit", :locals => { :habit => habit } %> + <% end %> +
+
+
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 47109c2bd2..618e999b3b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,9 +9,43 @@ <%= csrf_meta_tags %> -

<%= notice %>

-

<%= alert %>

-<%= yield %> - +
+ +
+
+ <% flash.each do |type, message| -%> +
+

<%= message %>

+

<%= notice %>

+

<%= alert %>

+
+ <% end -%> +
+
+ <%= yield %> + +
+ +
+