diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 150ac70..0553557 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -170,7 +170,7 @@ a { background-color: $white; border-radius: 15; padding: 15px; - box-shadow: 2px 2px 3px #aaaaaa; + box-shadow: 1px 1px 2px #aaaaaa; .lead { overflow: hidden; @@ -216,4 +216,14 @@ a { .form-inline input { width: auto; +} + +.checkmark { + font-size:1.5em; + color: #419641; +} + +.overdue { + font-weight:bold; + color:#f00; } \ No newline at end of file diff --git a/app/models/project.rb b/app/models/project.rb index da109ea..9479bd2 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -27,9 +27,9 @@ class Project < ActiveRecord::Base def check_date_overdue_output completed, due if completed - "Completed".html_safe + "".html_safe elsif Date.today > due - "Overdue" + "Overdue".html_safe else due end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 84b10b5..e4dd4c2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,15 +18,14 @@
-
- <%= link_to 'New Project', new_project_path %> + New Project +
-
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 834c425..b6f5ee2 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -9,7 +9,7 @@ <% if @active_projects.count > 0 %>

Active (<%= @active_projects.count%>)

- +
@@ -35,7 +35,7 @@ <% if @upcoming_projects.count > 0 %>

Upcoming (<%= @upcoming_projects.count%>)

-
Project
+
@@ -61,7 +61,7 @@ <% if @backlog_projects.count > 0 %>

Backlog (<%= @backlog_projects.count%>)

-
Project
+
@@ -87,7 +87,7 @@ <% if @completed_projects.count > 0 %>

Completed (<%= @completed_projects.count%>)

-
Project
+
Project