Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Twitter button and better page title

  • Loading branch information...
commit 4d626c8f6f967ee9c9fc12a54dd3e3d4da03771c 1 parent f41c562
@robertmilner authored
View
BIN  app/assets/images/heart_black.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/heart_red.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/twitter-bird-red.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/twitter-bird.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
35 app/assets/images/twitter-bird.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="92px" height="92px" viewBox="84 -13 92 92" overflow="visible" enable-background="new 84 -13 92 92"
+ xml:space="preserve">
+<defs>
+</defs>
+<rect y="7" display="none" fill="#BD3B36" width="165" height="55"/>
+<path fill="#A53430" d="M173.508,33.676c-3.064,0.521-7.506-0.023-9.857-1.002c4.891-0.404,8.201-2.629,9.477-5.645
+ c-1.764,1.084-7.236,2.266-10.256,1.141c-0.15-0.709-0.314-1.383-0.479-1.996c-2.299-8.463-10.188-15.281-18.443-14.459
+ c0.662-0.268,1.34-0.518,2.023-0.748c0.902-0.326,6.24-1.197,5.404-3.078c-0.715-1.658-7.234,1.248-8.459,1.629
+ c1.617-0.604,4.301-1.654,4.584-3.518c-2.48,0.34-4.916,1.514-6.797,3.223c0.678-0.732,1.195-1.623,1.305-2.584
+ c-6.625,4.234-10.49,12.768-13.617,21.051c-2.457-2.389-4.643-4.268-6.594-5.312c-5.482-2.938-12.037-6.008-22.325-9.83
+ c-0.318,3.408,1.684,7.939,7.44,10.949c-1.246-0.168-3.528,0.207-5.348,0.639c0.74,3.91,3.168,7.129,9.743,8.68
+ c-3.006,0.197-4.559,0.887-5.965,2.357c1.369,2.715,4.711,5.91,10.711,5.254c-6.678,2.883-2.723,8.219,2.711,7.42
+ c-9.268,9.586-23.879,8.879-32.274,0.863c21.909,29.886,69.538,17.672,76.631-11.111C168.447,37.641,171.57,35.756,173.508,33.676
+ L173.508,33.676z"/>
+<g>
+ <g>
+ <path fill="#FFFFFF" d="M151.754,30.338c-1.531,0.261-3.752-0.011-4.929-0.5c2.445-0.203,4.101-1.314,4.738-2.822
+ c-0.881,0.542-3.618,1.133-5.127,0.57c-0.075-0.355-0.157-0.693-0.24-0.999c-1.149-4.23-5.093-7.64-9.221-7.228
+ c0.333-0.136,0.671-0.261,1.012-0.375c0.452-0.163,3.12-0.599,2.701-1.539c-0.355-0.83-3.615,0.624-4.229,0.814
+ c0.811-0.304,2.15-0.827,2.293-1.76c-1.241,0.17-2.459,0.758-3.4,1.611c0.341-0.365,0.599-0.812,0.652-1.292
+ c-3.311,2.118-5.244,6.384-6.809,10.524c-1.229-1.192-2.32-2.131-3.296-2.654c-2.74-1.469-6.018-3.004-11.161-4.916
+ c-0.158,1.703,0.842,3.97,3.719,5.475c-0.622-0.084-1.763,0.104-2.673,0.321c0.37,1.953,1.584,3.562,4.87,4.338
+ c-1.502,0.099-2.279,0.443-2.981,1.179c0.684,1.357,2.354,2.955,5.355,2.626c-3.34,1.441-1.362,4.109,1.355,3.712
+ c-4.633,4.792-11.94,4.438-16.136,0.432c10.953,14.941,34.767,8.835,38.313-5.557C149.224,32.322,150.785,31.378,151.754,30.338
+ L151.754,30.338z"/>
+ </g>
+</g>
+</svg>
View
BIN  app/assets/images/twitter.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
3  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;
View
13 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 {
}
}
}
-}
+}
+
View
15 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;
+ }
+ }
+ }
}
View
2  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
View
5 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
View
1  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>
Please sign in to comment.
Something went wrong with that request. Please try again.