pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source 
bzr revid: fp@tinyerp.com-20120716203615-sgl1tfi827kq6wwk
This commit is contained in:
Fabien Pinckaers
2012-07-16 22:36:15 +02:00
parent 6b64a0a1b7 48c40843ba
commit 3244efdb80
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/css/base.css
+14 -10
View File
@@ -396,10 +396,11 @@
margin: 4px;
}
.openerp .oe_avatar {
margin: 0 16px 0 0;
margin: 0 6px 15px 0;
}
.openerp .oe_avatar > img {
height: 50px;
height: 90px;
max-width: 100px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
@@ -408,6 +409,9 @@
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
border: none;
}
.openerp .oe_avatar + div {
margin-left: 115px;
}
.openerp .oe_button.oe_link {
border: none;
padding: 0;
@@ -1881,6 +1885,9 @@
.openerp .oe_application .oe_form_sheet .oe_notebook_page {
padding: 0 16px;
}
.openerp .oe_form .oe_form_button {
margin: 2px;
}
.openerp .oe_form td.oe_form_group_cell_label {
border-right: 1px solid #dddddd;
padding: 2px 0px 2px 0px;
@@ -1888,7 +1895,7 @@
.openerp .oe_form td.oe_form_group_cell_label label {
line-height: 18px;
display: block;
min-width: 110px;
min-width: 120px;
}
.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
padding-left: 6px;
@@ -2184,6 +2191,10 @@
.openerp .oe_list_content td:first-child:after, .openerp .oe_list_content th:first-child:after {
border-width: 0;
}
.openerp .oe_list_content td.oe_number {
text-align: right !important;
max-width: 100px;
}
.openerp .oe_list_content > thead {
border-bottom: 2px solid #cacaca;
background: #eeeeee;
@@ -2235,9 +2246,6 @@
.openerp .oe_list_content > tbody > tr > td.oe_list_field_cell progress {
width: 100%;
}
.openerp .oe_list_content > tbody > tr > td, .openerp .oe_list_content > tbody > tr > th {
line-height: 18px;
}
.openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button {
border: none;
background: transparent;
@@ -2252,10 +2260,6 @@
.openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child:after, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child:after {
border-width: 0;
}
.openerp .oe_list_content > tbody > tr > td.oe_number {
text-align: right !important;
max-width: 100px;
}
.openerp .oe_list_content > tbody > tr:nth-child(odd) {
background-color: #f0f0fa;
background-color: #f0f0fa;
addons/web/static/src/css/base.sass
+12 -7
View File
@@ -296,6 +296,7 @@ $sheet-max-width: 860px
cursor: wait
.oe_fade
color: #888
font-weight: normal
.oe_bold
font-weight: bold
.oe_inline
@@ -337,12 +338,15 @@ $sheet-max-width: 860px
button
margin: 4px
.oe_avatar
margin: 0 16px 0 0
margin: 0 6px 15px 0
> img
height: 50px
height: 90px
max-width: 100px
@include radius(3px)
@include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3))
border: none
.oe_avatar + div
margin-left: 115px
.oe_button.oe_link
@include reset()
img
@@ -1467,13 +1471,15 @@ $sheet-max-width: 860px
// }}}
// FormView.group {{{
.oe_form
.oe_form_button
margin: 2px
td.oe_form_group_cell_label
border-right: 1px solid #ddd
padding: 2px 0px 2px 0px
label
line-height: 18px
display: block
min-width: 110px
min-width: 120px
td.oe_form_group_cell + .oe_form_group_cell
padding-left: 6px
.oe_form_group
@@ -1731,6 +1737,9 @@ $sheet-max-width: 860px
td:first-child, th:first-child
&:after
border-width: 0
td.oe_number
text-align: right !important
max-width: 100px
> thead
border-bottom: 2px solid #cacaca
background: #eee
@@ -1769,7 +1778,6 @@ $sheet-max-width: 860px
progress
width: 100%
> td, > th
line-height: 18px
> button
border: none
background: transparent
@@ -1779,9 +1787,6 @@ $sheet-max-width: 860px
width: 17px
&:after
border-width: 0
> td.oe_number
text-align: right !important
max-width: 100px
> tr:nth-child(odd)
background-color: #f0f0fa
@include vertical-gradient(#f0f0fa, #eeeef6)