[MERGE] Merge with 7.0-fix-css-clearfix-jke - bug clearfix on oe_title and oe_form_group
bzr revid: jke@openerp.com-20140203180637-er9c45xm0d9sk7ub
This commit is contained in:
commit
4f827ec044
|
@ -1,4 +1,4 @@
|
||||||
@charset "UTF-8";
|
@charset "utf-8";
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: "mnmliconsRegular";
|
font-family: "mnmliconsRegular";
|
||||||
src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
|
src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
|
||||||
|
@ -79,6 +79,20 @@
|
||||||
.openerp td {
|
.openerp td {
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
|
.openerp .oe_title {
|
||||||
|
width: 50%;
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
.openerp .oe_title:after {
|
||||||
|
content: ".";
|
||||||
|
display: block;
|
||||||
|
height: 0;
|
||||||
|
clear: both;
|
||||||
|
visibility: hidden;
|
||||||
|
}
|
||||||
|
.openerp .oe_form_group {
|
||||||
|
clear: both;
|
||||||
|
}
|
||||||
.openerp .zebra tbody tr:nth-child(odd) td {
|
.openerp .zebra tbody tr:nth-child(odd) td {
|
||||||
background-color: #f0f0fa;
|
background-color: #f0f0fa;
|
||||||
background-color: #efeff8;
|
background-color: #efeff8;
|
||||||
|
@ -1015,7 +1029,7 @@
|
||||||
background-image: -moz-linear-gradient(top, #fc8787, maroon);
|
background-image: -moz-linear-gradient(top, #fc8787, maroon);
|
||||||
background-image: -ms-linear-gradient(top, #fc8787, maroon);
|
background-image: -ms-linear-gradient(top, #fc8787, maroon);
|
||||||
background-image: -o-linear-gradient(top, #fc8787, maroon);
|
background-image: -o-linear-gradient(top, #fc8787, maroon);
|
||||||
background-image: linear-gradient(to bottom, #fc8787, maroon);
|
background-image: linear-gradient(to bottom, #fc8787, #800000);
|
||||||
}
|
}
|
||||||
.openerp .oe_topbar .oe_topbar_anonymous_login a {
|
.openerp .oe_topbar .oe_topbar_anonymous_login a {
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -1261,7 +1275,7 @@
|
||||||
color: white;
|
color: white;
|
||||||
padding: 2px 4px;
|
padding: 2px 4px;
|
||||||
margin: 1px 6px 0 0;
|
margin: 1px 6px 0 0;
|
||||||
border: 1px solid lightgrey;
|
border: 1px solid lightGray;
|
||||||
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
|
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
|
||||||
-moz-border-radius: 4px;
|
-moz-border-radius: 4px;
|
||||||
-webkit-border-radius: 4px;
|
-webkit-border-radius: 4px;
|
||||||
|
@ -1293,7 +1307,7 @@
|
||||||
transform: scale(1.1);
|
transform: scale(1.1);
|
||||||
}
|
}
|
||||||
.openerp .oe_secondary_submenu .oe_active {
|
.openerp .oe_secondary_submenu .oe_active {
|
||||||
border-top: 1px solid lightgrey;
|
border-top: 1px solid lightGray;
|
||||||
border-bottom: 1px solid #dedede;
|
border-bottom: 1px solid #dedede;
|
||||||
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
|
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
|
||||||
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
|
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
|
||||||
|
@ -2275,7 +2289,7 @@
|
||||||
}
|
}
|
||||||
.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
|
.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
|
||||||
font-size: 80%;
|
font-size: 80%;
|
||||||
color: darkgreen;
|
color: darkGreen;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
position: relative;
|
position: relative;
|
||||||
top: -4px;
|
top: -4px;
|
||||||
|
|
|
@ -190,6 +190,17 @@ $sheet-padding: 16px
|
||||||
vertical-align: middle
|
vertical-align: middle
|
||||||
td
|
td
|
||||||
vertical-align: top
|
vertical-align: top
|
||||||
|
.oe_title
|
||||||
|
width: 50%
|
||||||
|
float: left
|
||||||
|
.oe_title:after
|
||||||
|
content: "."
|
||||||
|
display: block
|
||||||
|
height: 0
|
||||||
|
clear: both
|
||||||
|
visibility: hidden
|
||||||
|
.oe_form_group
|
||||||
|
clear: both
|
||||||
.zebra tbody tr:nth-child(odd) td
|
.zebra tbody tr:nth-child(odd) td
|
||||||
background-color: #f0f0fa
|
background-color: #f0f0fa
|
||||||
@include vertical-gradient(#f0f0fa, #eeeef6)
|
@include vertical-gradient(#f0f0fa, #eeeef6)
|
||||||
|
|
Loading…
Reference in New Issue