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.css | 50 +++++++++++++++++++++++++++++++++++++ addons/web/static/src/css/base.sass | 40 +++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 8df712d88d1..54284aa6be8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2215,6 +2215,56 @@ color: #333333; } +.openerp .tree_header { + background-color: #f0f0f0; + border-bottom: 1px solid #cacaca; + color: #4c4c4c; + padding: 5px; +} +.openerp .tree_header button { + float: right; +} +.openerp .oe-treeview-table { + width: 100%; + background-color: white; + border-spacing: 0; +} +.openerp .oe-treeview-table th { + padding: 10px; + color: #4c4c4c; + font-weight: bold; + background-color: #f0f0f0; + border-bottom: 2px solid #cacaca; +} +.openerp .oe-treeview-table .treeview-tr, .openerp .oe-treeview-table .treeview-td { + cursor: pointer; + border-right: 1px dotted #afafb6; + vertical-align: top; + text-align: left; + border-bottom: 1px solid #cfcccc; +} +.openerp .oe-treeview-table tr:hover { + background-color: #e0e0f8; +} +.openerp .oe-treeview-table .oe-number { + text-align: right !important; +} +.openerp .oe-treeview-table span { + font-size: 90%; + font-weight: normal; + white-space: nowrap; + display: block; +} +.openerp .oe-treeview-table .treeview-tr.oe-treeview-first { + background: transparent url(/web/static/src/img/expand.gif) 0 50% no-repeat; +} +.openerp .oe-treeview-table .oe_open .treeview-tr.oe-treeview-first { + background-image: url(/web/static/src/img/collapse.gif); +} +.openerp .oe-treeview-table .treeview-tr.oe-treeview-first span, .openerp .oe-treeview-table .treeview-td.oe-treeview-first span { + margin-left: 16px; +} + .kitten-mode-activated { background-image: url(http://placekitten.com/g/1365/769); background-size: cover; 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.css | 3 +++ addons/web/static/src/css/base.sass | 3 +++ 2 files changed, 6 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 54284aa6be8..e338cc309d9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2220,9 +2220,12 @@ border-bottom: 1px solid #cacaca; color: #4c4c4c; padding: 5px; + height: 25px; } .openerp .tree_header button { float: right; + height: 27px; + margin-right: 5px; } .openerp .oe-treeview-table { width: 100%; 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 d6100f371f185189ae452d6cb785a1f1a989415b Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 9 Jul 2012 17:02:57 +0200 Subject: Changed popup overlay and added style for label in kanban vignette bzr revid: mit@openerp.com-20120709150257-t50t470tyxmomrt4 --- addons/web/static/src/css/base.css | 6 ++++++ addons/web/static/src/css/base.sass | 3 +++ 2 files changed, 9 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 7bc210298db..a9c9508c4e5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2348,3 +2348,9 @@ .kitten-mode-activated > * { opacity: 0.7; } + +div.ui-widget-overlay { + background: black; + filter: alpha(opacity=30); + opacity: 0.3; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d5d271fe07d..ba858ca8877 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1850,5 +1850,8 @@ $colour4: #8a89ba opacity: 0.70 // }}} +div.ui-widget-overlay + background: black + @include opacity(0.3) // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: -- cgit v1.2.3 From 3c67b48a2ae96df1d0474da292b5272e13fb4090 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 9 Jul 2012 19:08:07 +0200 Subject: Improvements to dropdown menu, form view buttons and kanban vignette bzr revid: mit@openerp.com-20120709170807-f9x3v147bqamg7wd --- addons/web/static/src/css/base.css | 12 ++++++++---- addons/web/static/src/css/base.sass | 11 +++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a9c9508c4e5..a9e2ebaf6d0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -386,8 +386,11 @@ visibility: hidden; } .openerp .oe_button_box { - width: 200px; - text-align: center; + width: 38%; + text-align: right; +} +.openerp .oe_button_box button { + margin: 4px; } .openerp .oe_avatar { margin: 0 16px 0 0; @@ -536,7 +539,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: #888888; + color: #404040; font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { @@ -545,7 +548,8 @@ .openerp .oe_dropdown_menu { display: none; position: absolute; - top: 32px; + top: 26px; + left: 0; z-index: 1; border: 1px solid #afafb6; background: white; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ba858ca8877..8d13bf8b046 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -329,8 +329,10 @@ $colour4: #8a89ba clear: both visibility: hidden .oe_button_box - width: 200px - text-align: center + width: 38% + text-align: right + button + margin: 4px .oe_avatar margin: 0 16px 0 0 img @@ -431,14 +433,15 @@ $colour4: #8a89ba position: relative cursor: pointer .oe_dropdown_toggle - color: #888 + color: #404040 font-weight: normal .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened display: block .oe_dropdown_menu display: none position: absolute - top: 32px + top: 26px + left: 0 z-index: 1 border: 1px solid #afafb6 background: white -- cgit v1.2.3 From cbc1ed31b3a1584cd3fac8dc78e66765fd2250fe Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 10 Jul 2012 12:12:05 +0200 Subject: [IMP] better form css bzr revid: fp@tinyerp.com-20120710101205-y0im0xzehzw6jm9p --- addons/web/static/src/css/base.css | 36 ++++++++++++++++++++---------------- addons/web/static/src/css/base.sass | 32 ++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 30 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 36d26d10741..0c4362f4436 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1857,7 +1857,7 @@ .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; display: block; - min-width: 120px; + min-width: 110px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding-left: 6px; @@ -1929,9 +1929,10 @@ } .openerp .oe_form .oe_form_field_char input, .openerp .oe_form .oe_form_field_url input, +.openerp .oe_form .oe_form_field_email input, .openerp .oe_form .oe_form_field_text textarea, .openerp .oe_form .oe_form_field_selection select { - width: inherit; + width: 100%; } .openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea { width: 500px; @@ -2001,15 +2002,6 @@ -webkit-border-radius: 0px; border-radius: 0px; } -.openerp .oe_form .oe_form_field_many2one input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_url 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; -} .openerp .oe_form .oe_form_field_url button img { vertical-align: top; } @@ -2073,10 +2065,19 @@ right: 5px; top: 3px; } -.openerp .oe_form .oe_form_field_with_button input { - width: 100%; +.openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button { + display: none; } -.openerp .oe_form .oe_form_field_with_button > .oe_button { +.openerp .oe_form .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; +} +.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button { float: right; -moz-border-radius: 0; -webkit-border-radius: 0; @@ -2084,6 +2085,9 @@ border-bottom-left-radius: 0px; height: 22px; } +.openerp .oe_form .oe_form_field_with_button input { + width: 100%; +} .openerp .oe_form .oe_form_field_with_button > div { position: relative; overflow: hidden; @@ -2138,8 +2142,8 @@ } .openerp .oe_form_field_many2one span.oe_m2o_drop_down_button { position: absolute; - top: 3px; - right: 2px; + top: 1px; + right: 0px; } .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2ba3b79c411..fa71942c9da 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1449,7 +1449,7 @@ $sheet-max-width: 860px label line-height: 18px display: block - min-width: 120px + min-width: 110px td.oe_form_group_cell + .oe_form_group_cell padding-left: 6px .oe_form_group @@ -1512,9 +1512,10 @@ $sheet-max-width: 860px width: 100% .oe_form_field_char input, .oe_form_field_url input, + .oe_form_field_email input, .oe_form_field_text textarea, .oe_form_field_selection select - width: inherit + width: 100% .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea width: 500px .oe_form_field_float input @@ -1560,14 +1561,6 @@ $sheet-max-width: 860px padding-left: 8px @include box-shadow(none) @include radius(0px) - .oe_form_field_many2one input, .oe_form_field_binary input, .oe_form_field_binary input, .oe_form_field_url 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_form_field_url button img vertical-align: top .oe_form_field_date, @@ -1618,14 +1611,25 @@ $sheet-max-width: 860px filter: alpha(opacity=50) right: 5px top: 3px - .oe_form_field_with_button + .oe_form_field_with_button.oe_no_button > .oe_button + display: none + .oe_form_field_with_button:not(.oe_no_button) input - width: 100% + 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) border-bottom-left-radius: 0px height: 22px + .oe_form_field_with_button + input + width: 100% > div position: relative overflow: hidden @@ -1680,8 +1684,8 @@ $sheet-max-width: 860px position: relative span.oe_m2o_drop_down_button position: absolute - top: 3px - right: 2px + top: 1px + right: 0px // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager -- 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.css | 6 ------ addons/web/static/src/css/base.sass | 6 ------ 2 files changed, 12 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f9493f08e55..00d80d6085b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -188,13 +188,7 @@ } .openerp.ui-dialog { display: none; - position: fixed; padding: 6px; - top: 50%; - left: 50%; - z-index: 1050; - width: 560px; - margin: -150px 0 0 -280px; background-color: rgba(60, 60, 60, 0.7); border: 1px solid; border-color: #888888 #555555 #444444; 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.css | 5 +++-- addons/web/static/src/css/base.sass | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f9493f08e55..1db092caf8a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -34,7 +34,7 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp a { text-decoration: none; @@ -395,7 +395,7 @@ .openerp .oe_avatar { margin: 0 16px 0 0; } -.openerp .oe_avatar img { +.openerp .oe_avatar > img { height: 50px; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -2125,6 +2125,7 @@ } .openerp .oe_form .oe_form_field_image .oe_form_field_image_controls { position: absolute; + white-space: nowrap; top: 1px; padding: 3px 0 0 0; margin: 0 1px; 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