merge from mit-trunk

bzr revid: mit@openerp.com-20120824115821-5fp4ks5ch6czs5vf
This commit is contained in:
Minh Tran
2012-08-24 13:58:21 +02:00
2 changed files with 13 additions and 20 deletions
+8 -11
View File
@@ -454,13 +454,6 @@
-webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
}
.openerp ul.oe_flatlist, .openerp ol.oe_flatlist {
margin: 0;
padding: 0;
}
.openerp ul.oe_flatlist li, .openerp ol.oe_flatlist li {
list-style-type: none;
}
.openerp .oe_form_dirty .oe_highlight_on_dirty {
color: white;
background: #dc5f59;
@@ -1246,6 +1239,13 @@
margin: 0px;
padding: 1px 4px;
}
.openerp .oe_secondary_submenu .oe_menu_counter:hover {
cursor: pointer;
border: 1px solid #c81010;
-moz-box-shadow: 0 0 2px #c81010;
-webkit-box-shadow: 0 0 2px #c81010;
box-shadow: 0 0 2px #c81010;
}
.openerp .oe_secondary_submenu .oe_active {
background: #7c7bad;
border-top: 1px solid lightGray;
@@ -2817,6 +2817,7 @@ div.ui-widget-overlay {
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
margin-top: 4px;
border: 1px solid #afafb6;
}
.ui-menu .ui-menu-item {
width: 100%;
@@ -2842,7 +2843,3 @@ div.ui-widget-overlay {
-webkit-border-radius: 3px;
border-radius: 3px;
}
.ui-widget-content {
border: 1px solid #afafb6;
}