diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index 8f3816f3d20f888868222ee4194bd79db9e46662..2e47295d683bc9542afe6fdb07bf2d49a9b0758b 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -2,8 +2,8 @@
.back
= link_to "⇧ home", root_path
Albums
- .button.right#add_album_button
- = link_to 'New Album', "#"
+ .right#add_album_button
+ = link_to 'New Album', "#", :class => "button"
#add_album_box.contextual_pane
= render "albums/new_album"
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 253d94d19792b666ba909a39765d8bf6cf03c21e..208c3ae2baa0faeffcd491752679617b22a52ab3 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -5,8 +5,8 @@
= @album.name
-if mine? @album
- .button.right#add_photos_button
- = link_to 'Add Photos', '#'
+ .right#add_photos_button
+ = link_to 'Add Photos', '#', :class => "button"
#add_photo_box.contextual_pane
= render "photos/new_photo", :photo => @photo, :album => @album
@@ -26,5 +26,5 @@
.back
= link_to "⇧ albums", albums_path
-if mine? @album
- .button.right
- = link_to 'Edit Album', edit_album_path(@album)
+ .right
+ = link_to 'Edit Album', edit_album_path(@album), :class => "button"
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 5da7a9f9e6bb8ef3a6be76d8f59c00bade700bf9..5e0f2ef51f577fca3aa089bb1a1d2deac60fde68 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -21,15 +21,7 @@ $(document).ready(function(){
var show_comments_toggle = $(this).parent().prev().children(".show_post_comments");
show_comments_toggle.html("hide comments ("+ ($(this).children().length - 1) + ")");
};
- });
-
- $('a').hover(function(){
- if( $(this).children("img").length < 1 )
- $(this).fadeTo(60, 0.5);
- }, function(){
- if( $(this).children("img").length < 1 )
- $(this).fadeTo(80, 1);
- });
+ });
$('#debug_info').click(function() {
$('#debug_more').toggle('fast', function() {
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 929192e13e1ccbd44a117b8acc12e503bc6016cb..6710c853d0daec06e1bb7f3e392e800c8bd4480d 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -12,10 +12,10 @@ body {
a {
color: #018790;
- text-decoration: none;
- font-weight: bold; }
+ text-decoration: none; }
a:hover {
- color: #018790; }
+ color: white;
+ background-color: #018790; }
#flash_notice,
#flash_error,
@@ -377,7 +377,8 @@ h1.big_text {
.back {
position: absolute;
- font-size: 12px; }
+ font-size: 12px;
+ font-weight: normal; }
#content_bottom {
position: relative;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 6b7bc131738628b6fd44b40046ad31e2929cff53..223080f2d6d45097e80a8a41103df4faf86f7876 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -13,9 +13,10 @@ a
:color #018790
:text
:decoration none
- :font-weight bold
&:hover
- :color #018790
+ :color #fff
+ :background
+ :color #018790
#flash_notice,
@@ -464,6 +465,7 @@ h1.big_text
:position absolute
:font
:size 12px
+ :weight normal
#content_bottom
:position relative
diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass
index 50000a8d3b27af930231adce67ce8d766d80699e..7a64e4ce6739c3b84206d6193c7542b0a712c527 100644
--- a/public/stylesheets/sass/ui.sass
+++ b/public/stylesheets/sass/ui.sass
@@ -5,21 +5,22 @@
:display inline
- :color #777
+ :padding 4px
+
:font-size 12px
:line-height 100%
:text-shadow 0 1px 0 #fff
- :min-height 14px
+ :min-height 10px
- :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FAFAFA), to(#E0E0E0))
- :background -moz-linear-gradient(top, #FAFAFA, #E0E0E0)
+ :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FCFCFC), to(#F6F6F6))
+ :background -moz-linear-gradient(top, #FCFCFC, #F6F6F6)
- :border 1px solid #ccc
- :bottom 1px solid #666
- :left 1px solid #999
- :right 1px solid #999
+ :border 1px solid #EEE
+ :bottom 1px solid #999
+ :left 1px solid #ccc
+ :right 1px solid #ccc
:border-radius 3px
:-moz-border-radius 3px
@@ -27,28 +28,31 @@
:cursor pointer
+ :box-shadow 0 1px 1px #eee
+ :-webkit-box-shadow 0 1px 1px #eee
+ :-moz-box-shadow 0 1px 1px #eee
- :box-shadow 0 1px 1px #ccc
- :-webkit-box-shadow 0 1px 1px #ccc
- :-moz-box-shadow 0 1px 1px #ccc
-
- a
- :font-weight normal
- :color #777
+ :font-weight normal
+ :color #666
-.button
- :padding 5px
+ &:hover
+ :color #666
+ :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FAFAFA), to(#F0F0F0))
+ :background -moz-linear-gradient(top, #FAFAFA, #F0F0F0)
&:active
- :box-shadow 0 0px 2px #000
- :-webkit-box-shadow 0 0px 2px #000
- :-moz-box-shadow 0 0px 2px #000
- :color #555
+ :color #666
+ :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#F0F0F0), to(#FAFAFA))
+ :background -moz-linear-gradient(top, #F0F0F0, #FAFAFA)
+ :border
+ :top 1px solid #ccc
ul.button_set
- :padding 5px 0
+ :padding
+ :left 0
+ :right 0
> li
:padding 5px
@@ -75,8 +79,8 @@ ul.button_set
:right none
.button .selected, .button_set .selected
- :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#E0E0E0), to(#FAFAFA))
- :background -moz-linear-gradient(top, #e0e0e0, #fafafa)
+ :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#F0F0F0), to(#FAFAFA))
+ :background -moz-linear-gradient(top, #F0F0F0, #fafafa)
:border
:top 1px solid #aaa
diff --git a/public/stylesheets/ui.css b/public/stylesheets/ui.css
index 63c8dc0cccd78c40ce087a1282e4c92e2e44f3f7..f83cc79578c12525b4fccaa0b9b1d1d042c4daa4 100644
--- a/public/stylesheets/ui.css
+++ b/public/stylesheets/ui.css
@@ -2,38 +2,39 @@
font-family: "Lucida Grande", sans-serif;
font-style: normal;
display: inline;
- color: #777777;
+ padding: 4px;
font-size: 12px;
line-height: 100%;
text-shadow: 0 1px 0 white;
- min-height: 14px;
- background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#fafafa), to(#e0e0e0));
- background: -moz-linear-gradient(top, #fafafa, #e0e0e0);
- border: 1px solid #cccccc;
- border-bottom: 1px solid #666666;
- border-left: 1px solid #999999;
- border-right: 1px solid #999999;
+ min-height: 10px;
+ background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#fcfcfc), to(#f6f6f6));
+ background: -moz-linear-gradient(top, #fcfcfc, #f6f6f6);
+ border: 1px solid #eeeeee;
+ border-bottom: 1px solid #999999;
+ border-left: 1px solid #cccccc;
+ border-right: 1px solid #cccccc;
border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
cursor: pointer;
- box-shadow: 0 1px 1px #cccccc;
- -webkit-box-shadow: 0 1px 1px #cccccc;
- -moz-box-shadow: 0 1px 1px #cccccc; }
- .button a, .button_set a {
- font-weight: normal;
- color: #777777; }
-
-.button {
- padding: 5px; }
- .button:active {
- box-shadow: 0 0px 2px black;
- -webkit-box-shadow: 0 0px 2px black;
- -moz-box-shadow: 0 0px 2px black;
- color: #555555; }
+ box-shadow: 0 1px 1px #eeeeee;
+ -webkit-box-shadow: 0 1px 1px #eeeeee;
+ -moz-box-shadow: 0 1px 1px #eeeeee;
+ font-weight: normal;
+ color: #666666; }
+ .button:hover, .button_set:hover {
+ color: #666666;
+ background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#fafafa), to(#f0f0f0));
+ background: -moz-linear-gradient(top, #fafafa, #f0f0f0); }
+ .button:active, .button_set:active {
+ color: #666666;
+ background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#f0f0f0), to(#fafafa));
+ background: -moz-linear-gradient(top, #f0f0f0, #fafafa);
+ border-top: 1px solid #cccccc; }
ul.button_set {
- padding: 5px 0; }
+ padding-left: 0;
+ padding-right: 0; }
ul.button_set > li {
padding: 5px;
display: inline;
@@ -50,8 +51,8 @@ ul.button_set {
border-right: none; }
.button .selected, .button_set .selected {
- background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#e0e0e0), to(#fafafa));
- background: -moz-linear-gradient(top, #e0e0e0, #fafafa);
+ background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#f0f0f0), to(#fafafa));
+ background: -moz-linear-gradient(top, #f0f0f0, #fafafa);
border-top: 1px solid #aaaaaa; }
.right {