[MERGE] css fixes

bzr revid: fva@openerp.com-20120920155042-e4z7s1hju21ra3an
This commit is contained in:
Frédéric van der Essen 2012-09-20 17:50:42 +02:00
commit 05c912603a
2 changed files with 12 additions and 10 deletions

View File

@ -1969,7 +1969,7 @@
padding: 0;
}
.openerp .oe_form_sheetbg {
padding: 8px 0;
padding: 16px 0;
}
.openerp .oe_form_sheet_width {
min-width: 650px;
@ -1986,10 +1986,10 @@
border-bottom: 1px solid #dddddd;
}
.openerp .oe_application .oe_form_sheet {
border: 1px solid #afafb6;
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
border: 1px solid #c8c8d3;
-moz-box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
-webkit-box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
}
.openerp .oe_application .oe_form_sheet .ui-tabs {
margin: 0 -16px;
@ -2343,7 +2343,7 @@
.openerp ul.oe_form_status li, .openerp ul.oe_form_status_clickable li {
display: inline-block;
list-style-type: none;
margin: 0 -20px 0 0;
margin: 0 -18px 0 0;
padding: 0;
background-color: #fcfcfc;
background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));

View File

@ -113,6 +113,7 @@ $sheet-max-width: 860px
@keyframes #{$name}
@content
// Transforms the (readable) text of an inline element into an mmlicons icon,
// allows for actual readable text in-code (and in readers?) with iconic looks
@mixin text-to-icon($icon-name, $color: #404040)
@ -1560,7 +1561,7 @@ $sheet-max-width: 860px
margin: -16px -16px 0 -16px
padding: 0
.oe_form_sheetbg
padding: 8px 0
padding: 16px 0
.oe_form_sheet_width
min-width: 650px
max-width: $sheet-max-width
@ -1575,8 +1576,8 @@ $sheet-max-width: 860px
background: url(/web/static/src/img/form_sheetbg.png)
border-bottom: 1px solid #ddd
.oe_form_sheet
border: 1px solid $tag-border
@include box-shadow(0 0 10px rgba(0,0,0,0.3))
border: 1px solid #c8c8d3 //$tag-border
@include box-shadow(0 4px 20px rgba(0,0,0,0.15))
.ui-tabs
margin: 0 -16px
.oe_notebook_page
@ -1868,7 +1869,8 @@ $sheet-max-width: 860px
li
display: inline-block
list-style-type: none
margin: 0 -20px 0 0
// It is probably a bad idea to modify this margin
margin: 0 -18px 0 0
padding: 0
@include vertical-gradient(#fcfcfc, #dedede)
&:first-child .label