From 9c19c23dd3e89a61aa207ac1e39a8f190cd70a57 Mon Sep 17 00:00:00 2001 From: Aaron Harnly Date: Sun, 9 Jun 2013 17:08:00 -0400 Subject: [PATCH] rails: basic campaign page CSS --- .../app/assets/stylesheets/nycpublic.css.scss | 29 +++++++++- .../app/views/campaigns/show.html.erb | 58 +++++++++++++------ .../config/initializers/date_formats.rb | 3 + 3 files changed, 70 insertions(+), 20 deletions(-) create mode 100644 nycpublic_rails/config/initializers/date_formats.rb diff --git a/nycpublic_rails/app/assets/stylesheets/nycpublic.css.scss b/nycpublic_rails/app/assets/stylesheets/nycpublic.css.scss index 89f1498..cfad8a7 100644 --- a/nycpublic_rails/app/assets/stylesheets/nycpublic.css.scss +++ b/nycpublic_rails/app/assets/stylesheets/nycpublic.css.scss @@ -1,6 +1,6 @@ /* Basics */ body { - font-family: verdana, arial, helvetica, sans-serif; + font-family: Arial, helvetica, sans-serif; font-size: 13px; line-height: 18px; background-color: #eee; @@ -23,3 +23,30 @@ body { .navbar .brand, .navbar .nav > li > a { text-shadow: none; } + +/* Campaigns */ +.campaign h1, h2 { + font-weight: normal; +} +.campaign h1.name { + color: black; + font-size: 3em; +} + +.campaign h2 { + color: #666; + font-size: 1.5em; +} + +.campaign.box h2 { + background-color: #ddd; + padding-left: 1em; +} + +div.campaign.photo { + width: 100%; + background-color: #ddd; + height: 200px; + text-align: center; +} + diff --git a/nycpublic_rails/app/views/campaigns/show.html.erb b/nycpublic_rails/app/views/campaigns/show.html.erb index 1f457d4..6618178 100644 --- a/nycpublic_rails/app/views/campaigns/show.html.erb +++ b/nycpublic_rails/app/views/campaigns/show.html.erb @@ -1,25 +1,45 @@ -

<%= notice %>

+
+
+
+
+

<%= @campaign.name %>

-

- Name: - <%= @campaign.name %> -

+
+ <%= @campaign.start_date.to_s(:friendly) %> - <%= @campaign.start_date.to_s(:friendly) %> +
-

- Description: - <%= @campaign.description %> -

+
+
+ + PHOTO PLACEHOLDER +
+
+
+
-

- Start date: - <%= @campaign.start_date %> -

+

<%= notice %>

-

- End date: - <%= @campaign.end_date %> -

+
+

About Us

+ <%= @campaign.description %> +
+
+
+ +
+
+
-<%= link_to 'Edit', edit_campaign_path(@campaign) %> | -<%= link_to 'Back', campaigns_path %> + +<%= link_to 'Edit', edit_campaign_path(@campaign) %> diff --git a/nycpublic_rails/config/initializers/date_formats.rb b/nycpublic_rails/config/initializers/date_formats.rb new file mode 100644 index 0000000..0a3dc30 --- /dev/null +++ b/nycpublic_rails/config/initializers/date_formats.rb @@ -0,0 +1,3 @@ +Date::DATE_FORMATS.merge!({ + :friendly => lambda {|date| date.strftime("%B #{date.day.ordinalize}, %Y")} +})