Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mdb/times_grapher
base: 5b5e5940b8
...
head fork: mdb/times_grapher
compare: 13df99410b
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 52 additions and 2 deletions.
  1. +10 −1 app.rb
  2. +7 −0 views/index.haml
  3. +35 −1 views/stylesheets/base.scss
View
11 app.rb
@@ -5,6 +5,7 @@
require 'Haml'
require 'json'
require 'net/http'
+require 'date'
get '/' do
if params[:search1]
@@ -110,5 +111,13 @@ def format_date(string)
def capitalize(string)
return string.to_s.split(" ").each { |word| word.capitalize! }.join(" ")
- end
+ end
+
+ def footer_class(params)
+ if params && params[:search1]
+ return "has-search"
+ else
+ return "no-search"
+ end
+ end
end
View
7 views/index.haml
@@ -69,3 +69,10 @@
%time= "Published #{format_date(item['date'])}"
%p= "#{item['body']}..."
%div#overlay-mask
+ %footer{:class => "#{footer_class(params)}"}
+ %ul
+ %li
+ © 2012
+ %a{:target => "_blank", :href => "http://mikeball.us"} MDB
+ %li
+ %a{:target => "_blank", :href => "http://github.com/mdb/times_grapher"} Source Code
View
36 views/stylesheets/base.scss
@@ -7,7 +7,8 @@
}
body {
- padding: 10px;
+ height: 100%;
+ padding: 10px 0;
background: $background_color;
font-family: $primary_font_family;
font-size: 16px;
@@ -60,6 +61,7 @@ header {
width: 960px;
margin: 0 auto;
overflow: visible;
+ padding-bottom: 40px;
form {
padding: 30px;
@@ -296,3 +298,35 @@ header {
}
}
}
+
+footer {
+ overflow: hidden;
+ display: block;
+ position: absolute;
+ height: 40px;
+ font-size: 12px;
+ bottom: 0;
+ width: 100%;
+
+ &.has-search {
+ ul {
+ display: none; //temporary fix
+ }
+ }
+
+ ul {
+ border-top: 1px solid $border_color;
+ padding-top: 10px;
+ width: 960px;
+ margin: 0 auto;
+
+ li {
+ float: left;
+ margin-right: 5px;
+
+ a {
+ color: $text_color;
+ }
+ }
+ }
+}

No commit comments for this range

Something went wrong with that request. Please try again.