From 9e952c3fba9b4f0cd6399d3ba24f17e98b6f0560 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 2 Jul 2012 17:49:27 +0530 Subject: [IMP]implement css and collapse all functionality. bzr revid: vme@tinyerp.com-20120702121927-wbg5pncvw4qo8cni --- addons/web/static/src/css/base.sass | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2846ce7235d..9dbe2f71ffe 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1747,6 +1747,46 @@ $colour4: #8a89ba float: right color: #333 // }}} +//Tree view +.openerp + .tree_header + background-color: #f0f0f0 + border-bottom: 1px solid #cacaca + color: #4c4c4c + padding: 5px + button + float: right + .oe-treeview-table + width: 100% + background-color: white + border-spacing: 0 + th + padding: 10px + color: #4c4c4c + font-weight: bold + background-color: #f0f0f0 + border-bottom: 2px solid #cacaca + .treeview-tr, .treeview-td + cursor: pointer + border-right: 1px dotted #afafb6 + vertical-align: top + text-align: left + border-bottom: 1px solid #cfcccc + tr:hover + background-color: #e0e0f8 + .oe-number + text-align: right !important + span + font-size: 90% + font-weight: normal + white-space: nowrap + display: block + .treeview-tr.oe-treeview-first + background: transparent url(/web/static/src/img/expand.gif) 0 50% no-repeat + .oe_open .treeview-tr.oe-treeview-first + background-image: url(/web/static/src/img/collapse.gif) + .treeview-tr.oe-treeview-first span, .treeview-td.oe-treeview-first span + margin-left: 16px // Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) -- cgit v1.2.3 From c6ffd20a31c1413adb71716c952f36d74e15533c Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 3 Jul 2012 19:05:08 +0530 Subject: [IMP]minor changes. bzr revid: vme@tinyerp.com-20120703133508-33lfisga2u4tlepe --- addons/web/static/src/css/base.sass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 9dbe2f71ffe..6514ea8d70b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1754,8 +1754,11 @@ $colour4: #8a89ba border-bottom: 1px solid #cacaca color: #4c4c4c padding: 5px + height: 25px button float: right + height: 27px + margin-right: 5px .oe-treeview-table width: 100% background-color: white -- cgit v1.2.3 From b83fff287a2c341cae3ee8c93a2925d15433e29e Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Thu, 12 Jul 2012 14:56:37 +0200 Subject: [IMP] change CSS classes for m2m tags and get them out of the oe_form namespace this way, we can consistently display m2m tags anywhere without dummy CSS copy/paste (example: projet issues, projet tasks) oe_form_field_many2manytags became oe_field_many2many_tags (container) oe_form_field_many2manytags_box became oe_field_many2many_tag (item) Qweb templates names have been changed accordingly bzr revid: abo@openerp.com-20120712125637-hji6e9chch1h01f0 --- addons/web/static/src/css/base.sass | 64 ++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d26b6c9e29b..01e2bdb1005 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -362,8 +362,28 @@ $sheet-max-width: 860px text-decoration: none .oe_star_on color: gold - - //.oe_edit_only  + // }}} + // Many2many tags {{{ + .oe_field_many2many_tags + .text-wrap + width: 100% !important + textarea + width: 100% !important + .oe_field_many2many_tag + border-radius: 2px + @include box-sizing(border) + position: relative + float: left + border: 1px solid #9DACCC + background: #E2E6F0 + color: black + padding: 0px 3px 0px 3px + margin: 0 2px 2px 0 + height: 16px + font: 11px "lucida grande", tahoma, verdana, arial, sans-serif + .text-core .text-wrap .text-dropdown .text-list .text-suggestion em + font-style: italic + text-decoration: none // }}} // Tooltips {{{ &.oe_tooltip @@ -823,7 +843,7 @@ $sheet-max-width: 860px text-shadow: 0 1px 1px rgba(0,0,0,0.2) @include radius(4px) @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2)) - .oe_menu_counter + .oe_menu_counter float: right background: #8a89ba color: #eee @@ -846,7 +866,7 @@ $sheet-max-width: 860px color: $colour4 text-shadow: 0 1px 1px white @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2)) - .oe_menu_counter + .oe_menu_counter background: #eee color: #8a89ba .oe_menu_toggler:before @@ -1312,7 +1332,7 @@ $sheet-max-width: 860px margin: 0 0 0 4px padding: 0 - + // }}} // Views Common {{{ .oe_view_nocontent @@ -1356,7 +1376,7 @@ $sheet-max-width: 860px display: none !important .oe_form .oe_form_field_date width: auto - .oe_form_nosheet + .oe_form_nosheet margin-left: 10px margin-right: 10px .oe_form_nosheet > header @@ -1364,13 +1384,13 @@ $sheet-max-width: 860px margin-right: -10px // }}} // FormView.custom tags and classes {{{ - .oe_form + .oe_form header position: relative border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) padding: 0 8px - line-height: 30px + line-height: 30px ul display: inline-block float: right @@ -1387,12 +1407,12 @@ $sheet-max-width: 860px vertical-align: top margin-left: 8px li - border-right: none + border-right: none padding: 0 margin: 0 - float: left + float: left vertical-align: top - height: 30px + height: 30px padding: 0 0 0 12px &:first-child border-left: 1px solid #cacaca @@ -1428,7 +1448,7 @@ $sheet-max-width: 860px .oe_form_sheetbg background: url(/web/static/src/img/form_sheetbg.png) padding: 8px 0 - border-bottom: 1px solid #ddd + border-bottom: 1px solid #ddd .oe_form_sheet_width min-width: 650px max-width: $sheet-max-width @@ -1572,26 +1592,6 @@ $sheet-max-width: 860px .oe_form_field_boolean padding-top: 4px width: auto - .oe_form_field_many2manytags - .text-wrap - width: 100% !important - textarea - width: 100% !important - .oe_form_field_many2manytags_box - border-radius: 2px - @include box-sizing(border) - position: relative - float: left - border: 1px solid #9DACCC - background: #E2E6F0 - color: black - padding: 0px 3px 0px 3px - margin: 0 2px 2px 0 - height: 16px - font: 11px "lucida grande", tahoma, verdana, arial, sans-serif - .text-core .text-wrap .text-dropdown .text-list .text-suggestion em - font-style: italic - text-decoration: none .oe_datepicker_container display: none .oe_datepicker_root -- cgit v1.2.3 From ae44723e2bed58dd289bfb2d9708219401f7cf7e Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Thu, 12 Jul 2012 15:32:50 +0200 Subject: [IMP] turn many2many tags CSS classes into *real* generic classes, without any reference to other openerp elements like fields oe_field_many2many_tags becomes oe_tags oe_field_many2many_tag becomes oe_tag bzr revid: abo@openerp.com-20120712133250-c2ss8ygqujx4m2w2 --- addons/web/static/src/css/base.sass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 01e2bdb1005..5a0daae0674 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -363,13 +363,13 @@ $sheet-max-width: 860px .oe_star_on color: gold // }}} - // Many2many tags {{{ - .oe_field_many2many_tags + // Tags (for many2many tags, among others) {{{ + .oe_tags .text-wrap width: 100% !important textarea width: 100% !important - .oe_field_many2many_tag + .oe_tag border-radius: 2px @include box-sizing(border) position: relative -- cgit v1.2.3 From 32f49b71bacf3c4165a81ef60b2bf2cdbb275fa3 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 12 Jul 2012 18:34:44 +0200 Subject: [FIX] cleaned dialog box design bzr revid: fp@tinyerp.com-20120712163444-thvd2zqbwxcff4i5 --- addons/web/static/src/css/base.sass | 6 ------ 1 file changed, 6 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d26b6c9e29b..b7d866245f1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -205,13 +205,7 @@ $sheet-max-width: 860px // Modal box &.ui-dialog display: none - position: fixed padding: 6px - top: 50% - left: 50% - z-index: 1050 - width: 560px - margin: -150px 0 0 -280px //overflow: hidden background-color: rgba(60,60,60,0.7) border: 1px solid -- cgit v1.2.3 From ded3223288d0714641fa28b64ab2659d7b742ec0 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 12 Jul 2012 18:43:44 +0200 Subject: [FIX] Fixed oe_avatar class bug bzr revid: fme@openerp.com-20120712164344-ayd0r47oy90vp9st --- addons/web/static/src/css/base.sass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d26b6c9e29b..43521eb9282 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -336,7 +336,7 @@ $sheet-max-width: 860px margin: 4px .oe_avatar margin: 0 16px 0 0 - img + > img height: 50px @include radius(3px) @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) @@ -1669,6 +1669,7 @@ $sheet-max-width: 860px vertical-align: top .oe_form_field_image_controls position: absolute + white-space: nowrap top: 1px padding: 3px 0 0 0 margin: 0 1px -- cgit v1.2.3 From 2b6cce2c7c1a53680b974fa0a3a17a83a8702732 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 13 Jul 2012 13:47:37 +0200 Subject: [IMP] modal dialogs bzr revid: fp@tinyerp.com-20120713114737-hqieh0oi6nnnbjqh --- addons/web/static/src/css/base.sass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f9a0306c969..f6e3e9a6ea2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -235,6 +235,8 @@ $sheet-max-width: 860px @include radius(0 0 2px 2px) button margin-left: 8px + .ui-dialog-buttonset + float: left .ui-dialog-titlebar-close padding: 0 .ui-icon-closethick @@ -1388,7 +1390,7 @@ $sheet-max-width: 860px ul display: inline-block float: right - footer + div.oe_chatter min-width: 650px max-width: $sheet-max-width margin: 0 auto -- cgit v1.2.3 From 5d669143c3705129647e5bade569d4c11159f0d0 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 13 Jul 2012 15:46:16 +0200 Subject: Restyling of form listview subtotals bzr revid: mit@openerp.com-20120713134616-rpntccxdiei562u6 --- addons/web/static/src/css/base.sass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f6e3e9a6ea2..1ccf24ad9c4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1430,15 +1430,15 @@ $sheet-max-width: 860px padding: 0 !important td.oe_form_group_cell_label border-right: none - .oe_form_field - width: auto !important .oe_subtotal_footer_separator border-top: 1px solid #cacaca - font-sie: 120% font-weight: bold + font-size: 18px label.oe_subtotal_footer_separator font-weight: bold !important padding: 2px 8px 2px 0px !important + label.oe_form_label_help + font-weight: normal // no sheet in popups .oe_application .oe_form_sheetbg @@ -1558,7 +1558,7 @@ $sheet-max-width: 860px .oe_form_field_integer width: 180px .oe_form_field_float - width: 180px + width: 112px .oe_form_field_date width: 7.5em .oe_form_field_datetime @@ -1773,6 +1773,7 @@ $sheet-max-width: 860px border-width: 0 > td.oe_number text-align: right !important + width: 100px > tr:nth-child(odd) background-color: #f0f0fa @include vertical-gradient(#f0f0fa, #eeeef6) -- cgit v1.2.3 From 259dd3147dc7d418fe1ba84591df96fe7611c916 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 13 Jul 2012 16:12:37 +0200 Subject: relooking one2many listview and changed padding in popup bzr revid: mit@openerp.com-20120713141237-on8z29w5dnh2at2z --- addons/web/static/src/css/base.sass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1ccf24ad9c4..ea052495911 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1372,9 +1372,6 @@ $sheet-max-width: 860px display: none !important .oe_form .oe_form_field_date width: auto - .oe_form_nosheet - margin-left: 10px - margin-right: 10px .oe_form_nosheet > header margin-left: -10px margin-right: -10px @@ -1693,6 +1690,12 @@ $sheet-max-width: 860px display: none .oe_form_field_one2many // TODO: oe_form_field_one2many_list? + .oe_list_content + > thead + border-bottom: 1px + > tbody + tr:nth-child(odd) + background: transparent .oe_list .oe_list_edit_row_save background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat &:before -- cgit v1.2.3 From 01d15a28124ac6e11ef4b45e5fcc53371d2d5adb Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 14 Jul 2012 02:05:19 +0200 Subject: [IMP] dialogs bzr revid: fp@openerp.com-20120714000519-ksf14svlnp6xljri --- addons/web/static/src/css/base.sass | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 7235e948b66..b66f2e1474c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -216,7 +216,7 @@ $sheet-max-width: 860px @include background-clip() .ui-dialog-content padding: 0px - .ui-dialog-titlebar, .ui-dialog-buttonpane + .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane padding: 16px .ui-dialog-titlebar border-bottom: 1px solid #cacaca @@ -258,6 +258,10 @@ $sheet-max-width: 860px color: black text-decoration: none + &.ui-dialog.oe_act_window + .ui-dialog-content + padding: 0px + .modal-backdrop position: fixed top: 0 @@ -1551,14 +1555,6 @@ $sheet-max-width: 860px line-height: 18px input margin: 0px - .oe_form_field_integer - width: 7em - .oe_form_field_float - width: 8em - .oe_form_field_date - width: 7.5em - .oe_form_field_datetime - width: 11em input[type="text"], input[type="password"], input[type="file"], select height: 22px padding-top: 2px @@ -1628,6 +1624,16 @@ $sheet-max-width: 860px > div position: relative overflow: hidden + .oe_form_editable + .oe_form + .oe_form_field_integer + width: 7em !important + .oe_form_field_float + width: 8em !important + .oe_form_field_date + width: 7.5em !important + .oe_form_field_datetime + width: 11em !important // }}} // FormView.fields_binary {{{ /* http://www.quirksmode.org/dom/inputfile.html -- cgit v1.2.3 From 50f048e0a5878b638e9fd37b8980c5f02b91c6b1 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 14 Jul 2012 02:16:07 +0200 Subject: [IMP] subtotal bzr revid: fp@openerp.com-20120714001607-02vp586jbeeeyjih --- addons/web/static/src/css/base.sass | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b66f2e1474c..060c025cdb3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1437,6 +1437,7 @@ $sheet-max-width: 860px td.oe_form_group_cell_label border-right: none .oe_subtotal_footer_separator + width: 108px border-top: 1px solid #cacaca font-weight: bold font-size: 18px -- cgit v1.2.3 From 734d54a3f5d1cf27c180cb8dfda7b55fa5a7f9e3 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 14 Jul 2012 17:31:55 +0200 Subject: [IMP] layot bzr revid: fp@openerp.com-20120714153155-t7j43co12g460fla --- addons/web/static/src/css/base.sass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 060c025cdb3..90ac57c4755 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -910,8 +910,9 @@ $sheet-max-width: 860px .oe_view_manager_view_kanban height: inherit - .oe_view_manager_header + table.oe_view_manager_header width: 100% + table-layout: fixed .oe_header_row //min-height: 26px //line-height: 26px @@ -922,7 +923,6 @@ $sheet-max-width: 860px padding-top: 0 .oe_view_manager_sidebar margin: 0px auto - width: 400px text-align: center td line-height: 26px @@ -1055,7 +1055,7 @@ $sheet-max-width: 860px float: right padding: 1px 0 line-height: 18px - width: 480px + width: 400px border: 1px solid #ababab background: white @include radius(13px) @@ -1634,7 +1634,7 @@ $sheet-max-width: 860px .oe_form_field_date width: 7.5em !important .oe_form_field_datetime - width: 11em !important + width: 11.5em !important // }}} // FormView.fields_binary {{{ /* http://www.quirksmode.org/dom/inputfile.html @@ -1769,6 +1769,8 @@ $sheet-max-width: 860px border-top: 1px solid #ddd > td.oe_list_field_cell padding: 3px 6px + progress + width: 100% > td, > th line-height: 18px > button @@ -1782,7 +1784,7 @@ $sheet-max-width: 860px border-width: 0 > td.oe_number text-align: right !important - width: 100px + max-width: 100px > tr:nth-child(odd) background-color: #f0f0fa @include vertical-gradient(#f0f0fa, #eeeef6) -- cgit v1.2.3 From 55ecea546b3e8709ada277a9c6da5dff06c7831a Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 14 Jul 2012 18:58:56 +0200 Subject: [IMP] layout bzr revid: fp@openerp.com-20120714165856-wqv4ldiu3y8ovln4 --- addons/web/static/src/css/base.sass | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 90ac57c4755..e10e6de7c77 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -366,23 +366,21 @@ $sheet-max-width: 860px color: gold // }}} // Tags (for many2many tags, among others) {{{ + .oe_tag + border-radius: 2px + @include box-sizing(border) + border: 1px solid #9DACCC + background: #E2E6F0 + color: black !important + padding: 0px 3px 0px 3px + margin: 0 2px 2px 0 + height: 16px + // font: 11px "lucida grande", tahoma, verdana, arial, sans-serif .oe_tags .text-wrap width: 100% !important textarea width: 100% !important - .oe_tag - border-radius: 2px - @include box-sizing(border) - position: relative - float: left - border: 1px solid #9DACCC - background: #E2E6F0 - color: black - padding: 0px 3px 0px 3px - margin: 0 2px 2px 0 - height: 16px - font: 11px "lucida grande", tahoma, verdana, arial, sans-serif .text-core .text-wrap .text-dropdown .text-list .text-suggestion em font-style: italic text-decoration: none -- cgit v1.2.3 From 856ee3945004bc7be5e2c8cfa08b9bbb07249df4 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 14 Jul 2012 22:01:42 +0200 Subject: fix bzr revid: fp@openerp.com-20120714200142-n8tkm5zyltgxbm25 --- addons/web/static/src/css/base.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e10e6de7c77..4845dc2aca0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1692,7 +1692,7 @@ $sheet-max-width: 860px .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page display: none - .oe_form_field_one2many + .oe_form_field_one2many,.oe_form_field_many2many // TODO: oe_form_field_one2many_list? .oe_list_content > thead -- cgit v1.2.3 From 21832994f9d5feb158f593bfd69fec695e72e453 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 15 Jul 2012 14:30:09 +0200 Subject: [IMP] css bzr revid: fp@openerp.com-20120715123009-evvlbucsex188s7b --- addons/web/static/src/css/base.sass | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4845dc2aca0..2232d223a38 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1377,11 +1377,11 @@ $sheet-max-width: 860px .oe_form .oe_form_field_date width: auto .oe_form_nosheet - margin-left: 10px - margin-right: 10px + margin: 20px .oe_form_nosheet > header - margin-left: -10px - margin-right: -10px + margin-top: -20px + margin-left: -20px + margin-right: -20px // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1480,8 +1480,7 @@ $sheet-max-width: 860px width: 100% margin: 4px 0 4px 0 .oe_group_right - > tbody > tr > td:first-child - padding-left: 18px + margin-left: 18px // }}} // FormView.label {{{ .oe_form -- cgit v1.2.3 From 402d455f5ba8a9807cec69244bf35e8cd06fccab Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 16 Jul 2012 13:13:24 +0200 Subject: [IMP] css bzr revid: fp@tinyerp.com-20120716111324-xi5x9w0broortnls --- addons/web/static/src/css/base.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2232d223a38..23cce1e9c9e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1479,8 +1479,8 @@ $sheet-max-width: 860px .oe_form_group width: 100% margin: 4px 0 4px 0 - .oe_group_right - margin-left: 18px + .oe_form_group_cell.oe_group_right + padding-left: 20px // }}} // FormView.label {{{ .oe_form -- cgit v1.2.3 From be5b557651180cbf60f1063c06c112272d45cdbc Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 16 Jul 2012 20:07:50 +0200 Subject: [IMP] CSS right align of sums in list footer bzr revid: fp@tinyerp.com-20120716180750-0soa4w3ui7w03xjm --- addons/web/static/src/css/base.sass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 23cce1e9c9e..bfe3336546a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1731,6 +1731,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 +1772,6 @@ $sheet-max-width: 860px progress width: 100% > td, > th - line-height: 18px > button border: none background: transparent @@ -1779,9 +1781,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) -- cgit v1.2.3 From 48c40843ba1ab222efb651cde4cf00c59ca1f87e Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 16 Jul 2012 22:35:52 +0200 Subject: [IMP] css bzr revid: fp@tinyerp.com-20120716203552-u1co2og8xsa5xsfh --- addons/web/static/src/css/base.sass | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index bfe3336546a..140335daa95 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -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 -- cgit v1.2.3 From 81386f1428019f42172f24a4d589978abda5d690 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 16 Jul 2012 23:18:40 +0200 Subject: [IMP] CSS bzr revid: fp@tinyerp.com-20120716211840-vzy5yga4fwma71jd --- addons/web/static/src/css/base.sass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 140335daa95..35323a26bc2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -325,7 +325,8 @@ $sheet-max-width: 860px &:hover background: #ED6F6A .oe_title - width: 60% + width: 50% + float: left .oe_title:after content: "." display: block @@ -333,7 +334,7 @@ $sheet-max-width: 860px clear: both visibility: hidden .oe_button_box - width: 38% + width: 270px text-align: right button margin: 4px @@ -346,7 +347,7 @@ $sheet-max-width: 860px @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) border: none .oe_avatar + div - margin-left: 115px + margin-left: 5px .oe_button.oe_link @include reset() img -- cgit v1.2.3 From 1eceef8dc16f34126b16facfc6cdd437fc159e98 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 16 Jul 2012 23:20:22 +0200 Subject: [IMP] CSS bzr revid: fp@tinyerp.com-20120716212022-01084sff7foscbx5 --- addons/web/static/src/css/base.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 35323a26bc2..8a2c510ec42 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1485,7 +1485,7 @@ $sheet-max-width: 860px padding-left: 6px .oe_form_group width: 100% - margin: 4px 0 4px 0 + margin: 6px 0 6px 0 .oe_form_group_cell.oe_group_right padding-left: 20px // }}} -- cgit v1.2.3 From 7bc0699330ba6f477c14b5f5c366ea564ac17c6d Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 17 Jul 2012 16:47:33 +0200 Subject: various improvements bzr revid: mit@openerp.com-20120717144733-jxlf113kuwga98ug --- addons/web/static/src/css/base.sass | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8a2c510ec42..fb67945a02d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -232,11 +232,10 @@ $sheet-max-width: 860px .ui-dialog-buttonpane border-top: 1px solid #e0e0e0 background: #f5f7f9 - padding: 8px margin: 0 @include radius(0 0 2px 2px) button - margin-left: 8px + margin: 0 .ui-dialog-buttonset float: left .ui-dialog-titlebar-close @@ -1444,9 +1443,11 @@ $sheet-max-width: 860px border-top: 1px solid #cacaca font-weight: bold font-size: 18px + label:after + content: ":" label.oe_subtotal_footer_separator font-weight: bold !important - padding: 2px 8px 2px 0px !important + padding: 2px 11px 2px 0px !important label.oe_form_label_help font-weight: normal // no sheet in popups @@ -1610,14 +1611,6 @@ $sheet-max-width: 860px .oe_form_field_with_button.oe_no_button > .oe_button display: none .oe_form_field_with_button:not(.oe_no_button) - input - border-right: none - -webkit-border-top-right-radius: 0px - -webkit-border-bottom-right-radius: 0px - -moz-border-radius-topright: 0px - -moz-border-radius-bottomright: 0px - border-top-right-radius: 0px - border-bottom-right-radius: 0px > .oe_button float: right @include radius(0) @@ -1691,8 +1684,10 @@ $sheet-max-width: 860px position: relative span.oe_m2o_drop_down_button position: absolute - top: 1px + top: 2px right: 0px + .oe_m2o_cm_button + line-height: 14px // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager -- cgit v1.2.3