Twitter button and better page title

robertmilner · Mar 27, 2012 · 4d626c8 · 4d626c8
1 parent f41c562
commit 4d626c8
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 3 deletions.
diff --git a/app/assets/images/heart_black.png b/app/assets/images/heart_black.png
diff --git a/app/assets/images/heart_red.png b/app/assets/images/heart_red.png
diff --git a/app/assets/images/twitter-bird-red.png b/app/assets/images/twitter-bird-red.png
diff --git a/app/assets/images/twitter-bird.png b/app/assets/images/twitter-bird.png
diff --git a/app/assets/images/twitter-bird.svg b/app/assets/images/twitter-bird.svg
diff --git a/app/assets/images/twitter.png b/app/assets/images/twitter.png
diff --git a/app/assets/stylesheets/alert.css.scss b/app/assets/stylesheets/alert.css.scss
@@ -1,5 +1,6 @@
 .alert {
-  padding: 8px 35px 8px 14px;
+  // padding: 8px 35px 8px 14px;
+  padding: 2px 35px 2px 14px;
   margin-bottom: 18px;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
   background-color: #fcf8e3;

diff --git a/app/assets/stylesheets/global/header.css.scss b/app/assets/stylesheets/global/header.css.scss
@@ -39,6 +39,7 @@ header {
 		margin: 5px 2%;
 		li {
 			float: left;
+			@include text_shadow(0, 2px, 0, $red);
 			a.btn {
 				font-size: 13px;
 				height: 26px;
@@ -51,6 +52,15 @@ header {
 					@include box_shadow_inset(0, 0, 2px, 1px, rgba(0, 0, 0, 0.2));
 				}
 			}
+			a.btn-twitter-bird {
+				text-transform: uppercase;
+				font-size: 11px;
+				padding-right: 40px;
+				background-image: url('/assets/twitter-bird-red.png');
+				background-size: 30px 30px;
+				background-repeat: no-repeat;
+				background-position: 90% center;
+			}
 			a.btn-write {
 				height: 24px;
 				width: 24px;
@@ -66,4 +76,5 @@ header {
 			}
 		}
 	}
-}
+}
+
diff --git a/app/assets/stylesheets/responsive.css.scss b/app/assets/stylesheets/responsive.css.scss
@@ -50,4 +50,19 @@
 		}
 	}
 
+}
+header {
+	ul {
+		li {
+			a.btn {
+				font-size: 10px;
+				line-height: 25px;
+				margin: 0 6px;
+			}
+			a.btn-twitter-bird {
+				padding-right: 30px;
+				background-size: 22px 22px;
+			}
+		}
+	}
 }
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -6,6 +6,8 @@ def full_title(page_title)
     base_title = "Oh, Excuses"
     if page_title.empty?
       base_title
+    elsif page_title == base_title
+      "#{base_title} | An Excuse Generator"
     else
       "#{page_title} | #{base_title}"
     end

diff --git a/app/views/pages/_header.html.haml b/app/views/pages/_header.html.haml
@@ -6,4 +6,7 @@
 			%li= link_to "", new_excuse_path, :title => "Write an excuse", :class => "btn btn-write"
 	- else
 		%ul
-			%li= link_to "Login", login_path, :title => "Login to your excuse", :class => "btn"
+			%li
+				%a{ http: "http://twitter.com/ohexcuses", title: "Follow on Twitter", class: "btn btn-twitter-bird" }
+					Follow
+					%span
diff --git a/app/views/pages/_robert.html.erb b/app/views/pages/_robert.html.erb
@@ -268,6 +268,7 @@
 						<li class="tag"><a href="/tag/Robert" rel="tag">Robert</a></li>
 						<li class="tag"><a href="/tag/Work" rel="tag">Play</a></li>
 						<li class="tag"><a href="/tag/Bob" rel="tag">Bob</a></li>
+						<li class="tag"><a href="/tag/equal" rel="tag">&#61;</a></li>
 						<li class="tag"><a href="/tag/Bob the Builder" rel="tag">Bob the Builder</a></li>
 					</ul>
 				</div>