[IMP]conflicts resolved

bzr revid: kbh@tinyerp.com-20120320103846-gt5dalg2tejw98lv
This commit is contained in:
Khushboo Bhatt (Open ERP) 2012-03-20 16:08:46 +05:30
commit 7ecc59bde9
1 changed files with 3 additions and 1 deletions

View File

@ -65,7 +65,7 @@ div.oe_fold_column{
outline: none;
}
.oe_event_button_unsubscribe {
display: inline-block;
display: inline-block;
border: 1px solid #AAA;
color: #404040;
font-size: 12px;
@ -99,6 +99,8 @@ div.oe_fold_column{
.oe_event_button_subscribe:hover {
cursor: pointer;
background-size: 100% 100%;
/*background: #DC5F59 none;*/
}
.oe_event_button_unsubscribe:hover {
cursor: pointer;