From d993be676f8211be809a1dc5160389aa12978b1e Mon Sep 17 00:00:00 2001
From: Aaron Harnly <aharnly@amplify.com>
Date: Sun, 9 Jun 2013 16:01:46 -0400
Subject: [PATCH 1/2] rails: basic app CSS -- navbar and background color

---
 .../app/assets/stylesheets/nycpublic.css.scss | 25 +++++++++++++++++++
 .../app/assets/stylesheets/scaffolds.css.scss |  8 ------
 .../app/views/layouts/_navigation.html.erb    |  2 +-
 3 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 nycpublic_rails/app/assets/stylesheets/nycpublic.css.scss

diff --git a/nycpublic_rails/app/assets/stylesheets/nycpublic.css.scss b/nycpublic_rails/app/assets/stylesheets/nycpublic.css.scss
new file mode 100644
index 0000000..89f1498
--- /dev/null
+++ b/nycpublic_rails/app/assets/stylesheets/nycpublic.css.scss
@@ -0,0 +1,25 @@
+/* Basics */
+body {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  background-color: #eee;
+  color: #222;
+}
+
+.content {
+  background-color: white;
+}
+
+/* Navigation */
+.navbar-inner {
+  background-color: #11aac5;
+  background-image: none;
+  background-repeat: no-repeat;
+  filter: none;
+  background-image: -webkit-linear-gradient(top, #11aac5, #21bad5);
+}
+
+.navbar .brand, .navbar .nav > li > a {
+  text-shadow: none;
+}
diff --git a/nycpublic_rails/app/assets/stylesheets/scaffolds.css.scss b/nycpublic_rails/app/assets/stylesheets/scaffolds.css.scss
index 6ec6a8f..e242bf3 100644
--- a/nycpublic_rails/app/assets/stylesheets/scaffolds.css.scss
+++ b/nycpublic_rails/app/assets/stylesheets/scaffolds.css.scss
@@ -1,11 +1,3 @@
-body {
-  background-color: #fff;
-  color: #333;
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-}
-
 p, ol, ul, td {
   font-family: verdana, arial, helvetica, sans-serif;
   font-size: 13px;
diff --git a/nycpublic_rails/app/views/layouts/_navigation.html.erb b/nycpublic_rails/app/views/layouts/_navigation.html.erb
index 25af46e..c7d71a6 100644
--- a/nycpublic_rails/app/views/layouts/_navigation.html.erb
+++ b/nycpublic_rails/app/views/layouts/_navigation.html.erb
@@ -1,4 +1,4 @@
-<%= link_to "Nycpublic Rails", root_path, :class => 'brand' %>
+<%= link_to "NYCPublic.org", root_path, :class => 'brand' %>
 <ul class="nav">
   <li><%= link_to 'Find Campaign', campaigns_path %></li>
   <% if user_signed_in? %>

From 9c19c23dd3e89a61aa207ac1e39a8f190cd70a57 Mon Sep 17 00:00:00 2001
From: Aaron Harnly <aharnly@amplify.com>
Date: Sun, 9 Jun 2013 17:08:00 -0400
Subject: [PATCH 2/2] 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 @@
-<p id="notice"><%= notice %></p>
+<div class="campaign page row">
+  <div class="campaign frame span12">
+    <div class="campaign inner row">
+      <div class="campaign span9">
+        <h1 class="campaign name"><%= @campaign.name %></h1>
 
-<p>
-  <b>Name:</b>
-  <%= @campaign.name %>
-</p>
+        <div class="campaign dates">
+          <%= @campaign.start_date.to_s(:friendly) %> - <%= @campaign.start_date.to_s(:friendly) %>
+        </div>
 
-<p>
-  <b>Description:</b>
-  <%= @campaign.description %>
-</p>
+        <div class="campaign marquee">
+          <div class="campaign photo">
+            <!-- placeholder for now -->
+            PHOTO PLACEHOLDER
+          </div>
+          <div class="campaign buttons">
+          </div>
+        </div>
 
-<p>
-  <b>Start date:</b>
-  <%= @campaign.start_date %>
-</p>
+        <p id="notice"><%= notice %></p>
 
-<p>
-  <b>End date:</b>
-  <%= @campaign.end_date %>
-</p>
+        <div class="campaign description">
+          <h2>About Us</h2>
+          <%= @campaign.description %>
+        </div>
+        <hr />
 
+      </div>
+      <div class="campaign sidebar span3">
+        <div class="campaign box location">
+          <h2>Location</h2>
+        </div>
+        <div class="campaign box stats">
+          <h2>Stats</h2>
+        </div>
+        <div class="campaign box organizer">
+          <h2>Organizer</h2>
+        </div>
+      </div><!-- end sidebar -->
+    </div>
+  </div>
+</div>
 
-<%= 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")}
+})