merge mit-trunk
bzr revid: mit@openerp.com-20120817142917-31iuftau2gwno9e8
This commit is contained in:
commit
f4723d16d0
|
@ -2,13 +2,13 @@
|
|||
|
||||
// Variables {{{
|
||||
$facets-border: #afafb6
|
||||
$section-title-color: #8786b7
|
||||
$section-title-color: #7C7BAD
|
||||
$tag-bg-light: #f0f0fa
|
||||
$tag-bg-dark: #8786b7
|
||||
$tag-bg-dark: #7C7BAD
|
||||
$tag-border: #afafb6
|
||||
$tag-border-selected: #a6a6fe
|
||||
$hover-background: #f0f0fa
|
||||
$link-color: #8a89ba
|
||||
$link-color: #7C7BAD
|
||||
$sheet-max-width: 860px
|
||||
// }}}
|
||||
// Mixins {{{
|
||||
|
@ -1502,7 +1502,7 @@ $sheet-max-width: 860px
|
|||
width: auto
|
||||
.oe_form_nosheet
|
||||
margin: 16px
|
||||
.oe_form_nosheet > header
|
||||
> header
|
||||
margin: -16px -16px 0 -16px
|
||||
padding: 8px
|
||||
// }}}
|
||||
|
@ -1512,7 +1512,7 @@ $sheet-max-width: 860px
|
|||
position: relative
|
||||
border-bottom: 1px solid #cacaca
|
||||
@include vertical-gradient(#fcfcfc, #dedede)
|
||||
//line-height: 30px
|
||||
>>>>>>> MERGE-SOURCE
|
||||
ul
|
||||
display: inline-block
|
||||
float: right
|
||||
|
|
Loading…
Reference in New Issue