Browse Source

Design and layout improvements

master
Adrian Short 12 years ago
parent
commit
ab08892118
4 changed files with 50 additions and 9 deletions
  1. +41
    -2
      app/assets/stylesheets/scaffolds.css.scss
  2. +7
    -5
      app/views/feeds/index.html.haml
  3. +1
    -1
      app/views/feeds/show.html.haml
  4. +1
    -1
      app/views/layouts/application.html.haml

+ 41
- 2
app/assets/stylesheets/scaffolds.css.scss View File

@@ -5,7 +5,7 @@ body {
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
width: 800px; width: 800px;
margin: 30px auto;
margin: 60px auto;
} }


p, ol, ul, td { p, ol, ul, td {
@@ -18,7 +18,8 @@ pre {
font-size: 11px; } font-size: 11px; }


a { a {
color: #000;
color: blue;
text-decoration: none;
&:visited { &:visited {
color: #666; } color: #666; }
&:hover { &:hover {
@@ -74,4 +75,42 @@ a.button, a.button:visited {
background-color: beige; background-color: beige;
padding: 5px 10px; padding: 5px 10px;
margin: 10px 0; margin: 10px 0;
border-radius: 20px;
}

.feed_title {
font-size: 2.0em;
}

table {
margin: 40px 0;
}

td {
padding: 0 20px 20px 0;
background-color: #fff;
}

th {
padding: 0 20px 10px 0;
text-align: left;
}

.right {
text-align: right;
}

h1 {
font-size: 3.2em;
font-weight: normal;
margin: 10px 0 40px 0;
}

h2 {
font-size: 2.3em;
font-weight: normal;
}

.logo {
float: right;
} }

+ 7
- 5
app/views/feeds/index.html.haml View File

@@ -4,8 +4,7 @@


%table %table
%tr %tr
%th Title
%th Feed URL
%th
%th Posts %th Posts
%th Fetched %th Fetched
%th %th
@@ -15,9 +14,12 @@


- @feeds.each do |f| - @feeds.each do |f|
%tr %tr
%td= link_to f.title, f
%td= link_to f.feed_url, f.feed_url
%td= f.posts.size
%td
.feed_title
= link_to f.title, f
%br
=# link_to f.feed_url, f.feed_url
%td.right= f.posts.size
%td %td
- if f.last_fetched.nil? - if f.last_fetched.nil?
never never


+ 1
- 1
app/views/feeds/show.html.haml View File

@@ -24,7 +24,7 @@
%td= link_to p.title, p.url %td= link_to p.title, p.url
%td= p.loc['lat'] %td= p.loc['lat']
%td= p.loc['lng'] %td= p.loc['lng']
%td= p.published
%td= p.published.strftime("%d %b %Y %H:%M")


= link_to 'Edit', edit_feed_path(@feed) = link_to 'Edit', edit_feed_path(@feed)
\| \|


+ 1
- 1
app/views/layouts/application.html.haml View File

@@ -8,7 +8,7 @@


%body %body
= link_to(image_tag("TAL_logo_blue-h100.png", :size => "275x100", :alt => "Talk About Local logo"), :root)
= link_to(image_tag("TAL_logo_blue-h100.png", :size => "275x100", :alt => "Talk About Local logo"), :root, :class => "logo")
%p#notice= notice %p#notice= notice


Loading…
Cancel
Save