[MERGE]Trunk.

bzr revid: vme@tinyerp.com-20130823050602-33bqv07e7g8dhv7x
This commit is contained in:
Vidhin Mehta
2013-08-23 10:36:02 +05:30
940 changed files with 75863 additions and 30626 deletions
+91 -4
View File
@@ -22,10 +22,20 @@
width: 32px;
height: 32px;
padding: 0px;
margin: 0px
margin: 0px;
border-radius: 0px;
}
/* ---- GENERIC FOR MAIL-RELATED STUFF ---- */
.openerp .oe_e.oe_e_alias {
font-size: 30px;
line-height: 15px;
vertical-align: top;
margin-right: 3px;
color: white;
text-shadow: 0px 0px 2px black;
}
/* ------------ MAIL WIDGET --------------- */
.openerp .oe_mail, .openerp .oe_mail *{
-webkit-box-sizing: border-box;
@@ -108,6 +118,9 @@
text-overflow:ellipsis;
word-wrap: break-word;
}
.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body .oe_mail_cleaned {
display: none;
}
/* a) Indented Messages */
@@ -622,11 +635,10 @@
}
.openerp .oe_followers .oe_partner {
height: 32px;
margin-right: 8px;
margin-right: 24px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-right: 10px;
}
.openerp .oe_followers .oe_partner img{
width: 32px;
@@ -639,7 +651,18 @@
right: 0px;
line-height: 20px;
}
.openerp .oe_followers .oe_edit_subtype{
cursor: pointer;
position: absolute;
right: 12px;
line-height: 20px;
}
.openerp .oe_followers .oe_partner .oe_hidden{
display: none;
}
.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title{
padding-right: 20px;
}
.openerp .oe_followers .oe_show_more{
cursor: pointer;
}
@@ -665,8 +688,72 @@
.openerp .oe_mail_wall .oe_mail{
margin: 16px;
width: 600px;
display: inline-block;
}
.openerp .oe_mail .oe_view_nocontent > p {
padding-left: 15px;
}
/* ------------- WALL SIDEBAR ------------- */
.openerp .oe_mail_wall .oe_mail_wall_aside {
margin: 16px;
position: relative;
display: inline-block;
vertical-align: top;
width: 260px;
}
.openerp .oe_mail_wall_aside .oe_sidebar_suggestion {
background-color: #EDEDF6;
border-radius: 2px;
padding-top: 1px;
}
.openerp .oe_sidebar_suggestion .oe_suggest_title h2 {
font-size: 14px;
font-weight: bold;
margin-left: 10px;
padding: 0px;
}
.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item {
border-radius: 2px;
width: 100%;
margin-left: 10px;
min-height: 67px; /* image_small 66x66px */
}
.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_image {
float: left;
padding-right: 10px;
}
.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_image img {
border-radius: 2px;
border: solid 1px rgba(0,0,0,0.03);
}
.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content button {
margin-top: 10px;
}
.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content a.oe_suggestion_item_name {
text-overflow: ellipsis;
overflow: hidden;
width: 90%;
}
.openerp .oe_sidebar_suggestion .oe_suggest_title a.oe_suggestion_remove {
line-height: 15px;
margin-top: -2px;
float: right;
visibility: hidden;
margin-right: 7px;
}
.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content a.oe_suggestion_remove_item {
line-height: 15px;
margin-top: -2px;
float: right;
visibility: hidden;
margin-right: 16px;
}
.openerp .oe_sidebar_suggestion .oe_suggest_title:hover a.oe_suggestion_remove,
.openerp .oe_sidebar_suggestion .oe_suggest_items:hover a.oe_suggestion_remove_item {
visibility: visible;
}
@@ -48,7 +48,6 @@
text-align: center;
overflow: hidden;
-moz-border-radius: 3px;
border-collapse: separate;
-webkit-border-radius: 3px;
-o-border-radius: 3px;
-ms-border-radius: 3px;