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

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
ilya 2010-08-24 16:45:52 -07:00
commit 35e2523b95
4 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/javascripts/rails.js
View file

@ -126,4 +126,4 @@ jQuery(function ($) {
.val(input.data('enable-with')); .val(input.data('enable-with'));
}); });
}); });
}); });

10
public/javascripts/view.js
View file

@ -14,13 +14,10 @@ $(document).ready(function(){
}); });
}); });
$("label").inFieldLabels(); $("label").inFieldLabels();
$('#flash_notice, #flash_error, #flash_alert').delay(2500).slideUp(130); $('#flash_notice, #flash_error, #flash_alert').delay(2500).slideUp(130);
$("#stream li").live('mouseover',function() { $("#stream li").live('mouseover',function() {
$(this).children(".destroy_link").fadeIn(0); $(this).children(".destroy_link").fadeIn(0);
}); });
@ -49,15 +46,14 @@ $(document).ready(function(){
return $(':input',this).clearForm(); return $(':input',this).clearForm();
if (type == 'text' || type == 'password' || tag == 'textarea') if (type == 'text' || type == 'password' || tag == 'textarea')
this.value = ''; this.value = '';
else if (type == 'checkbox' || type == 'radio') //else if (type == 'checkbox' || type == 'radio')
this.checked = false; //this.checked = false;
else if (tag == 'select') else if (tag == 'select')
this.selectedIndex = -1; this.selectedIndex = -1;
$(this).blur(); $(this).blur();
}); });
}; };
$("div.image_cycle").cycle({ $("div.image_cycle").cycle({
fx: 'fade', fx: 'fade',
random: 1, random: 1,

19
public/stylesheets/application.css
View file

@ -440,18 +440,17 @@ h1.big_text {
font-size: 14px; } font-size: 14px; }
#group ul > li { #group ul > li {
display: inline; display: inline;
margin-right: 1.5em; margin-right: 1.5em; }
padding: 0.3em 0.5em; } #group ul > li:hover a {
#group ul > li:hover {
background-color: #333333; } background-color: #333333; }
#group ul > li a { #group ul > li a {
color: #999999; } color: #999999;
#group ul > li a:hover { padding: 0.3em 0.5em; }
background: none; } #group ul .selected a {
#group ul .selected { background-color: white;
background-color: white; } color: black; }
#group ul .selected a { #group ul .selected:hover a {
color: black; } background-color: #eeeeee; }
#friend_pictures img { #friend_pictures img {
height: 40px; } height: 40px; }

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

@ -561,23 +561,25 @@ h1.big_text
:margin :margin
:right 1.5em :right 1.5em
:padding 0.3em 0.5em
&:hover &:hover
:background a
:color #333 :background
:color #333
a a
:color #999 :color #999
:padding 0.3em 0.5em
&:hover
:background none
.selected .selected
:background
:color #fff
a a
:background
:color #fff
:color #000 :color #000
&:hover
a
:background
:color #eee
#friend_pictures #friend_pictures
img img