forked from GNUsocial/gnu-social
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
This commit is contained in:
commit
3f27f3138e
@ -25,6 +25,8 @@ RealtimeUpdate = {
|
|||||||
'border-top-color':'#AAAAAA',
|
'border-top-color':'#AAAAAA',
|
||||||
'border-top-style':'solid'
|
'border-top-style':'solid'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
return false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -468,16 +468,15 @@ margin-bottom:7px;
|
|||||||
#form_notice #notice_data-attach {
|
#form_notice #notice_data-attach {
|
||||||
position:absolute;
|
position:absolute;
|
||||||
top:25px;
|
top:25px;
|
||||||
|
right:10.5%;
|
||||||
cursor:pointer;
|
cursor:pointer;
|
||||||
}
|
}
|
||||||
#form_notice label[for=notice_data-attach] {
|
#form_notice label[for=notice_data-attach] {
|
||||||
text-indent:-9999px;
|
text-indent:-9999px;
|
||||||
left:86%;
|
|
||||||
width:16px;
|
width:16px;
|
||||||
height:16px;
|
height:16px;
|
||||||
}
|
}
|
||||||
#form_notice #notice_data-attach {
|
#form_notice #notice_data-attach {
|
||||||
left:40.6%;
|
|
||||||
padding:0;
|
padding:0;
|
||||||
height:16px;
|
height:16px;
|
||||||
}
|
}
|
||||||
|
BIN
theme/base/images/icons/icons-01.png
Normal file
BIN
theme/base/images/icons/icons-01.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.2 KiB |
@ -88,7 +88,7 @@ color:#333333;
|
|||||||
color:#000000;
|
color:#000000;
|
||||||
}
|
}
|
||||||
#form_notice label[for=notice_data-attach] {
|
#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 {
|
#form_notice #notice_data-attach {
|
||||||
opacity:0;
|
opacity:0;
|
||||||
@ -150,16 +150,18 @@ background-color:#9BB43E;
|
|||||||
|
|
||||||
#export_data li a {
|
#export_data li a {
|
||||||
background-repeat:no-repeat;
|
background-repeat:no-repeat;
|
||||||
background-position:0 45%;
|
|
||||||
}
|
}
|
||||||
#export_data li a.rss {
|
#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 {
|
#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 {
|
#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,
|
.entity_edit a,
|
||||||
@ -171,7 +173,6 @@ background-image:url(../../base/images/icons/icon_foaf.gif);
|
|||||||
.form_group_unblock input.submit,
|
.form_group_unblock input.submit,
|
||||||
.entity_nudge p,
|
.entity_nudge p,
|
||||||
.form_make_admin input.submit {
|
.form_make_admin input.submit {
|
||||||
background-position: 0 40%;
|
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-color:transparent;
|
background-color:transparent;
|
||||||
}
|
}
|
||||||
@ -189,43 +190,48 @@ background-color:#87B4C8;
|
|||||||
}
|
}
|
||||||
|
|
||||||
.entity_edit a {
|
.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 {
|
.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 -849px;
|
||||||
}
|
}
|
||||||
.entity_nudge p,
|
.entity_nudge p,
|
||||||
.form_user_nudge input.submit {
|
.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 -785px;
|
||||||
}
|
}
|
||||||
.form_user_block input.submit,
|
.form_user_block input.submit,
|
||||||
.form_user_unblock input.submit,
|
.form_user_unblock input.submit,
|
||||||
.form_group_block input.submit,
|
.form_group_block input.submit,
|
||||||
.form_group_unblock 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 {
|
.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 */
|
/* NOTICES */
|
||||||
.notice .attachment {
|
.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 {
|
#attachments .attachment {
|
||||||
background:none;
|
background:none;
|
||||||
}
|
}
|
||||||
.notice-options .notice_reply {
|
.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 {
|
.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 {
|
.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 {
|
.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,
|
.notices div.entry-content,
|
||||||
@ -262,7 +268,7 @@ background-color:rgba(200, 200, 200, 0.300);
|
|||||||
/*END: NOTICES */
|
/*END: NOTICES */
|
||||||
|
|
||||||
#new_group a {
|
#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,
|
.pagination .nav_prev a,
|
||||||
@ -271,10 +277,10 @@ background-repeat:no-repeat;
|
|||||||
border-color:#CEE1E9;
|
border-color:#CEE1E9;
|
||||||
}
|
}
|
||||||
.pagination .nav_prev a {
|
.pagination .nav_prev a {
|
||||||
background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
|
background-image:url(../../base/images/icons/icons-01.png);
|
||||||
background-position:10% 45%;
|
background-position:10% -187px;
|
||||||
}
|
}
|
||||||
.pagination .nav_next a {
|
.pagination .nav_next a {
|
||||||
background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
|
background-image:url(../../base/images/icons/icons-01.png);
|
||||||
background-position:90% 45%;
|
background-position:105% -252px;
|
||||||
}
|
}
|
||||||
|
@ -7,8 +7,14 @@ color:#FFFFFF;
|
|||||||
background-color:#D9DADB;
|
background-color:#D9DADB;
|
||||||
}
|
}
|
||||||
#form_notice .form_note + label {
|
#form_notice .form_note + label {
|
||||||
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 {
|
#form_notice #notice_data-attach {
|
||||||
filter: alpha(opacity=0);
|
filter: alpha(opacity=0);
|
||||||
}
|
}
|
||||||
|
.notice-options form.form_favor input.submit {
|
||||||
|
background-position:0 -460px;
|
||||||
|
}
|
||||||
|
.notice-options form.form_disfavor input.submit {
|
||||||
|
background-position:0 -526px;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user