odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge mit-trunk 

bzr revid: mit@openerp.com-20120817142917-31iuftau2gwno9e8
This commit is contained in:
Minh Tran 2012-08-17 16:29:17 +02:00
parent e1cd328909 86f04a8726
commit f4723d16d0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/web/static/src/css/base.sass
View File

@ -2,13 +2,13 @@
// Variables {{{ // Variables {{{
$facets-border: #afafb6 $facets-border: #afafb6
$section-title-color: #8786b7 $section-title-color: #7C7BAD
$tag-bg-light: #f0f0fa $tag-bg-light: #f0f0fa
$tag-bg-dark: #8786b7 $tag-bg-dark: #7C7BAD
$tag-border: #afafb6 $tag-border: #afafb6
$tag-border-selected: #a6a6fe $tag-border-selected: #a6a6fe
$hover-background: #f0f0fa $hover-background: #f0f0fa
$link-color: #8a89ba $link-color: #7C7BAD
$sheet-max-width: 860px $sheet-max-width: 860px
// }}} // }}}
// Mixins {{{ // Mixins {{{
@ -1502,9 +1502,9 @@ $sheet-max-width: 860px
width: auto width: auto
.oe_form_nosheet .oe_form_nosheet
margin: 16px margin: 16px
.oe_form_nosheet > header > header
margin: -16px -16px 0 -16px margin: -16px -16px 0 -16px
padding: 8px padding: 8px
// }}} // }}}
// FormView.custom tags and classes {{{ // FormView.custom tags and classes {{{
.oe_form .oe_form
@ -1512,7 +1512,7 @@ $sheet-max-width: 860px
position: relative position: relative
border-bottom: 1px solid #cacaca border-bottom: 1px solid #cacaca
@include vertical-gradient(#fcfcfc, #dedede) @include vertical-gradient(#fcfcfc, #dedede)
//line-height: 30px >>>>>>> MERGE-SOURCE
ul ul
display: inline-block display: inline-block
float: right float: right