nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated button style

Browse source
This commit is contained in:
danielvincent 2010-08-06 00:15:22 -07:00
parent c78b111fec
commit c54d47337b
7 changed files with 70 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/albums/index.html.haml
View file

@ -2,8 +2,8 @@
.back .back
= link_to "⇧ home", root_path = link_to "⇧ home", root_path
Albums Albums
.button.right#add_album_button .right#add_album_button
= link_to 'New Album', "#" = link_to 'New Album', "#", :class => "button"
#add_album_box.contextual_pane #add_album_box.contextual_pane
= render "albums/new_album" = render "albums/new_album"

8
app/views/albums/show.html.haml
View file

@ -5,8 +5,8 @@
= @album.name = @album.name
-if mine? @album -if mine? @album
.button.right#add_photos_button .right#add_photos_button
= link_to 'Add Photos', '#' = link_to 'Add Photos', '#', :class => "button"
#add_photo_box.contextual_pane #add_photo_box.contextual_pane
= render "photos/new_photo", :photo => @photo, :album => @album = render "photos/new_photo", :photo => @photo, :album => @album
@ -26,5 +26,5 @@
.back .back
= link_to "⇧ albums", albums_path = link_to "⇧ albums", albums_path
-if mine? @album -if mine? @album
.button.right .right
= link_to 'Edit Album', edit_album_path(@album) = link_to 'Edit Album', edit_album_path(@album), :class => "button"

10
public/javascripts/view.js
View file

