Browse Source

styles up buttons, tidied up logo, made hovers bigger

master
CharlotteGilhooly 12 years ago
parent
commit
4c4eef7f5e
2 changed files with 31 additions and 5 deletions
  1. +30
    -4
      app/assets/stylesheets/scaffolds.css.scss
  2. +1
    -1
      app/views/feeds/_form.html.haml

+ 30
- 4
app/assets/stylesheets/scaffolds.css.scss View File

@@ -24,11 +24,14 @@ a {
color: #00458f; } color: #00458f; }
&:hover { &:hover {
color: #fff; color: #fff;
background-color: #ccc; } }
background-color: #ccc;
padding: 5px 5px;} }


div { div {
&.field, &.actions { &.field, &.actions {
margin-bottom: 30px; margin-bottom: 30px;
font-size: 1.1rem;

} } } }


#notice { #notice {
@@ -77,7 +80,7 @@ ul li {
background-color: #aaa; background-color: #aaa;
color: #fff; color: #fff;
border-radius: 10px; border-radius: 10px;
margin: 30px 0;
font-size: 0.9rem;
} }


a.button, a.button:visited { a.button, a.button:visited {
@@ -85,15 +88,24 @@ a.button, a.button:visited {
text-decoration: none; text-decoration: none;
} }


a.button:hover {
color: #fff;
background-color: #ccc;
padding: 5px 10px;
}

a.logo { a.logo {
float: right; float: right;
margin: 0;
padding: 0;
background-color: white;
} }


#new_feed { #new_feed {
background-color: beige; background-color: beige;
padding: 5px 10px; padding: 5px 10px;
margin: 10px 0;
border-radius: 20px; border-radius: 20px;
margin: 0 0 20px 0;
} }


.feed_title { .feed_title {
@@ -127,7 +139,7 @@ h1 {
font-size: 3.2em; font-size: 3.2em;
font-weight: normal; font-weight: normal;
line-height: 1.2em; line-height: 1.2em;
margin: 20px 0 40px 0;
margin: 20px 0 80px 0;
text-align: left; text-align: left;
} }


@@ -159,3 +171,17 @@ h2 {
table { table {
border-collapse: collapse; border-collapse: collapse;
} }

#feed_feed_url {
font-size: 1.2rem;
width: 600px
}

#submit {
padding: 5px 10px;
color: #fff;
border-radius: 10px;
border: none;
font-size: 0.9rem;

}

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

@@ -15,7 +15,7 @@
.field .field
= f.label "URL" = f.label "URL"
= f.text_field :feed_url, :size => 120 = f.text_field :feed_url, :size => 120
= f.submit 'Save'
= f.submit 'Save', :id => 'submit'
-# -#
.field .field
= f.label :last_fetched = f.label :last_fetched


Loading…
Cancel
Save