summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2012-06-19 16:26:51 +0200
committerAntony Lesuisse <al@openerp.com>2012-06-19 16:26:51 +0200
commitf89ce18e80a58d603d95749162492dd4f8bfaba8 (patch)
tree9d51a98fab42e03a3e6140f545cc33fba15e335f /addons/web/static/src/css
parentedbb35b0466ded4678489acd83de2c9a97e4e87a (diff)
parent2f2dcd29d0c37cd7bc80b7ce4c622fd3510e18eb (diff)
[MERGE] mit style
bzr revid: al@openerp.com-20120619142651-pfdm9z6fg1knwlzu
Diffstat (limited to 'addons/web/static/src/css')
-rw-r--r--addons/web/static/src/css/base.css10
-rw-r--r--addons/web/static/src/css/base.sass7
2 files changed, 12 insertions, 5 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 23f91aec952..024ecbbb965 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
@font-face {
font-family: "mnmliconsRegular";
src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -1755,6 +1755,9 @@
.openerp .oe_application .oe_form_sheet .ui-tabs {
margin: 0 -16px;
}
+.openerp .oe_application .oe_form_sheet .oe_notebook_page {
+ padding: 0 16px;
+}
.openerp .oe_form td.oe_form_group_cell_label {
border-right: 1px solid #dddddd;
padding: 2px 0px 2px 0px;
@@ -1768,7 +1771,8 @@
padding-left: 8px;
}
.openerp .oe_form .oe_form_group {
- margin: 5px 0px 5px 0px;
+ width: 100%;
+ margin: 4px 0 4px 0;
}
.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
font-weight: bold;
@@ -1789,7 +1793,7 @@
.openerp .oe_horizontal_separator {
font-weight: bold;
font-size: 20px;
- margin: 20px 0px 10px 0px;
+ margin: 8px 0px 8px 0px;
color: #aaaabb;
}
.openerp .oe_horizontal_separator:empty {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b63995b3e87..1d092ef041e 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1394,6 +1394,8 @@ $colour4: #8a89ba
@include box-shadow(0 0 10px rgba(0,0,0,0.3))
.ui-tabs
margin: 0 -16px
+ .oe_notebook_page
+ padding: 0 16px
// }}}
// FormView.group {{{
.oe_form
@@ -1407,7 +1409,8 @@ $colour4: #8a89ba
td.oe_form_group_cell + .oe_form_group_cell
padding-left: 8px
.oe_form_group
- margin: 5px 0px 5px 0px
+ width: 100%
+ margin: 4px 0 4px 0
// }}}
// FormView.label {{{
.oe_form
@@ -1429,7 +1432,7 @@ $colour4: #8a89ba
.oe_horizontal_separator
font-weight: bold
font-size: 20px
- margin: 20px 0px 10px 0px
+ margin: 8px 0px 8px 0px
color: #aab
.oe_horizontal_separator:empty
height: 5px