Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile

This commit is contained in:
Sarven Capadisli 2009-10-06 15:39:25 +00:00
commit d9ea476cd0
2 changed files with 27 additions and 21 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -88,7 +88,7 @@ color:#333333;
color:#000000;
}
#form_notice label[for=notice_data-attach] {
background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
}
#form_notice #notice_data-attach {
opacity:0;
@ -150,16 +150,18 @@ background-color:#9BB43E;
#export_data li a {
background-repeat:no-repeat;
background-position:0 45%;
}
#export_data li a.rss {
background-image:url(../../base/images/icons/icon_rss.png);
background-image:url(../../base/images/icons/icons-01.png);
background-position:0 -130px;
}
#export_data li a.atom {
background-image:url(../../base/images/icons/icon_atom.png);
background-image:url(../../base/images/icons/icons-01.png);
background-position:0 -64px;
}
#export_data li a.foaf {
background-image:url(../../base/images/icons/icon_foaf.gif);
background-image:url(../../base/images/icons/icons-01.png);
background-position:0 1px;
}
.entity_edit a,
@ -171,7 +173,6 @@ background-image:url(../../base/images/icons/icon_foaf.gif);
.form_group_unblock input.submit,
.entity_nudge p,
.form_make_admin input.submit {
background-position: 0 40%;
background-repeat: no-repeat;
background-color:transparent;
}
@ -189,43 +190,48 @@ background-color:#87B4C8;
}
.entity_edit a {
background-image:url(../../base/images/icons/twotone/green/edit.gif);
background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -718px;
}
.entity_send-a-message a {
background-image:url(../../base/images/icons/twotone/green/quote.gif);
background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -785px;
}
.entity_nudge p,
.form_user_nudge input.submit {
background-image:url(../../base/images/icons/twotone/green/mail.gif);
background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -950px;
}
.form_user_block input.submit,
.form_user_unblock input.submit,
.form_group_block input.submit,
.form_group_unblock input.submit {
background-image:url(../../base/images/icons/twotone/green/shield.gif);
background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -918px;
}
.form_make_admin input.submit {
background-image:url(../../base/images/icons/twotone/green/admin.gif);
background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -983px;
}
/* NOTICES */
.notice .attachment {
background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%;
background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px;
}
#attachments .attachment {
background:none;
}
.notice-options .notice_reply {
background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px;
}
.notice-options form.form_favor input.submit {
background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px;
}
.notice-options form.form_disfavor input.submit {
background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px;
}
.notice-options .notice_delete {
background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px;
}
.notices div.entry-content,
@ -262,7 +268,7 @@ background-color:rgba(200, 200, 200, 0.300);
/*END: NOTICES */
#new_group a {
background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px;
}
.pagination .nav_prev a,
@ -271,10 +277,10 @@ background-repeat:no-repeat;
border-color:#CEE1E9;
}
.pagination .nav_prev a {
background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
background-position:10% 45%;
background-image:url(../../base/images/icons/icons-01.png);
background-position:10% -187px;
}
.pagination .nav_next a {
background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
background-position:90% 45%;
background-image:url(../../base/images/icons/icons-01.png);
background-position:105% -252px;
}