@ -21,15 +21,7 @@ $(document).ready(function(){
var show_comments_toggle = $(this).parent().prev().children(".show_post_comments"); var show_comments_toggle = $(this).parent().prev().children(".show_post_comments");
show_comments_toggle.html("hide comments ("+ ($(this).children().length - 1) + ")"); 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_info').click(function() {
$('#debug_more').toggle('fast', function() { $('#debug_more').toggle('fast', function() {

9
public/stylesheets/application.css
View file

@ -12,10 +12,10 @@ body {
a { a {
color: #018790; color: #018790;
text-decoration: none; text-decoration: none; }
font-weight: bold; }
a:hover { a:hover {
color: #018790; } color: white;
background-color: #018790; }
#flash_notice, #flash_notice,
#flash_error, #flash_error,
@ -377,7 +377,8 @@ h1.big_text {
.back { .back {
position: absolute; position: absolute;
font-size: 12px; } font-size: 12px;
font-weight: normal; }
#content_bottom { #content_bottom {
position: relative; position: relative;

6
public/stylesheets/sass/application.sass
View file

@ -13,9 +13,10 @@ a
:color #018790 :color #018790
:text :text
:decoration none :decoration none
:font-weight bold
&:hover &:hover
:color #018790 :color #fff
:background
:color #018790
#flash_notice, #flash_notice,
@ -464,6 +465,7 @@ h1.big_text
:position absolute :position absolute
:font :font
:size 12px :size 12px
:weight normal
#content_bottom #content_bottom
:position relative :position relative

52
public/stylesheets/sass/ui.sass
View file

@ -5,21 +5,22 @@
:display inline :display inline
:color #777 :padding 4px
:font-size 12px :font-size 12px
:line-height 100% :line-height 100%
:text-shadow 0 1px 0 #fff :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 -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FCFCFC), to(#F6F6F6))
:background -moz-linear-gradient(top, #FAFAFA, #E0E0E0) :background -moz-linear-gradient(top, #FCFCFC, #F6F6F6)
:border 1px solid #ccc :border 1px solid #EEE
:bottom 1px solid #666 :bottom 1px solid #999
:left 1px solid #999 :left 1px solid #ccc
:right 1px solid #999 :right 1px solid #ccc
:border-radius 3px :border-radius 3px
:-moz-border-radius 3px :-moz-border-radius 3px
@ -27,28 +28,31 @@
:cursor pointer :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 :font-weight normal
:-webkit-box-shadow 0 1px 1px #ccc
:-moz-box-shadow 0 1px 1px #ccc
a :color #666
:font-weight normal
:color #777
&:hover
.button :color #666
:padding 5px :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FAFAFA), to(#F0F0F0))
:background -moz-linear-gradient(top, #FAFAFA, #F0F0F0)
&:active &:active
:box-shadow 0 0px 2px #000 :color #666
:-webkit-box-shadow 0 0px 2px #000 :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#F0F0F0), to(#FAFAFA))
:-moz-box-shadow 0 0px 2px #000 :background -moz-linear-gradient(top, #F0F0F0, #FAFAFA)
:color #555 :border
:top 1px solid #ccc
ul.button_set ul.button_set
:padding 5px 0 :padding
:left 0
:right 0
> li > li
:padding 5px :padding 5px
@ -75,8 +79,8 @@ ul.button_set
:right none :right none
.button .selected, .button_set .selected .button .selected, .button_set .selected
:background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#E0E0E0), to(#FAFAFA)) :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#F0F0F0), to(#FAFAFA))
:background -moz-linear-gradient(top, #e0e0e0, #fafafa) :background -moz-linear-gradient(top, #F0F0F0, #fafafa)
:border :border
:top 1px solid #aaa :top 1px solid #aaa

51
public/stylesheets/ui.css
View file

@ -2,38 +2,39 @@
font-family: "Lucida Grande", sans-serif; font-family: "Lucida Grande", sans-serif;
font-style: normal; font-style: normal;
display: inline; display: inline;
color: #777777; padding: 4px;
font-size: 12px; font-size: 12px;
line-height: 100%; line-height: 100%;
text-shadow: 0 1px 0 white; text-shadow: 0 1px 0 white;
min-height: 14px; min-height: 10px;
background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#fafafa), to(#e0e0e0)); background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#fcfcfc), to(#f6f6f6));
background: -moz-linear-gradient(top, #fafafa, #e0e0e0); background: -moz-linear-gradient(top, #fcfcfc, #f6f6f6);
border: 1px solid #cccccc; border: 1px solid #eeeeee;
border-bottom: 1px solid #666666; border-bottom: 1px solid #999999;
border-left: 1px solid #999999; border-left: 1px solid #cccccc;
border-right: 1px solid #999999; border-right: 1px solid #cccccc;
border-radius: 3px; border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
cursor: pointer; cursor: pointer;
box-shadow: 0 1px 1px #cccccc; box-shadow: 0 1px 1px #eeeeee;
-webkit-box-shadow: 0 1px 1px #cccccc; -webkit-box-shadow: 0 1px 1px #eeeeee;
-moz-box-shadow: 0 1px 1px #cccccc; } -moz-box-shadow: 0 1px 1px #eeeeee;
.button a, .button_set a { font-weight: normal;
font-weight: normal; color: #666666; }
color: #777777; } .button:hover, .button_set:hover {
color: #666666;
.button { background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#fafafa), to(#f0f0f0));
padding: 5px; } background: -moz-linear-gradient(top, #fafafa, #f0f0f0); }
.button:active { .button:active, .button_set:active {
box-shadow: 0 0px 2px black; color: #666666;
-webkit-box-shadow: 0 0px 2px black; background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#f0f0f0), to(#fafafa));
-moz-box-shadow: 0 0px 2px black; background: -moz-linear-gradient(top, #f0f0f0, #fafafa);
color: #555555; } border-top: 1px solid #cccccc; }
ul.button_set { ul.button_set {
padding: 5px 0; } padding-left: 0;
padding-right: 0; }
ul.button_set > li { ul.button_set > li {
padding: 5px; padding: 5px;
display: inline; display: inline;
@ -50,8 +51,8 @@ ul.button_set {
border-right: none; } border-right: none; }
.button .selected, .button_set .selected { .button .selected, .button_set .selected {
background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#e0e0e0), to(#fafafa)); background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#f0f0f0), to(#fafafa));
background: -moz-linear-gradient(top, #e0e0e0, #fafafa); background: -moz-linear-gradient(top, #f0f0f0, #fafafa);
border-top: 1px solid #aaaaaa; } border-top: 1px solid #aaaaaa; }
.right { .right {