From 0acff4fbbb8c2ce98583f8c06c5a9436b5d257a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Mon, 8 Oct 2012 14:27:21 +0200 Subject: [PATCH 1/2] [FIX] css: fixed spacing around form header buttons bzr revid: fva@openerp.com-20121008122721-uide1ggwqsfr8eks --- addons/web/static/src/css/base.css | 56 +++++++++++++++-------------- addons/web/static/src/css/base.sass | 31 ++++++++-------- 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 3d54aef0fa2..3f0e5a521ee 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,7 +25,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -46,7 +45,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -522,28 +521,6 @@ .openerp .oe_grey { color: #aaaaaa; } -.openerp header { - position: relative; - border-bottom: 1px solid #cacaca; - padding-left: 2px; - background-color: #fcfcfc; - background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); - background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); - background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); - background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); - background-image: -o-linear-gradient(top, #fcfcfc, #dedede); - background-image: linear-gradient(to bottom, #fcfcfc, #dedede); -} -.openerp header > span { - margin-left: 4px; -} -.openerp header ul { - display: inline-block; - float: right; -} -.openerp header .oe_button { - margin: 3px 2px 1px; -} .openerp .oe_tag { border: 1px solid #afafb6; font-size: 11px; @@ -1204,7 +1181,7 @@ color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightGray; + border: 1px solid lightgrey; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1229,7 +1206,7 @@ transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - border-top: 1px solid lightGray; + border-top: 1px solid lightgrey; border-bottom: 1px solid #dedede; 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); @@ -2044,6 +2021,31 @@ .openerp .oe_application .oe_form_sheet .oe_notebook_page { padding: 0 16px; } +.openerp .oe_form header { + position: relative; + border-bottom: 1px solid #cacaca; + padding-left: 2px; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); +} +.openerp .oe_form header > span { + margin-left: 4px; +} +.openerp .oe_form header ul { + display: inline-block; + float: right; +} +.openerp .oe_form header .oe_button { + margin: 3px 2px 1px; +} +.openerp .oe_form header .oe_button:first-child { + margin-left: 6px; +} .openerp .oe_form header .oe_tags { margin: 5px 0 0 5px; width: 400px; @@ -2125,7 +2127,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkGreen; + color: darkgreen; vertical-align: top; position: relative; top: -4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0567d31b1eb..d6e8802040b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -457,21 +457,6 @@ $sheet-max-width: 860px // }}} - // Generic blocks {{{ - header - position: relative - border-bottom: 1px solid #cacaca - padding-left: 2px - @include vertical-gradient(#fcfcfc, #dedede) - > span - margin-left: 4px - ul - display: inline-block - float: right - .oe_button - margin: 3px 2px 1px - // }}} - // Tags (for many2many tags, among others) {{{ .oe_tag border: 1px solid $tag-border @@ -1618,6 +1603,22 @@ $sheet-max-width: 860px .oe_notebook_page padding: 0 16px // }}} + // FormView.header {{{ + .oe_form header + position: relative + border-bottom: 1px solid #cacaca + padding-left: 2px + @include vertical-gradient(#fcfcfc, #dedede) + > span + margin-left: 4px + ul + display: inline-block + float: right + .oe_button, + margin: 3px 2px 1px + &:first-child + margin-left: 6px + // }}} // FormView.custom tags and classes {{{ .oe_form header .oe_tags margin: 5px 0 0 5px From 7bf081d7e656980bfa13dc6bdc072a2f20d94fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Mon, 8 Oct 2012 17:49:35 +0200 Subject: [PATCH 2/2] [FIX] css: view list: removed header separator of empty collumns bzr revid: fva@openerp.com-20121008154935-lv10zxm6didl8dr5 --- addons/web/static/src/css/base.css | 9 ++++++--- addons/web/static/src/css/base.sass | 8 +++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 3f0e5a521ee..61809f2ef7c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -68,10 +68,13 @@ background-color: #f0f0f0; } .openerp thead th { - border-right: 1px dotted #afafb6; + border-left: 1px solid #dfdfdf; } -.openerp thead th:last-child { - border-right: none; +.openerp thead th:first-child { + border-left: none; +} +.openerp thead th.null { + border-left: none; } .openerp th, .openerp td { padding: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d6e8802040b..41b75bec5c3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -180,9 +180,11 @@ $sheet-max-width: 860px font-weight: bold background-color: #f0f0f0 th - border-right: 1px dotted $tag-border - &:last-child - border-right: none + border-left: 1px solid #dfdfdf + &:first-child + border-left: none + &.null + border-left: none th, td padding: 0 text-align: left