small color changes

This commit is contained in:
danielvincent 2010-08-06 00:40:44 -07:00
parent c54d47337b
commit 6f1a596dff
6 changed files with 25 additions and 19 deletions

View file

@ -17,5 +17,5 @@
#content_bottom #content_bottom
.back .back
= link_to "⇧ ostatus", ostatus_path = link_to "⇧ ostatus", ostatus_path
.button.right .right
= link_to 'Unsubscribe', @author, :confirm => 'Are you sure?', :method => :delete = link_to 'Unsubscribe', @author, :confirm => 'Are you sure?', :method => :delete, :class => "button"

View file

@ -3,8 +3,8 @@
= link_to "⇧ #{@album.name}", album_path(@album) = link_to "⇧ #{@album.name}", album_path(@album)
= @photo.image = @photo.image
.button.right .right
= link_to 'Edit Photo', edit_photo_path(@photo) = link_to 'Edit Photo', edit_photo_path(@photo), :class => "button"
.sub_header .sub_header
= link_to "full size", @photo.image.url = link_to "full size", @photo.image.url
@ -23,8 +23,8 @@
.back .back
= link_to "⇧ #{@album.name}", album_path(@album) = link_to "⇧ #{@album.name}", album_path(@album)
-if mine? @album -if mine? @album
.button.right .right
= link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete, :class => "button"
%h4{:class => "show_post_comments"} %h4{:class => "show_post_comments"}
= "comments (#{@photo.comments.count})" = "comments (#{@photo.comments.count})"

View file

@ -14,4 +14,4 @@
- if mine?(post) - if mine?(post)
.destroy_link .destroy_link
= link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "delete"

View file

@ -107,5 +107,8 @@ $(document).ready(function(){
$(this).fadeIn("slow"); $(this).fadeIn("slow");
}); });
$(".delete").hover(function(){
$(this).toggleClass("button");
});
});//end document ready });//end document ready

View file

@ -12,10 +12,12 @@ body {
a { a {
color: #018790; color: #018790;
color: #556270;
text-decoration: none; } text-decoration: none; }
a:hover { a:hover {
color: white; color: white;
background-color: #018790; } background-color: #018790;
background-color: #556270; }
#flash_notice, #flash_notice,
#flash_error, #flash_error,
@ -107,13 +109,12 @@ header {
ul#stream, ul#friend_stream { ul#stream, ul#friend_stream {
margin: 0; margin: 0;
padding: 0; padding: 0; }
color: #666666; }
ul#stream > li, ul#friend_stream > li { ul#stream > li, ul#friend_stream > li {
list-style: none; list-style: none;
padding: 15px 0; padding: 15px 0;
border-bottom: 1px solid #f1f1f1; margin-bottom: 5px;
margin-bottom: 5px; } border-bottom: 1px solid #eeeeee; }
ul#friend_stream > li { ul#friend_stream > li {
padding: 0.2em 0; } padding: 0.2em 0; }
@ -295,7 +296,8 @@ label {
color: #999999; color: #999999;
position: absolute; position: absolute;
top: 3px; top: 3px;
left: 0.48em; } left: 0.48em;
font-weight: normal; }
#publisher { #publisher {
background-color: rgba(10, 81, 109, 0.05); background-color: rgba(10, 81, 109, 0.05);
@ -367,7 +369,6 @@ ul#publisher_content_pickers li {
h1.big_text { h1.big_text {
position: relative; position: relative;
line-height: auto; line-height: auto;
border-top: 2px solid #666666;
border-bottom: 1px solid #666666; border-bottom: 1px solid #666666;
text-align: center; } text-align: center; }

View file

@ -11,13 +11,14 @@ body
:margin 0 :margin 0
a a
:color #018790 :color #018790
:color #556270
:text :text
:decoration none :decoration none
&:hover &:hover
:color #fff :color #fff
:background :background
:color #018790 :color #018790
:color #556270
#flash_notice, #flash_notice,
#flash_error, #flash_error,
@ -121,13 +122,12 @@ header
ul#stream, ul#friend_stream ul#stream, ul#friend_stream
:margin 0 :margin 0
:padding 0 :padding 0
:color #666
> li > li
:list-style none :list-style none
:padding 15px 0 :padding 15px 0
:border
:bottom 1px solid #f1f1f1
:margin-bottom 5px :margin-bottom 5px
:border
:bottom 1px solid #eee
ul#friend_stream ul#friend_stream
> li > li
@ -356,6 +356,8 @@ label
:position absolute :position absolute
:top 3px :top 3px
:left 0.48em :left 0.48em
:font
:weight normal
#publisher #publisher
:background :background
@ -451,7 +453,7 @@ h1.big_text
:position relative :position relative
:line-height auto :line-height auto
:border :border
:top 2px solid #666 //:top 2px solid #666
:bottom 1px solid #666 :bottom 1px solid #666
:text :text
:align center :align center