Browse Source

changed margins and padding

master
CharlotteGilhooly 12 years ago
parent
commit
ce059e2f1e
2 changed files with 18 additions and 7 deletions
  1. +16
    -3
      app/assets/stylesheets/scaffolds.css.scss
  2. +2
    -4
      app/views/feeds/show.html.haml

+ 16
- 3
app/assets/stylesheets/scaffolds.css.scss View File

@@ -104,7 +104,6 @@ background-color: white;
background-color: beige; background-color: beige;
padding: 5px 10px; padding: 5px 10px;
border-radius: 20px; border-radius: 20px;
margin: 0 0 20px 0;
} }


.feed_title a { .feed_title a {
@@ -115,6 +114,11 @@ background-color: white;
table { table {
margin: 40px 0; margin: 40px 0;
border-collapse: collapse; border-collapse: collapse;

}

table#feed {
margin: 70px 0 0 0;
} }


td { td {
@@ -122,10 +126,15 @@ td {
/* background-color: #bbb; */ /* background-color: #bbb; */
} }


td a {
#feed td {
font-size: 1.5rem; font-size: 1.5rem;
line-height: 1.5rem; line-height: 1.5rem;
/* background-color: aqua; */
padding: 0 70px 30px 0;
}


#feed td:last-child {
padding-right: 0;
} }


td:last-child { td:last-child {
@@ -147,10 +156,14 @@ h1 {
font-size: 3.0rem; font-size: 3.0rem;
font-weight: normal; font-weight: normal;
line-height: 3.5rem; line-height: 3.5rem;
margin: 0 0 80px 0;
/* margin: 0 0 80px 0; */
text-align: left; text-align: left;
} }


h1, a {
margin: 0 0 60px 0;
}

h2 { h2 {
font-size: 2.0rem; font-size: 2.0rem;
font-weight: normal; font-weight: normal;


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

@@ -9,9 +9,7 @@
Validate Validate


%p %p
= pluralize(@feed.posts.count, "post")

%p
= pluralize(@feed.posts.count, "post")
= link_to @feed.feed_url, @feed.feed_url = link_to @feed.feed_url, @feed.feed_url


%p %p
@@ -22,7 +20,7 @@
= time_ago_in_words @feed.last_fetched = time_ago_in_words @feed.last_fetched
ago ago


%table
%table#feed
- @feed.posts.each do |p| - @feed.posts.each do |p|
%tr %tr
%td= link_to p.title, p.url %td= link_to p.title, p.url


Loading…
Cancel
Save