From 7e6d223e9e6e9ba232c9fa2b1e5629563f5e7a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Mon, 19 May 2014 14:16:09 +0200 Subject: [IMP] work on inline search view in web client incomplete work. So far, the search view widget has been split in two widgets: SearchView and SearchViewDrawer. The SearchViewDrawer has been inserted inline, and some preliminary work has been done to improve the layout. --- addons/web/static/src/css/base.css | 5 ++++- addons/web/static/src/css/base.sass | 4 +++- 2 files changed, 7 insertions(+), 2 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 f02dc3c7fd7..03066c171b4 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"); @@ -1776,6 +1776,9 @@ margin: 0 0 0 4px; padding: 0; } +.openerp .oe_searchview_drawer_container { + border-bottom: 1px solid #afafb6; +} .openerp .oe_view_nocontent { padding: 15px; margin-top: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c15c90abb7a..e1296924629 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1280,7 +1280,7 @@ $sheet-padding: 16px &.oe_searchview_open_drawer .oe_searchview_drawer display: block - + .oe_searchview_drawer cursor: default position: absolute @@ -1458,6 +1458,8 @@ $sheet-padding: 16px margin: 0 0 0 4px padding: 0 + .oe_searchview_drawer_container + border-bottom: 1px solid $tag-border // }}} // Views Common {{{ -- cgit v1.2.3 From 646de9e5afbd448f19e683e5811e8169fb6b023c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Mon, 19 May 2014 15:40:45 +0200 Subject: [FIX] add support for default filters in search view support for default filters was broken in the previous commit, now it works again. --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (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 03066c171b4..ade49c3b1fe 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1778,6 +1778,7 @@ } .openerp .oe_searchview_drawer_container { border-bottom: 1px solid #afafb6; + overflow: auto; } .openerp .oe_view_nocontent { padding: 15px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e1296924629..d85b55d854c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1280,7 +1280,7 @@ $sheet-padding: 16px &.oe_searchview_open_drawer .oe_searchview_drawer display: block - + .oe_searchview_drawer cursor: default position: absolute @@ -1460,6 +1460,7 @@ $sheet-padding: 16px .oe_searchview_drawer_container border-bottom: 1px solid $tag-border + overflow: auto // }}} // Views Common {{{ -- cgit v1.2.3 From c70df56174be6611bda2a18b14b5145fa365dfe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Mon, 19 May 2014 17:03:05 +0200 Subject: [IMP] lots of layout work for inline search view (addon web) mainly to correctly style the custom filters list. --- addons/web/static/src/css/base.css | 200 ++++++++++++++++++++++++++++++++++++ addons/web/static/src/css/base.sass | 164 +++++++++++++++++++++++++++++ 2 files changed, 364 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 ade49c3b1fe..085e0d5e08e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1780,6 +1780,206 @@ border-bottom: 1px solid #afafb6; overflow: auto; } +.openerp .oe_searchview_drawer { + cursor: default; + display: none; + overflow: hidden; + border-bottom: 1px solid #afafb6; + border-right: 1px solid #afafb6; + text-align: left; + padding: 8px 0; +} +.openerp .oe_searchview_drawer .badge { + font-size: 12px; + line-height: 12px; +} +.openerp .oe_searchview_drawer > div:first-child { + border: none; + padding-left: 0; +} +.openerp .oe_searchview_drawer > div:first-child li:hover:not(.badge) { + background-color: #f0f0fa; +} +.openerp .oe_searchview_drawer .col-md-5 { + padding-left: 0; +} +.openerp .oe_searchview_drawer dl { + margin-bottom: 10px; +} +.openerp .oe_searchview_drawer dt { + color: #7c7bad; + font-size: 13px; + line-height: 24px; +} +.openerp .oe_searchview_drawer dd { + line-height: 24px; + font-size: 13px; + padding-top: 3px; +} +.openerp .oe_searchview_drawer h4, .openerp .oe_searchview_drawer h4 * { + margin: 0 0 0 2px; + padding-left: 20px; + cursor: pointer; + font-weight: normal; + display: inline-block; +} +.openerp .oe_searchview_drawer h4:hover, .openerp .oe_searchview_drawer h4 *:hover { + background-color: #f0f0fa; +} +.openerp .oe_searchview_drawer h4:before { + content: "▸ "; + color: #a3a3a3; +} +.openerp .oe_searchview_drawer button { + margin: 4px 0; +} +.openerp .oe_searchview_drawer .button { + border: none; + background: transparent; + padding: 0 2px; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; +} +.openerp .oe_searchview_drawer .oe_searchview_section ul { + margin: 0 8px; + padding: 0; + list-style: none; + display: inline; +} +.openerp .oe_searchview_drawer .oe_searchview_section li { + display: inline-block; + cursor: pointer; + position: relative; + margin-right: 8px; +} +.openerp .oe_searchview_drawer form { + margin-left: 12px; +} +.openerp .oe_searchview_drawer form p { + margin: 4px 0; + line-height: 18px; +} +.openerp .oe_searchview_drawer form button { + margin: 0 0 8px -3px; +} +.openerp .oe_searchview_drawer .oe_searchview_custom dt { + width: 140px; +} +.openerp .oe_searchview_drawer .oe_searchview_custom dd { + margin-left: 145px; +} +.openerp .oe_searchview_drawer .oe_searchview_custom form { + display: none; +} +.openerp .oe_searchview_drawer .oe_searchview_custom li { + cursor: pointer; + position: relative; + line-height: 14px; + margin-right: 0; +} +.openerp .oe_searchview_drawer .oe_searchview_custom li button { + position: absolute; + top: 0; + right: 5px; +} +.openerp .oe_searchview_drawer .oe_searchview_custom li a { + margin-left: 10px; + position: inherit; + visibility: hidden; + display: inline-block; +} +.openerp .oe_searchview_drawer .oe_searchview_custom li span:hover:not(.badge) { + background-color: #f0f0fa; +} +.openerp .oe_searchview_drawer .oe_searchview_custom li:hover a { + visibility: visible; +} +.openerp .oe_searchview_drawer .oe_searchview_custom label { + font-weight: normal; +} +.openerp .oe_searchview_drawer .oe_searchview_dashboard form { + display: none; + margin-top: 2px; +} +.openerp .oe_searchview_drawer .oe_searchview_advanced form { + display: none; + margin-top: 8px; +} +.openerp .oe_searchview_drawer .oe_searchview_advanced button.oe_add_condition:before { + content: "Z"; + font-family: "entypoRegular" !important; + font-size: 24px; + font-weight: 300 !important; + margin-right: 4px; +} +.openerp .oe_searchview_drawer .oe_searchview_advanced ul { + list-style: none; + padding: 0; +} +.openerp .oe_searchview_drawer .oe_searchview_advanced li { + position: relative; + list-style: none; + margin: 0; + white-space: nowrap; +} +.openerp .oe_searchview_drawer .oe_searchview_advanced li:first-child .searchview_extended_prop_or { + visibility: hidden; + margin-left: -14px; +} +.openerp .oe_searchview_drawer .oe_searchview_advanced .searchview_extended_prop_or { + opacity: 0.5; + margin-left: -14px; +} +.openerp .oe_searchview_drawer .oe_opened h4:before { + content: "▾ "; + position: relative; + top: -1px; +} +.openerp .oe_searchview_drawer .oe_opened form { + display: block; +} +.openerp .oe_searchview_drawer .oe_searchview_custom_delete, .openerp .oe_searchview_drawer .searchview_extended_delete_prop { + display: inline-block; + width: 12px; + height: 12px; + line-height: 12px; + padding: 1px; + color: #8786b7; + line-height: 8px; + text-align: center; + font-weight: bold; + text-shadow: 0 1px 1px white; +} +.openerp .oe_searchview_drawer .oe_searchview_custom_delete:hover, .openerp .oe_searchview_drawer .searchview_extended_delete_prop:hover { + text-decoration: none; + color: white; + background: #8786b7; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; +} +.openerp .oe_searchview_drawer .oe_searchview_custom_delete { + display: none; + position: absolute; + bottom: 1px; + right: 4px; +} +.openerp .oe_searchview_drawer .oe_searchview_custom_private:hover .oe_searchview_custom_delete, .openerp .oe_searchview_drawer .oe_searchview_custom_public:hover .oe_searchview_custom_delete { + display: inline-block; +} +.openerp .oe_searchview_drawer .oe_searchview_custom_public:after { + content: ","; + font-family: "entypoRegular" !important; + font-size: 22px; + font-weight: 300 !important; + margin: 0 0 0 4px; + padding: 0; +} .openerp .oe_view_nocontent { padding: 15px; margin-top: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d85b55d854c..9b02b20b82a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1461,7 +1461,171 @@ $sheet-padding: 16px .oe_searchview_drawer_container border-bottom: 1px solid $tag-border overflow: auto + .oe_searchview_drawer + cursor: default + display: none + overflow: hidden + border-bottom: 1px solid $tag-border + border-right: 1px solid $tag-border + text-align: left + padding: 8px 0 + .badge + font-size: 12px + line-height: 12px + > div:first-child + border: none + padding-left: 0 + li:hover:not(.badge) + background-color: $hover-background + .col-md-5 + padding-left: 0 + dl + margin-bottom: 10px + dt + color: $section-title-color + font-size: 13px + line-height: 24px + dd + line-height: 24px + font-size: 13px + padding-top: 3px + h4, h4 * + margin: 0 0 0 2px + padding-left: 20px + cursor: pointer + font-weight: normal + display: inline-block + &:hover + background-color: $hover-background + h4:before + content: "▸ " + color: #a3a3a3 + button + margin: 4px 0 + .button + border: none + background: transparent + padding: 0 2px + @include box-shadow(none) + @include radius(0) + .oe_searchview_section + ul + margin: 0 8px + padding: 0 + list-style: none + display: inline + li + display: inline-block + cursor: pointer + position: relative + margin-right: 8px + form + margin-left: 12px + p + margin: 4px 0 + line-height: 18px + button + margin: 0 0 8px -3px // Managed margin-left according bootstrap3 + .oe_searchview_custom + dt + width: 140px + dd + margin-left: 145px + form + display: none + li + cursor: pointer + position: relative + line-height: 14px + margin-right: 0 + button + position: absolute + top: 0 + right: 5px + a + margin-left: 10px + position: inherit + visibility: hidden + display: inline-block + span:hover:not(.badge) + background-color: $hover-background + li:hover a + visibility: visible + //Customize for searchview label + label + font-weight: normal + //End of Customize + .oe_searchview_dashboard + form + display: none + margin-top: 2px + .oe_searchview_advanced + form + display: none + margin-top: 8px + button.oe_add_condition:before + content: "Z" + font-family: "entypoRegular" !important + font-size: 24px + font-weight: 300 !important + margin-right: 4px + ul + list-style: none + padding: 0 + li + position: relative + list-style: none + margin: 0 + white-space: nowrap + &:first-child .searchview_extended_prop_or + visibility: hidden + margin-left: -14px + .searchview_extended_prop_or + opacity: 0.5 + margin-left: -14px //Customize 'or' in searchview + .oe_opened + h4:before + content: "▾ " + position: relative + top: -1px + form + display: block + + // delete buttons + .oe_searchview_custom_delete, .searchview_extended_delete_prop + display: inline-block + width: 12px + height: 12px + line-height: 12px + padding: 1px + color: #8786b7 + line-height: 8px + text-align: center + font-weight: bold + text-shadow: 0 1px 1px white + &:hover + text-decoration: none + color: white + background: #8786b7 + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) + @include radius(2px) + .oe_searchview_custom_delete + display: none + position: absolute + bottom: 1px + right: 4px + .oe_searchview_custom_private, .oe_searchview_custom_public + &:hover + .oe_searchview_custom_delete + display: inline-block + .oe_searchview_custom_public:after + content: "," + font-family: "entypoRegular" !important + font-size: 22px + font-weight: 300 !important + margin: 0 0 0 4px + padding: 0 // }}} // Views Common {{{ .oe_view_nocontent -- cgit v1.2.3 From 1c32d931159cb420d3f6ff51d6d21beb674d9c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Tue, 20 May 2014 11:41:28 +0200 Subject: [FIX] correctly display the searchview/drawer (addon web) the searchview has been splitted in two widgets: SearchView and SearchViewDrawer. They are dependent of each other, so a drawer has to be created for each searchview. This was not the case in some form views (inline, created by a wizard). --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + 2 files changed, 2 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 085e0d5e08e..dda3a83c9f8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1781,6 +1781,7 @@ overflow: auto; } .openerp .oe_searchview_drawer { + width: 100%; cursor: default; display: none; overflow: hidden; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 9b02b20b82a..1069de614f5 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1462,6 +1462,7 @@ $sheet-padding: 16px border-bottom: 1px solid $tag-border overflow: auto .oe_searchview_drawer + width: 100% cursor: default display: none overflow: hidden -- cgit v1.2.3 From 2c8dec5daacb68048e08d9c2037412c1acc0dafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Tue, 20 May 2014 11:56:06 +0200 Subject: [FIX] remove an extra border-bottom css rule (addon web) the border-bottom was set on drawer_container and on drawer, resulting in a double border. --- addons/web/static/src/css/base.css | 1 - addons/web/static/src/css/base.sass | 1 - 2 files changed, 2 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 dda3a83c9f8..000a0a0135c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1777,7 +1777,6 @@ padding: 0; } .openerp .oe_searchview_drawer_container { - border-bottom: 1px solid #afafb6; overflow: auto; } .openerp .oe_searchview_drawer { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1069de614f5..9380af85057 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1459,7 +1459,6 @@ $sheet-padding: 16px padding: 0 .oe_searchview_drawer_container - border-bottom: 1px solid $tag-border overflow: auto .oe_searchview_drawer width: 100% -- cgit v1.2.3 From aec3ba08ae6b8ec50c8f1cb57ae510f567556d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Wed, 21 May 2014 13:18:30 +0200 Subject: [IMP] improvements to inline searchview (web) this commit splits the widget CustomFilters in two widgets: CustomReports and SaveFilter. CustomReports is the widget displaying the list of reports, and SaveFilter obviously is the Save Current Filter widget. The goal was to put the custom reports in the first column and the Save Current Filter form in the second. --- addons/web/static/src/css/base.css | 228 +----------------------------------- addons/web/static/src/css/base.sass | 186 +---------------------------- 2 files changed, 2 insertions(+), 412 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 000a0a0135c..f46a0de5836 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1556,226 +1556,6 @@ -webkit-border-radius: 2px; border-radius: 2px; } -.openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer { - display: block; -} -.openerp .oe_searchview .oe_searchview_drawer { - cursor: default; - position: absolute; - z-index: 2; - margin-top: 4px; - top: 100%; - right: -1px; - background-color: white; - min-width: 100%; - display: none; - border: 1px solid #afafb6; - text-align: left; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); -} -.openerp .oe_searchview .oe_searchview_drawer > div { - border-top: 1px solid #cccccc; - margin: 0; - padding: 8px; -} -.openerp .oe_searchview .oe_searchview_drawer > div:first-child { - border-top: none; - margin: 0; -} -.openerp .oe_searchview .oe_searchview_drawer h3 { - margin: 8px 4px 4px 0px; - color: #7c7bad; - font-size: 13px; -} -.openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { - margin: 0 0 0 2px; - cursor: pointer; - font-weight: normal; - display: inline-block; -} -.openerp .oe_searchview .oe_searchview_drawer h4:hover, .openerp .oe_searchview .oe_searchview_drawer h4 *:hover { - background-color: #f0f0fa; -} -.openerp .oe_searchview .oe_searchview_drawer h4:before { - content: "▸ "; - color: #a3a3a3; -} -.openerp .oe_searchview .oe_searchview_drawer button { - margin: 4px 0; -} -.openerp .oe_searchview .oe_searchview_drawer .button { - border: none; - background: transparent; - padding: 0 2px; - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; - -moz-border-radius: 0; - -webkit-border-radius: 0; - border-radius: 0; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section { - display: table; - width: 100%; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section > div { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - display: table-cell; - width: 50%; - padding-left: 2px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section ul { - margin: 0 8px 8px; - padding: 0; - list-style: none; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section li { - list-style: none; - padding: 2px 4px 2px 20px; - line-height: 14px; - color: inherit; - cursor: pointer; - position: relative; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section li.oe_selected:before { - content: "W"; - font-family: "entypoRegular" !important; - font-size: 24px; - font-weight: 300 !important; - color: #a3a3a3; - position: absolute; - left: 4px; - top: -2px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section li:hover { - background-color: #f0f0fa; -} -.openerp .oe_searchview .oe_searchview_drawer form { - margin-left: 12px; -} -.openerp .oe_searchview .oe_searchview_drawer form p { - margin: 4px 0; - line-height: 18px; -} -.openerp .oe_searchview .oe_searchview_drawer form button { - margin: 0 0 8px -3px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom { - padding: 0 8px 8px 8px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom div { - padding: 0; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom div h4 { - margin: 0; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form { - display: none; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li { - cursor: pointer; - position: relative; - line-height: 14px; - padding: 2px 4px 2px 20px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li:hover { - background-color: #f0f0fa; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li button { - position: absolute; - top: 0; - right: 5px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom label { - font-weight: normal; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_dashboard form { - display: none; - margin-top: 2px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced form { - display: none; - margin-top: 8px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_add_condition:before { - content: "Z"; - font-family: "entypoRegular" !important; - font-size: 24px; - font-weight: 300 !important; - margin-right: 4px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced ul { - list-style: none; - padding: 0; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li { - position: relative; - list-style: none; - margin: 0; - white-space: nowrap; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li:first-child .searchview_extended_prop_or { - visibility: hidden; - margin-left: -14px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced .searchview_extended_prop_or { - opacity: 0.5; - margin-left: -14px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_opened h4:before { - content: "▾ "; - position: relative; - top: -1px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_opened form { - display: block; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete, .openerp .oe_searchview .oe_searchview_drawer .searchview_extended_delete_prop { - display: inline-block; - width: 12px; - height: 12px; - line-height: 12px; - padding: 1px; - color: #8786b7; - line-height: 8px; - text-align: center; - font-weight: bold; - text-shadow: 0 1px 1px white; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete:hover, .openerp .oe_searchview .oe_searchview_drawer .searchview_extended_delete_prop:hover { - text-decoration: none; - color: white; - background: #8786b7; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete { - display: none; - position: absolute; - bottom: 1px; - right: 4px; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_private:hover .oe_searchview_custom_delete, .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_public:hover .oe_searchview_custom_delete { - display: inline-block; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_public:after { - content: ","; - font-family: "entypoRegular" !important; - font-size: 22px; - font-weight: 300 !important; - margin: 0 0 0 4px; - padding: 0; -} .openerp .oe_searchview_drawer_container { overflow: auto; } @@ -1804,7 +1584,7 @@ padding-left: 0; } .openerp .oe_searchview_drawer dl { - margin-bottom: 10px; + margin-bottom: 0; } .openerp .oe_searchview_drawer dt { color: #7c7bad; @@ -1866,12 +1646,6 @@ .openerp .oe_searchview_drawer form button { margin: 0 0 8px -3px; } -.openerp .oe_searchview_drawer .oe_searchview_custom dt { - width: 140px; -} -.openerp .oe_searchview_drawer .oe_searchview_custom dd { - margin-left: 145px; -} .openerp .oe_searchview_drawer .oe_searchview_custom form { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 9380af85057..18da5a7098c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1277,186 +1277,6 @@ $sheet-padding: 16px background: #8786b7 text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) @include radius(2px) - &.oe_searchview_open_drawer - .oe_searchview_drawer - display: block - - .oe_searchview_drawer - cursor: default - position: absolute - z-index: 2 - // detach drawer from field slightly - margin-top: 4px - top: 100% - right: -1px - background-color: white - min-width: 100% - display: none - border: 1px solid $tag-border - text-align: left - @include radius(4px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - > div - border-top: 1px solid #ccc - margin: 0 - padding: 8px - > div:first-child - border-top: none - margin: 0 - h3 - margin: 8px 4px 4px 0px - color: $section-title-color - font-size: 13px - h4, h4 * - margin: 0 0 0 2px - cursor: pointer - font-weight: normal - display: inline-block - &:hover - background-color: $hover-background - h4:before - content: "▸ " - color: #a3a3a3 - button - margin: 4px 0 - .button - border: none - background: transparent - padding: 0 2px - @include box-shadow(none) - @include radius(0) - .oe_searchview_section - display: table - width: 100% - > div - @include box-sizing(border) - display: table-cell - width: 50% - padding-left: 2px // Managed padding-left according bootstrap3 - ul - margin: 0 8px 8px - padding: 0 - list-style: none - li - list-style: none - padding: 2px 4px 2px 20px - line-height: 14px - color: inherit - cursor: pointer - position: relative - &.oe_selected:before - content: "W" - font-family: "entypoRegular" !important - font-size: 24px - font-weight: 300 !important - color: #a3a3a3 - position: absolute - left: 4px - top: -2px - // after oe_selected so background color is not overridden - &:hover - background-color: $hover-background - form - margin-left: 12px - p - margin: 4px 0 - line-height: 18px - button - margin: 0 0 8px -3px // Managed margin-left according bootstrap3 - .oe_searchview_custom - padding: 0 8px 8px 8px - div - padding: 0 - h4 - margin: 0 - form - display: none - li - cursor: pointer - position: relative - line-height: 14px - padding: 2px 4px 2px 20px - &:hover - background-color: $hover-background - button - position: absolute - top: 0 - right: 5px - //Customize for searchview label - label - font-weight: normal - //End of Customize - .oe_searchview_dashboard - form - display: none - margin-top: 2px - - .oe_searchview_advanced - form - display: none - margin-top: 8px - button.oe_add_condition:before - content: "Z" - font-family: "entypoRegular" !important - font-size: 24px - font-weight: 300 !important - margin-right: 4px - ul - list-style: none - padding: 0 - li - position: relative - list-style: none - margin: 0 - white-space: nowrap - &:first-child .searchview_extended_prop_or - visibility: hidden - margin-left: -14px - .searchview_extended_prop_or - opacity: 0.5 - margin-left: -14px //Customize 'or' in searchview - .oe_opened - h4:before - content: "▾ " - position: relative - top: -1px - form - display: block - - // delete buttons - .oe_searchview_custom_delete, .searchview_extended_delete_prop - display: inline-block - width: 12px - height: 12px - line-height: 12px - padding: 1px - color: #8786b7 - line-height: 8px - text-align: center - font-weight: bold - text-shadow: 0 1px 1px white - &:hover - text-decoration: none - color: white - background: #8786b7 - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) - @include radius(2px) - .oe_searchview_custom_delete - display: none - position: absolute - bottom: 1px - right: 4px - .oe_searchview_custom_private, .oe_searchview_custom_public - &:hover - .oe_searchview_custom_delete - display: inline-block - .oe_searchview_custom_public:after - content: "," - font-family: "entypoRegular" !important - font-size: 22px - font-weight: 300 !important - margin: 0 0 0 4px - padding: 0 .oe_searchview_drawer_container overflow: auto @@ -1480,7 +1300,7 @@ $sheet-padding: 16px .col-md-5 padding-left: 0 dl - margin-bottom: 10px + margin-bottom: 0 dt color: $section-title-color font-size: 13px @@ -1527,10 +1347,6 @@ $sheet-padding: 16px button margin: 0 0 8px -3px // Managed margin-left according bootstrap3 .oe_searchview_custom - dt - width: 140px - dd - margin-left: 145px form display: none li -- cgit v1.2.3 From 088b33d0bcff1ccb641ebec8712bec13ff39af45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Fri, 23 May 2014 15:09:48 +0200 Subject: [IMP] change scrollable area to main view Now, only the main view is supposed to scroll (the part below the header with the view selector). The left menu, top bar and header are supposed to stay fixed. This is done by carefully using position:relative and absolute. However, this is likely to introduce some (many?) issues, perhaps with tooltips position and such. The bug hunt is on! --- addons/web/static/src/css/base.css | 12 +++++++++++- addons/web/static/src/css/base.sass | 10 +++++++++- 2 files changed, 20 insertions(+), 2 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 f46a0de5836..25e5d861648 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1156,9 +1156,15 @@ display: table; height: inherit; width: 100%; + position: relative; } .openerp .oe_view_manager .oe_view_manager_body { - height: inherit; + position: absolute; + overflow: auto; + top: 90px; + bottom: 0; + left: 0; + right: 0; } .openerp .oe_view_manager .oe_view_manager_view_kanban:not(:empty) { height: inherit; @@ -3401,3 +3407,7 @@ input[type="radio"], input[type="checkbox"] { background-color: black; opacity: 0.6; } + +body { + overflow: hidden; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 18da5a7098c..f2815adbf72 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -970,8 +970,14 @@ $sheet-padding: 16px display: table height: inherit width: 100% + position: relative .oe_view_manager_body - height: inherit + position: absolute + overflow: auto + top: 90px + bottom: 0 + left: 0 + right: 0 .oe_view_manager_view_kanban:not(:empty) height: inherit &[data-view-type=kanban] @@ -2762,5 +2768,7 @@ input[type="radio"], input[type="checkbox"] opacity: 0.6000000238418579 +body + overflow: hidden // 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 3c468073d481d203856c4fad575eee49f2317c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Fri, 23 May 2014 15:51:57 +0200 Subject: [IMP] small css tweaks correct a few problems introduced by the change to the scrolling area. Note: body is in overflow:auto to allow scrolling when there is no view manager (for example, client action) --- addons/web/static/src/css/base.css | 6 +++--- addons/web/static/src/css/base.sass | 6 +++--- 2 files changed, 6 insertions(+), 6 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 25e5d861648..c9e70201b97 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1135,6 +1135,7 @@ .openerp .oe_application { width: 100%; height: 100%; + position: relative; } .openerp .oe_application a { color: #7c7bad; @@ -1156,7 +1157,6 @@ display: table; height: inherit; width: 100%; - position: relative; } .openerp .oe_view_manager .oe_view_manager_body { position: absolute; @@ -1167,7 +1167,7 @@ right: 0; } .openerp .oe_view_manager .oe_view_manager_view_kanban:not(:empty) { - height: inherit; + height: 100%; } .openerp .oe_view_manager[data-view-type=kanban] .oe_view_manager_body { display: table-row; @@ -3409,5 +3409,5 @@ input[type="radio"], input[type="checkbox"] { } body { - overflow: hidden; + overflow: auto; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f2815adbf72..72c71070e41 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -952,6 +952,7 @@ $sheet-padding: 16px .oe_application width: 100% height: 100% + position: relative a color: $link-color > div @@ -970,7 +971,6 @@ $sheet-padding: 16px display: table height: inherit width: 100% - position: relative .oe_view_manager_body position: absolute overflow: auto @@ -979,7 +979,7 @@ $sheet-padding: 16px left: 0 right: 0 .oe_view_manager_view_kanban:not(:empty) - height: inherit + height: 100% &[data-view-type=kanban] .oe_view_manager_body display: table-row @@ -2769,6 +2769,6 @@ input[type="radio"], input[type="checkbox"] body - overflow: hidden + overflow: auto // 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 b374cf0089afa95228e66e614b5c15a78d559c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Fri, 23 May 2014 16:07:42 +0200 Subject: [IMP] fix a css problem with multiple view_manager when a view_manager is contained inside another, the css rule for defining a scrollable zone (with position:absolute) was also applied to the inside view manager. --- addons/web/static/src/css/base.css | 16 ++++++++-------- addons/web/static/src/css/base.sass | 16 +++++++++------- 2 files changed, 17 insertions(+), 15 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 c9e70201b97..8f8db21a2a7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1143,6 +1143,14 @@ .openerp .oe_application > div { height: 100%; } +.openerp .oe_application > div > .oe_view_manager > .oe_view_manager_body { + position: absolute; + overflow: auto; + top: 90px; + bottom: 0; + left: 0; + right: 0; +} .openerp .oe_application .oe_breadcrumb_item:not(:last-child) { max-width: 7em; white-space: nowrap; @@ -1158,14 +1166,6 @@ height: inherit; width: 100%; } -.openerp .oe_view_manager .oe_view_manager_body { - position: absolute; - overflow: auto; - top: 90px; - bottom: 0; - left: 0; - right: 0; -} .openerp .oe_view_manager .oe_view_manager_view_kanban:not(:empty) { height: 100%; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 72c71070e41..d70b03006f0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -957,6 +957,15 @@ $sheet-padding: 16px color: $link-color > div height: 100% + > .oe_view_manager + > .oe_view_manager_body + position: absolute + overflow: auto + top: 90px + bottom: 0 + left: 0 + right: 0 + .oe_breadcrumb_item:not(:last-child) max-width: 7em white-space: nowrap @@ -971,13 +980,6 @@ $sheet-padding: 16px display: table height: inherit width: 100% - .oe_view_manager_body - position: absolute - overflow: auto - top: 90px - bottom: 0 - left: 0 - right: 0 .oe_view_manager_view_kanban:not(:empty) height: 100% &[data-view-type=kanban] -- cgit v1.2.3 From 779aabfc5b2908b8f2fd42a7c15f866c403cdc61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Fri, 23 May 2014 17:06:50 +0200 Subject: [FIX] various css fixes related to scrolling (1) it seems that position:relative behaviour is undefined in a td, so it has been moved to the div below oe_application (2) the left menu bar can now scroll vertically if necessary. --- addons/web/static/src/css/base.css | 6 +++++- addons/web/static/src/css/base.sass | 5 ++++- 2 files changed, 9 insertions(+), 2 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 8f8db21a2a7..5a95ee15a32 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -996,6 +996,10 @@ text-shadow: none; padding-bottom: 16px; } +.openerp .oe_leftbar > div { + max-height: 100%; + overflow-y: auto; +} .openerp a.oe_logo { position: relative; width: 220px; @@ -1135,12 +1139,12 @@ .openerp .oe_application { width: 100%; height: 100%; - position: relative; } .openerp .oe_application a { color: #7c7bad; } .openerp .oe_application > div { + position: relative; height: 100%; } .openerp .oe_application > div > .oe_view_manager > .oe_view_manager_body { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d70b03006f0..df5689c4574 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -845,6 +845,9 @@ $sheet-padding: 16px border-right: 1px solid $tag-border text-shadow: none padding-bottom: 16px + > div + max-height: 100% + overflow-y: auto a.oe_logo position: relative width: 220px @@ -952,10 +955,10 @@ $sheet-padding: 16px .oe_application width: 100% height: 100% - position: relative a color: $link-color > div + position: relative height: 100% > .oe_view_manager > .oe_view_manager_body -- cgit v1.2.3 From 6e6ae4cbf94e9ff8a4cccab3da2417aec3dfbc0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Mon, 26 May 2014 09:37:16 +0200 Subject: [IMP] improves the scrolling behaviour the mail menu is a client action, so not subject to the same template as regular views. so, it had to be patched to properly scroll like other views (meaning: the 'header', left menu and top menu are fixed) Also, changes the width of the searchbbar into a min-width css property, to allow it to grow more. The reason is that we don't want the searchbox to take two lines (or more), which will force the view_manager_header to be higher, and which will cause slight issues with the scrollbar (absolutely positioned) --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 4 insertions(+), 4 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 5a95ee15a32..c62b2045553 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1150,7 +1150,7 @@ .openerp .oe_application > div > .oe_view_manager > .oe_view_manager_body { position: absolute; overflow: auto; - top: 90px; + top: 91px; bottom: 0; left: 0; right: 0; @@ -1391,7 +1391,7 @@ float: right; padding: 1px 0; line-height: 18px; - width: 400px; + min-width: 400px; border: 1px solid #ababab; background: white; -moz-border-radius: 13px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index df5689c4574..0a41275f9e8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -964,7 +964,7 @@ $sheet-padding: 16px > .oe_view_manager_body position: absolute overflow: auto - top: 90px + top: 91px bottom: 0 left: 0 right: 0 @@ -1161,7 +1161,7 @@ $sheet-padding: 16px float: right padding: 1px 0 line-height: 18px - width: 400px + min-width: 400px border: 1px solid #ababab background: white @include radius(13px) -- cgit v1.2.3 From 14d4cd4ad481843c7d1d233591172ad2119b4737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Mon, 26 May 2014 13:32:27 +0200 Subject: [FIX] remove a useless border (css fix) --- addons/web/static/src/css/base.css | 1 - addons/web/static/src/css/base.sass | 1 - 2 files changed, 2 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 c62b2045553..ab156b283b9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1575,7 +1575,6 @@ display: none; overflow: hidden; border-bottom: 1px solid #afafb6; - border-right: 1px solid #afafb6; text-align: left; padding: 8px 0; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0a41275f9e8..e2305826cb6 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1297,7 +1297,6 @@ $sheet-padding: 16px display: none overflow: hidden border-bottom: 1px solid $tag-border - border-right: 1px solid $tag-border text-align: left padding: 8px 0 .badge -- cgit v1.2.3 From 5e367d958cdebdf4c2659c2d7fe0823cdf363bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Mon, 26 May 2014 14:51:47 +0200 Subject: [FIX] adjust view top when header height changes the header height is not fixed, it can change when the breadcrumbs start a new line, or when there is only one view type (for ex, in most reporting views). So, the top value of the view_manager_body has to be adjusted accordingly. --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 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 ab156b283b9..53be627f486 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1150,7 +1150,7 @@ .openerp .oe_application > div > .oe_view_manager > .oe_view_manager_body { position: absolute; overflow: auto; - top: 91px; + top: 66px; bottom: 0; left: 0; right: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e2305826cb6..1cea0a006f7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -964,7 +964,7 @@ $sheet-padding: 16px > .oe_view_manager_body position: absolute overflow: auto - top: 91px + top: 66px bottom: 0 left: 0 right: 0 -- cgit v1.2.3 From e9732dab8d1bf0aceec6f5e9bb73875c29d23452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Mon, 26 May 2014 15:45:28 +0200 Subject: [FIX] fix various issues with the drawer (addon web) * separate the css class oe_searchview_custom into oe_searchview_custom and oe_searchview_savefilter to be able to style them independently * by default, the drawer has display:none * fix a bug occuring when the user removed a custom filter (it hid the remaining filters) --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 4 +++- 2 files changed, 4 insertions(+), 2 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 53be627f486..7a9250a60fc 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1655,7 +1655,7 @@ .openerp .oe_searchview_drawer form button { margin: 0 0 8px -3px; } -.openerp .oe_searchview_drawer .oe_searchview_custom form { +.openerp .oe_searchview_drawer .oe_searchview_savefilter form { display: none; } .openerp .oe_searchview_drawer .oe_searchview_custom li { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1cea0a006f7..8c78cf6165c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1292,6 +1292,7 @@ $sheet-padding: 16px .oe_searchview_drawer_container overflow: auto .oe_searchview_drawer + display:none width: 100% cursor: default display: none @@ -1356,9 +1357,10 @@ $sheet-padding: 16px line-height: 18px button margin: 0 0 8px -3px // Managed margin-left according bootstrap3 - .oe_searchview_custom + .oe_searchview_savefilter form display: none + .oe_searchview_custom li cursor: pointer position: relative -- cgit v1.2.3 From d657f0f59831433c1487c26f4f1b7b25ed5953ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Mon, 26 May 2014 16:29:54 +0200 Subject: [FIX] corrects some display problem in addon web the drawer was displayed for all views instead of only graph views --- addons/web/static/src/css/base.css | 4 ++++ addons/web/static/src/css/base.sass | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (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 7a9250a60fc..ddf454b74ee 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1570,6 +1570,7 @@ overflow: auto; } .openerp .oe_searchview_drawer { + display: none; width: 100%; cursor: default; display: none; @@ -1658,6 +1659,9 @@ .openerp .oe_searchview_drawer .oe_searchview_savefilter form { display: none; } +.openerp .oe_searchview_drawer .oe_searchview_custom { + display: none; +} .openerp .oe_searchview_drawer .oe_searchview_custom li { cursor: pointer; position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8c78cf6165c..ec449bd32ac 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1292,7 +1292,7 @@ $sheet-padding: 16px .oe_searchview_drawer_container overflow: auto .oe_searchview_drawer - display:none + display: none width: 100% cursor: default display: none @@ -1361,6 +1361,7 @@ $sheet-padding: 16px form display: none .oe_searchview_custom + display: none li cursor: pointer position: relative -- cgit v1.2.3 From 18581ad8519c58f0523f101b0920b8dbebcc0a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Fri, 30 May 2014 12:12:49 +0200 Subject: [FIX] crop the text in drawer when it is too long --- addons/web/static/src/css/base.css | 7 +++++++ addons/web/static/src/css/base.sass | 6 ++++++ 2 files changed, 13 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 ddf454b74ee..a52a96ef26e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1646,6 +1646,13 @@ position: relative; margin-right: 8px; } +.openerp .oe_searchview_drawer .oe_searchview_section li > span { + display: inline-block; + max-width: 250px; + text-overflow: ellipsis; + vertical-align: bottom; + overflow: hidden; +} .openerp .oe_searchview_drawer form { margin-left: 12px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ec449bd32ac..42542a61f7e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1350,6 +1350,12 @@ $sheet-padding: 16px cursor: pointer position: relative margin-right: 8px + > span + display: inline-block + max-width: 250px + text-overflow: ellipsis + vertical-align: bottom + overflow: hidden form margin-left: 12px p -- cgit v1.2.3 From 803b8b0b14db74301a43ab10cfaacfa3bfc539fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Fri, 30 May 2014 12:15:48 +0200 Subject: [FIX] change css to prevent unreachable fields in drawer, advanced search, it can happen that the form extends out of the drawer. Overflow:auto at least allows the user to interact properly with the form. --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 1 + 2 files changed, 4 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 a52a96ef26e..0d14b82d5f5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1699,6 +1699,9 @@ display: none; margin-top: 2px; } +.openerp .oe_searchview_drawer .oe_searchview_advanced { + overflow: auto; +} .openerp .oe_searchview_drawer .oe_searchview_advanced form { display: none; margin-top: 8px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 42542a61f7e..100406caf85 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1396,6 +1396,7 @@ $sheet-padding: 16px margin-top: 2px .oe_searchview_advanced + overflow: auto form display: none margin-top: 8px -- cgit v1.2.3 From 63c702f00960ef195e7f83ea671be62b645cab6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Tue, 10 Jun 2014 16:22:02 +0200 Subject: [IMP] better layout with pure css for web client this patch removes javascript calls to adjust the layout. It manages to do the correct layout with only css, which will correct quite a few issues. --- addons/web/static/src/css/base.css | 15 ++++++++++++--- addons/web/static/src/css/base.sass | 22 +++++++++++++++------- 2 files changed, 27 insertions(+), 10 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 461684faf5f..07dbc812c29 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1147,13 +1147,21 @@ position: relative; height: 100%; } -.openerp .oe_application > div > .oe_view_manager > .oe_view_manager_body { +.openerp .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper { + display: table-row; + height: 100%; +} +.openerp .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div { + position: relative; + height: 100%; +} +.openerp .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div > .oe_view_manager_body { position: absolute; - overflow: auto; - top: 66px; + top: 0; bottom: 0; left: 0; right: 0; + overflow: auto; } .openerp .oe_application .oe_breadcrumb_item:not(:last-child) { max-width: 7em; @@ -1352,6 +1360,7 @@ height: 100%; } .openerp .oe_view_manager_current > .oe_view_manager_header { + display: table-row; border-bottom: 1px solid #cacaca; background-color: #ededed; background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4baddd7d862..e8cea79abbe 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -961,13 +961,20 @@ $sheet-padding: 16px position: relative height: 100% > .oe_view_manager - > .oe_view_manager_body - position: absolute - overflow: auto - top: 66px - bottom: 0 - left: 0 - right: 0 + > .oe_view_manager_wrapper + display: table-row + height: 100% + > div + position: relative + height: 100% + > .oe_view_manager_body + position: absolute + top: 0 + bottom: 0 + left: 0 + right: 0 + overflow: auto + .oe_breadcrumb_item:not(:last-child) max-width: 7em @@ -1127,6 +1134,7 @@ $sheet-padding: 16px .oe_view_manager_current height: 100% > .oe_view_manager_header + display: table-row border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) @include box-shadow((0 1px 0 rgba(255,255,255,0.4), 0 0 9px rgba(0,0,0,0.1))) -- cgit v1.2.3 From 048e8b29dfe5f30ba4e8815709b0a4c3f02f95f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Tue, 10 Jun 2014 16:43:25 +0200 Subject: [FIX] remove a css property that caused issue with the view_manager_header layout --- addons/web/static/src/css/base.css | 1 - addons/web/static/src/css/base.sass | 1 - 2 files changed, 2 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 07dbc812c29..10203df7ebe 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1360,7 +1360,6 @@ height: 100%; } .openerp .oe_view_manager_current > .oe_view_manager_header { - display: table-row; border-bottom: 1px solid #cacaca; background-color: #ededed; background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e8cea79abbe..89690c8c6d4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1134,7 +1134,6 @@ $sheet-padding: 16px .oe_view_manager_current height: 100% > .oe_view_manager_header - display: table-row border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) @include box-shadow((0 1px 0 rgba(255,255,255,0.4), 0 0 9px rgba(0,0,0,0.1))) -- cgit v1.2.3 From 6bd73f0c0f1420bf51a43c54c5e40d94f93a95ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Wed, 11 Jun 2014 10:51:58 +0200 Subject: [FIX] correct a problem with left bar scrollin --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + 2 files changed, 2 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 10203df7ebe..092b5e5c28c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -999,6 +999,7 @@ .openerp .oe_leftbar > div { max-height: 100%; overflow-y: auto; + overflow-x: hidden; } .openerp a.oe_logo { position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 89690c8c6d4..41993d8b65f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -848,6 +848,7 @@ $sheet-padding: 16px > div max-height: 100% overflow-y: auto + overflow-x: hidden a.oe_logo position: relative width: 220px -- cgit v1.2.3 From 6f8c5bf51e223f35787c66d64aa8375410175821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Wed, 11 Jun 2014 11:16:54 +0200 Subject: [FIX] probably fix scrolling issue in left menu it seems like there is some issues with the max-height property in some browsers. --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 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 092b5e5c28c..e90f6ff432f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -997,7 +997,7 @@ padding-bottom: 16px; } .openerp .oe_leftbar > div { - max-height: 100%; + height: 100%; overflow-y: auto; overflow-x: hidden; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 41993d8b65f..07453d98af1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -846,7 +846,7 @@ $sheet-padding: 16px text-shadow: none padding-bottom: 16px > div - max-height: 100% + height: 100% overflow-y: auto overflow-x: hidden a.oe_logo -- cgit v1.2.3 From b9135264b9c42cd2de4ed155dd6d8b21cffdd3a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Thu, 12 Jun 2014 10:39:49 +0200 Subject: [FIX] fix scrolling in left menu in Firefox and possibly also in IE --- addons/web/static/src/css/base.css | 43 ++++++++++++-------- addons/web/static/src/css/base.sass | 80 ++++++++++++++++++++----------------- 2 files changed, 71 insertions(+), 52 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 e90f6ff432f..7da07716922 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -994,24 +994,22 @@ background: #f0eeee; border-right: 1px solid #afafb6; text-shadow: none; - padding-bottom: 16px; } .openerp .oe_leftbar > div { height: 100%; - overflow-y: auto; - overflow-x: hidden; -} -.openerp a.oe_logo { - position: relative; + display: table; width: 220px; - display: block; + position: relative; +} +.openerp .oe_leftbar > div a.oe_logo { + display: table-row; text-align: center; } -.openerp a.oe_logo img { +.openerp .oe_leftbar > div a.oe_logo img { margin: 14px 0; border: 0; } -.openerp a.oe_logo .oe_logo_edit { +.openerp .oe_leftbar > div a.oe_logo .oe_logo_edit { margin: 14px 0; position: absolute; top: 1px; @@ -1026,22 +1024,35 @@ -ms-box-sizing: border-box; box-sizing: border-box; } -.openerp a.oe_logo:hover .oe_logo_edit_admin { +.openerp .oe_leftbar > div a.oe_logo:hover .oe_logo_edit_admin { display: block; } -.openerp .oe_footer { - position: fixed; +.openerp .oe_leftbar > div > div { + display: table-row; + height: 100%; +} +.openerp .oe_leftbar > div > div > div { + position: relative; + height: 100%; +} +.openerp .oe_leftbar > div > div > div > div.oe_secondary_menus_container { + position: absolute; + top: 0; bottom: 0; - padding: 4px 0; + left: 0; + right: 0; + overflow-x: hidden; + overflow-y: auto; +} +.openerp .oe_leftbar > div .oe_footer { background: #f0eeee; - width: 220px; text-align: center; } -.openerp .oe_footer a { +.openerp .oe_leftbar > div .oe_footer a { font-weight: bold; color: black; } -.openerp .oe_footer a span { +.openerp .oe_leftbar > div .oe_footer a span { color: #a24689; } .openerp .oe_secondary_menu_section { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 07453d98af1..0e0675971eb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -844,44 +844,52 @@ $sheet-padding: 16px background: #f0eeee border-right: 1px solid $tag-border text-shadow: none - padding-bottom: 16px > div height: 100% - overflow-y: auto - overflow-x: hidden - a.oe_logo - position: relative - width: 220px - display: block - text-align: center - img - margin: 14px 0 - border: 0 - .oe_logo_edit - margin: 14px 0 - position: absolute - top: 1px - padding: 4px - width: 100% - display: none - text-align: center - color: #eee - background: rgba(37,37,37,0.9) - @include box-sizing(border) - &:hover .oe_logo_edit_admin - display: block - .oe_footer - position: fixed - bottom: 0 - padding: 4px 0 - background: #f0eeee - width: 220px - text-align: center - a - font-weight: bold - color: black - span - color: #a24689 + display: table + width: 220px + position: relative + a.oe_logo + display: table-row + text-align: center + img + margin: 14px 0 + border: 0 + .oe_logo_edit + margin: 14px 0 + position: absolute + top: 1px + padding: 4px + width: 100% + display: none + text-align: center + color: #eee + background: rgba(37,37,37,0.9) + @include box-sizing(border) + &:hover .oe_logo_edit_admin + display: block + > div + display: table-row + height: 100% + > div + position: relative + height: 100% + > div.oe_secondary_menus_container + position: absolute + top: 0 + bottom: 0 + left: 0 + right: 0 + overflow-x: hidden + overflow-y: auto + .oe_footer + background: #f0eeee + text-align: center + a + font-weight: bold + color: black + span + color: #a24689 // }}} // Webclient.leftbar items {{{ -- cgit v1.2.3 From c73736694e7f99cbd5052de278c88c9efd160add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Thu, 12 Jun 2014 14:14:28 +0200 Subject: [FIX] css hack to make it work with IE9 hopefully, it should allow IE9 to correctly display the web client content --- addons/web/static/src/css/base.css | 2 ++ addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 4 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 7da07716922..b234e2738df 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1037,6 +1037,7 @@ } .openerp .oe_leftbar > div > div > div > div.oe_secondary_menus_container { position: absolute; + position: static\9; top: 0; bottom: 0; left: 0; @@ -1169,6 +1170,7 @@ } .openerp .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div > .oe_view_manager_body { position: absolute; + position: static\9; top: 0; bottom: 0; left: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0e0675971eb..093ebf6cb0b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -876,6 +876,7 @@ $sheet-padding: 16px height: 100% > div.oe_secondary_menus_container position: absolute + position: static\9 top: 0 bottom: 0 left: 0 @@ -978,6 +979,7 @@ $sheet-padding: 16px height: 100% > .oe_view_manager_body position: absolute + position: static\9 top: 0 bottom: 0 left: 0 -- cgit v1.2.3