From 6a572a7730e74a7df903c69df0f2c72cba0cfa61 Mon Sep 17 00:00:00 2001 From: cpa-openerp Date: Wed, 28 Mar 2012 17:42:11 +0530 Subject: [FIX] Fixed form view allow to save when m2m field required and blank. bzr revid: cpa@tinyerp.com-20120328121211-f6jm48lh1dop7ssg --- addons/web/static/src/css/base.css | 6 ++++++ 1 file 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 e8916db5a3b..c1f59b98449 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1578,6 +1578,12 @@ label.error { background-color: #F66 !important; border: 1px solid #D00 !important; } +.openerp td.required table.oe-listview-content{ + border: 1px solid #D2D2FF !important; +} +.openerp td.invalid table.oe-listview-content{ + border: 1px solid #FF6666 !important; +} .openerp div.oe-progressbar span { position: absolute; margin-left: 10px; -- cgit v1.2.3 From c7c4458e521b2a5c3fc034e887bb99a83a8c0e4e Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 26 Apr 2012 18:11:33 +0200 Subject: [FIX] base.css: make sure read-only char field contents is always visible min-height seems the original intention of the CSS, while height is too restrictive and hides parts of the field value when it is very long (and switching to edit mode is not always an option, e.g. for read-only records like emails) bzr revid: odo@openerp.com-20120426161133-glgkx7h6hdyyxw24 --- addons/web/static/src/css/base.css | 2 +- 1 file changed, 1 insertion(+), 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 168ba74bb46..c261443b2b2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1371,7 +1371,7 @@ label.error { .openerp .oe_forms_readonly .oe_form_field_many2one { padding: 3px 2px 2px 2px; background-color: white; - height: 17px; + min-height: 17px; } .openerp .oe_form_readonly .oe_form_frame_cell .field_text { height: auto; -- cgit v1.2.3 From 48472fd15e633ca6136b0740341e367313e05afc Mon Sep 17 00:00:00 2001 From: msh-openerp Date: Thu, 19 Apr 2012 18:58:26 +0530 Subject: [FIX]Fixed the issue of status bar not shown proper in IE8 as IE8 doesn't support psuedo class like nth child, IE8 officially supports :first-child but does not work. bzr revid: msh@tinyerp.com-20120419132826-o2dpohsnbh2yteod --- addons/web/static/src/css/base.css | 1 + 1 file changed, 1 insertion(+) (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 168ba74bb46..7911f18276b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2036,6 +2036,7 @@ ul.oe-arrow-list { ul.oe-arrow-list li { display: inline-block; margin-left: -1em; + vertical-align: top; } ul.oe-arrow-list li span { vertical-align: top; -- cgit v1.2.3 From bb7040072863e174b0fce78b3efff6cd7fcad2f6 Mon Sep 17 00:00:00 2001 From: msh-openerp Date: Tue, 24 Apr 2012 15:33:55 +0530 Subject: [FIX]Fixed the issue of FieldStatus widget which is not shown properly in IE8 as IE8 doesn't support rgba format, so just used transparent instead of rgba(0,0,0,0) for transparency. bzr revid: msh@tinyerp.com-20120424100355-yhlaym1lrj42jg8g --- addons/web/static/src/css/base.css | 8 ++++---- 1 file 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 7911f18276b..b9519d12d71 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2045,11 +2045,11 @@ ul.oe-arrow-list li span { line-height:0em; } ul.oe-arrow-list .oe-arrow-list-before { - border-left-color: rgba(0,0,0,0); + border-left-color: transparent; border-right-width:0; } ul.oe-arrow-list .oe-arrow-list-after { - border-color: rgba(0,0,0,0); + border-color: transparent; border-left-color: #DEDEDE; border-right-width:0; } @@ -2057,10 +2057,10 @@ ul.oe-arrow-list li.oe-arrow-list-selected span { border-color: #B5B9FF; } ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-before { - border-left-color: rgba(0,0,0,0); + border-left-color: transparent; } ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { - border-color: rgba(0,0,0,0); + border-color: transparent; border-left-color: #B5B9FF; } .openerp ul.oe-arrow-list li:first-child span:first-child{ -- cgit v1.2.3 From 9b447c025d4939d61e69acf1597191ce7af4f405 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 31 May 2012 19:02:28 +0200 Subject: search, shared filters bzr revid: mit@openerp.com-20120531170228-sbzxghl9vndntf4k --- addons/web/static/src/css/base.css | 25 ++++++++++++++++++++----- addons/web/static/src/css/base.sass | 25 +++++++++++++++++++++---- 2 files changed, 41 insertions(+), 9 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 e2879011a72..5fec2078ef7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1485,14 +1485,12 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_opened form { display: block; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete { - position: absolute; - left: 4px; - top: 3px; -} .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; @@ -1508,6 +1506,23 @@ -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_view_nocontent > img { float: left; margin: 1.5em; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index eda410aa6ca..3dd7c342f2f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1172,13 +1172,12 @@ $colour4: #8a89ba display: block // delete buttons - .oe_searchview_custom_delete - position: absolute - left: 4px - top: 3px .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 @@ -1190,6 +1189,24 @@ $colour4: #8a89ba 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 abc614182662fa9fd3b8c9cf8ed883abe556f14d Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 7 Jun 2012 17:01:47 +0530 Subject: [IMP]improvements. bzr revid: vme@tinyerp.com-20120607113147-7lly2zl317b8n88v --- addons/web/static/src/css/base.sass | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0c8f4253549..782a8f1012b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1145,6 +1145,18 @@ $colour4: #8a89ba position: absolute top: 0 right: 5px + .oe_searchview_dashboard + form + display: none + margin-top: 2px + ul + list-style: none + padding: 0 + li + position: relative + list-style: none + margin: 0 + white-space: nowrap .oe_searchview_advanced form display: none -- cgit v1.2.3 From c9ffd24d9ee0876a7061a97d000dea531633c85f Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 7 Jun 2012 17:20:28 +0530 Subject: [IMP] Removed base sass file for dashboard css changes. bzr revid: vme@tinyerp.com-20120607115028-1362ld4x8xmkcl8e --- addons/web/static/src/css/base.sass | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4ee0dcf1dfb..df40fc8d151 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1145,18 +1145,6 @@ $colour4: #8a89ba position: absolute top: 0 right: 5px - .oe_searchview_dashboard - form - display: none - margin-top: 2px - ul - list-style: none - padding: 0 - li - position: relative - list-style: none - margin: 0 - white-space: nowrap .oe_searchview_advanced form display: none -- cgit v1.2.3 From 78e9cc82271c90df178aa64cd67505c1e4670994 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 7 Jun 2012 17:51:17 +0530 Subject: [IMP]improve base.css and base.sass bzr revid: vme@tinyerp.com-20120607122117-s0uvanzd85bra306 --- addons/web/static/src/css/base.css | 14 ++++++++++++++ addons/web/static/src/css/base.sass | 12 ++++++++++++ 2 files changed, 26 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 2988c0aa634..c599d62ccba 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1456,6 +1456,20 @@ top: 0; right: 5px; } +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_dashboard form { + display: none; + margin-top: 2px; +} +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_dashboard ul { + list-style: none; + padding: 0; +} +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_dashboard li { + position: relative; + list-style: none; + margin: 0; + white-space: nowrap; +} .openerp .oe_searchview .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 df40fc8d151..4ee0dcf1dfb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1145,6 +1145,18 @@ $colour4: #8a89ba position: absolute top: 0 right: 5px + .oe_searchview_dashboard + form + display: none + margin-top: 2px + ul + list-style: none + padding: 0 + li + position: relative + list-style: none + margin: 0 + white-space: nowrap .oe_searchview_advanced form display: none -- cgit v1.2.3 From 019fd39215a6b78ba08ae7f7ff7c725e9093cc4e Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 7 Jun 2012 19:51:47 +0200 Subject: tweak to avatar corner bzr revid: mit@openerp.com-20120607175147-gqwtfw6oorwyedey --- addons/web/static/src/css/base.css | 12 +++++++++--- addons/web/static/src/css/base.sass | 6 +++++- 2 files changed, 14 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 5fec2078ef7..f8764df0743 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -104,6 +104,12 @@ -webkit-border-radius: 3px; border-radius: 3px; } +.openerp img { + vertical-align: middle; +} +.openerp h4 { + margin: 4px 0; +} .openerp .oe_i { font-family: "mnmliconsRegular" !important; font-size: 21px; @@ -495,9 +501,9 @@ width: 24px; height: 24px; margin: -2px 2px 0 0; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } .openerp .oe_topbar .oe_topbar_avatar { vertical-align: top; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3dd7c342f2f..468580d156d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -142,6 +142,10 @@ $colour4: #8a89ba input, textarea border: 1px solid #ccc @include radius(3px) + img + vertical-align: middle + h4 + margin: 4px 0 // }}} // Generic classes {{{ @@ -415,7 +419,7 @@ $colour4: #8a89ba width: 24px height: 24px margin: -2px 2px 0 0 - @include radius(4px) + @include radius(3px) .oe_topbar_avatar vertical-align: top .oe_dropdown_toggle:after -- cgit v1.2.3 From f4018bb36ba26ac5590a4ef548a015b23b7f9172 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 8 Jun 2012 13:52:49 +0200 Subject: Fixed glitches in the listview bzr revid: mit@openerp.com-20120608115249-bxrb91ic74dn7zh4 --- addons/web/static/src/css/base.css | 20 +++++++++++---- addons/web/static/src/css/base.sass | 51 +++++++++++++++++++++---------------- 2 files changed, 44 insertions(+), 27 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 f8764df0743..94ec33e9b78 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2049,30 +2049,40 @@ .openerp .oe-listview-content { width: 100%; } +.openerp .oe-listview-content td:first-child, .openerp .oe-listview-content th:first-child { + width: 17px; +} +.openerp .oe-listview-content td:first-child:after, .openerp .oe-listview-content th:first-child:after { + border-width: 0; +} .openerp .oe-listview-content > thead { border-bottom: 2px solid #cacaca; background: #eeeeee; vertical-align: top; } -.openerp .oe-listview-content > thead td, .openerp .oe-listview-content > thead th { +.openerp .oe-listview-content > thead th { + position: relative; +} +.openerp .oe-listview-content td, .openerp .oe-listview-content th { padding: 3px 6px; line-height: 18px; } -.openerp .oe-listview-content > thead th:after { +.openerp .oe-listview-content th:after { + position: absolute; + right: 6px; content: ""; - float: right; margin-top: 7px; border-width: 0 4px 4px; border-style: solid; border-color: black transparent; visibility: hidden; } -.openerp .oe-listview-content > thead th.sortup:after { +.openerp .oe-listview-content th.sortup:after { visibility: visible; filter: alpha(opacity=60); opacity: 0.6; } -.openerp .oe-listview-content > thead th.sortdown:after { +.openerp .oe-listview-content th.sortdown:after { border-bottom: none; border-left: 4px solid transparent; border-right: 4px solid transparent; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 468580d156d..3556abbf55e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1670,32 +1670,39 @@ $colour4: #8a89ba // ListView {{{ .oe-listview-content width: 100% + td:first-child, th:first-child + width: 17px + &:after + border-width: 0 > thead border-bottom: 2px solid #cacaca background: #eee vertical-align: top - td, th - padding: 3px 6px - line-height: 18px - th:after - content: "" - float: right - margin-top: 7px - border-width: 0 4px 4px - border-style: solid - border-color: #000 transparent - visibility: hidden - th.sortup:after - visibility: visible - @include opacity(0.6) - th.sortdown:after - border-bottom: none - border-left: 4px solid transparent - border-right: 4px solid transparent - border-top: 4px solid #000 - visibility: visible - @include box-shadow(none) - @include opacity(0.6) + th + position: relative + td, th + padding: 3px 6px + line-height: 18px + th:after + position: absolute + right: 6px + content: "" + margin-top: 7px + border-width: 0 4px 4px + border-style: solid + border-color: #000 transparent + visibility: hidden + th.sortup:after + visibility: visible + @include opacity(0.6) + th.sortdown:after + border-bottom: none + border-left: 4px solid transparent + border-right: 4px solid transparent + border-top: 4px solid #000 + visibility: visible + @include box-shadow(none) + @include opacity(0.6) // TODO mit //th:hover:after // border-bottom: none -- 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.css | 54 +++++++++++++++---------------- addons/web/static/src/css/base.sass | 64 ++++++++++++++++++------------------- 2 files changed, 59 insertions(+), 59 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..b9e2e42946f 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; @@ -450,6 +450,32 @@ .openerp .oe_webclient .oe_star_on { color: gold; } +.openerp .oe_field_many2many_tags .text-wrap { + width: 100% !important; +} +.openerp .oe_field_many2many_tags .text-wrap textarea { + width: 100% !important; +} +.openerp .oe_field_many2many_tags .oe_field_many2many_tag { + border-radius: 2px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; + 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; +} +.openerp .oe_field_many2many_tags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em { + font-style: italic; + text-decoration: none; +} .openerp.oe_tooltip { font-size: 12px; } @@ -2017,32 +2043,6 @@ padding-top: 4px; width: auto; } -.openerp .oe_form .oe_form_field_many2manytags .text-wrap { - width: 100% !important; -} -.openerp .oe_form .oe_form_field_many2manytags .text-wrap textarea { - width: 100% !important; -} -.openerp .oe_form .oe_form_field_many2manytags .oe_form_field_many2manytags_box { - border-radius: 2px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - 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; -} -.openerp .oe_form .oe_form_field_many2manytags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em { - font-style: italic; - text-decoration: none; -} .openerp .oe_form .oe_datepicker_container { display: none; } 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.css | 8 ++++---- addons/web/static/src/css/base.sass | 6 +++--- 2 files changed, 7 insertions(+), 7 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 b9e2e42946f..13ce5b73795 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -450,13 +450,13 @@ .openerp .oe_webclient .oe_star_on { color: gold; } -.openerp .oe_field_many2many_tags .text-wrap { +.openerp .oe_tags .text-wrap { width: 100% !important; } -.openerp .oe_field_many2many_tags .text-wrap textarea { +.openerp .oe_tags .text-wrap textarea { width: 100% !important; } -.openerp .oe_field_many2many_tags .oe_field_many2many_tag { +.openerp .oe_tags .oe_tag { border-radius: 2px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -472,7 +472,7 @@ height: 16px; font: 11px "lucida grande", tahoma, verdana, arial, sans-serif; } -.openerp .oe_field_many2many_tags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em { +.openerp .oe_tags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em { font-style: italic; text-decoration: none; } 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 f95c6ab4a84c6391e6667d8c7a12e24960b4fb21 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 8 Jun 2012 19:14:52 +0200 Subject: [FIX] move boostrap css fix in base.sass bzr revid: al@openerp.com-20120608171452-rls5mopqqd3hdfmn --- addons/web/static/src/css/base.css | 147 +++++++++--------------------------- addons/web/static/src/css/base.sass | 119 +++++++++-------------------- 2 files changed, 70 insertions(+), 196 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 435a90b65fa..e4131eb6450 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,6 +25,20 @@ position: relative; } +.ui-widget { + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; + font-size: 13px; +} + +.ui-menu .ui-menu-item { + margin: 0 8px 0 0; + padding: 0 0 0 12px; + width: auto; +} +.ui-menu .ui-menu-item a.ui-state-active { + background: #f0f0fa; +} + .openerp { padding: 0; margin: 0; @@ -852,96 +866,6 @@ .openerp .oe_application a:hover { text-decoration: underline; } -.openerp .oe-view-manager-header { - border-top: 1px solid #cacaca; - border-bottom: 1px solid #cacaca; - background-color: #fcfcfc; - background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); - background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); - background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); - background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); - background-image: -o-linear-gradient(top, #fcfcfc, #dedede); - background-image: linear-gradient(to bottom, #fcfcfc, #dedede); - -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); - -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); - -box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); -} -.openerp .oe-view-manager-header h2 { - float: left; - font-size: 18px; - margin: 1px 0; -} -.openerp .oe-view-manager-header h2 a { - color: #8a89ba; -} -.openerp .oe-view-manager-header .buttons { - padding-right: 8px; -} -.openerp .oe-view-manager-header .buttons li { - float: left; - margin-right: 12px; -} -.openerp .oe-view-manager-header .filter { - vertical-align: top; -} -.openerp .oe-view-manager-header .filter li { - height: 24px; - line-height: 24px; - padding: 0 8px; -} -.openerp .oe-view-manager-header .header-row { - height: 26px; - line-height: 26px; - margin: 8px; - clear: both; - text-shadow: 0 1px 1px white; -} -.openerp .oe-view-manager-header .header-row .dropdown-toggle:after { - margin-top: 7px; - margin-left: 6px; - border-top-color: #404040; -} -.openerp .oe-view-manager-header .oe_vm_switch li { - padding-left: 1px; - text-align: center; - width: 24px; - height: 24px; - line-height: 24px; -} -.openerp .oe-view-manager-header .pagination li { - height: 24px; - line-height: 24px; - padding: 0 8px; -} -.openerp .oe-view-manager-header .button-group { - display: inline-block; - border: 1px solid #ababab; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; -} -.openerp .oe-view-manager-header .button-group li { - float: left; - border-right: 1px solid #ababab; -} -.openerp .oe-view-manager-header .button-group li:last-child { - border: none; -} -.openerp .oe-view-manager-header .button-group a { - color: #4c4c4c; -} -.openerp .oe-view-manager-header .button-group a:hover { - text-decoration: none; -} -.openerp .oe-view-manager-header .button-group .active { - width: 100%; - background: #999999; - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; - -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; - color: white; - text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); -} .openerp .oe_view_manager_header { width: 100%; border-top: 1px solid #cacaca; @@ -2273,6 +2197,27 @@ .openerp.oe_tooltip .oe_tooltip_technical_title { font-weight: bold; } +.openerp .oe_view_editor { + width: 100%; + border-collapse: collapse; + margin-left: -12px; + width: 100%; + background-color: white; + border-spacing: 0; +} +.openerp .oe_view_editor td { + text-align: center; + white-space: nowrap; + border: 1px solid #d8d8d8; + cursor: pointer; + font-size: 90%; +} +.openerp .oe_view_editor_field td { + border: 0px !important; +} +.openerp .oe_view_editor tr:hover { + background-color: #ecebf2; +} .openerp .oe_layout_debugging .oe_form_group { outline: 2px dashed green; } @@ -2314,28 +2259,6 @@ color: #333333; } -.openerp .oe_view_editor { - width: 100%; - border-collapse: collapse; - margin-left: -12px; - width: 100%; - background-color: white; - border-spacing: 0; -} -.openerp .oe_view_editor td { - text-align: center; - white-space: nowrap; - border: 1px solid #d8d8d8; - cursor: pointer; - font-size: 90%; -} -.openerp .oe_view_editor_field td { - border: 0px !important; -} -.openerp .oe_view_editor tr:hover { - background-color: #ecebf2; -} - .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 a4660ff24bc..7bac593f43c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -89,10 +89,24 @@ $colour4: #8a89ba // }}} + .openerp.openerp-web-client-container height: 100% position: relative +// Jquery ui Overrides {{{ +.ui-widget + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif + font-size: 13px +.ui-menu + .ui-menu-item + margin: 0 8px 0 0 + padding: 0 0 0 12px + width: auto + a.ui-state-active + background: #f0f0fa +// }}} + .openerp // Global style {{{ padding: 0 @@ -688,71 +702,6 @@ $colour4: #8a89ba &:hover text-decoration: underline // }}} - // Content Header MIT {{{ - .oe-view-manager-header - border-top: 1px solid #cacaca - 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))) - h2 - float: left - font-size: 18px - margin: 1px 0 - a - color: $colour4 - .buttons - padding-right: 8px - li - float: left - margin-right: 12px - .filter - vertical-align: top - li - height: 24px - line-height: 24px - padding: 0 8px - .header-row - height: 26px - line-height: 26px - margin: 8px - clear: both - text-shadow: 0 1px 1px white - .dropdown-toggle:after - margin-top: 7px - margin-left: 6px - border-top-color: #404040 - .oe_vm_switch - li - padding-left: 1px - text-align: center - width: 24px - height: 24px - line-height: 24px - .pagination - li - height: 24px - line-height: 24px - padding: 0 8px - .button-group - display: inline-block - border: 1px solid #ababab - @include radius(5px) - li - float: left - border-right: 1px solid #ababab - &:last-child - border: none - a - color: #4c4c4c - &:hover - text-decoration: none - .active - width: 100% - background: #999 - @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset) - color: #fff - text-shadow: 0 1px 2px rgba(0,0,0,0.4) - // }}} // ViewManager.header {{{ .oe_view_manager_header width: 100% @@ -1858,6 +1807,25 @@ $colour4: #8a89ba .oe_tooltip_technical_title font-weight: bold // }}} + // View Editor {{{ + .oe_view_editor + width: 100% + border-collapse: collapse + margin-left: -12px + width: 100% + background-color: white + border-spacing: 0 + td + text-align: center + white-space: nowrap + border: 1px solid #D8D8D8 + cursor: pointer + font-size: 90% + .oe_view_editor_field td + border: 0px !important + .oe_view_editor tr:hover + background-color: #ecebf2 + // }}} // Debugging stuff {{{ .oe_layout_debugging .oe_form_group @@ -1893,32 +1861,15 @@ $colour4: #8a89ba float: right color: #333 // }}} -//view editor -.openerp - .oe_view_editor - width: 100% - border-collapse: collapse - margin-left: -12px - width: 100% - background-color: white - border-spacing: 0 - td - text-align: center - white-space: nowrap - border: 1px solid #D8D8D8 - cursor: pointer - font-size: 90% - .oe_view_editor_field td - border: 0px !important - .oe_view_editor tr:hover - background-color: #ecebf2 +// Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) background-size: cover background-attachment: fixed >* opacity: 0.70 +// }}} // Transitional overrides for old styles {{{ .openerp -- cgit v1.2.3 From 7a59717977d4ca476e1962402e1c091288c13024 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 11 Jun 2012 11:26:41 +0200 Subject: [ADD] Added !important to oe_form_invisible bzr revid: fme@openerp.com-20120611092641-cp0m7w2a41917r9h --- 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 e4131eb6450..d9420763cdb 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1613,7 +1613,7 @@ -box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); } .openerp .oe_form_invisible { - display: none; + display: none !important; } .openerp .oe_form_editable .oe_form_editable_hidden { display: none; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 7bac593f43c..667743fa365 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1292,7 +1292,7 @@ $colour4: #8a89ba // }}} // FormView.layout {{{ .oe_form_invisible - display: none + display: none !important .oe_form_editable .oe_form_editable_hidden display: none .oe_form_readonly -- cgit v1.2.3 From 396aede0190e1b03f545b671dfbec32d24a5efd4 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 12 Jun 2012 10:18:12 +0200 Subject: [FIX] Fixed some hidden classes problem, improved binary image field's styling bzr revid: fme@openerp.com-20120612081812-5w6e2bmg0pl6ou12 --- addons/web/static/src/css/base.css | 10 ++++------ addons/web/static/src/css/base.sass | 8 ++++---- 2 files changed, 8 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 d9420763cdb..0daae4da3c4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1616,10 +1616,10 @@ display: none !important; } .openerp .oe_form_editable .oe_form_editable_hidden { - display: none; + display: none !important; } .openerp .oe_form_readonly .oe_form_readonly_hidden, .openerp .oe_form_readonly .oe_form_field:empty { - display: none; + display: none !important; } .openerp .oe_form .oe_form_field_text { width: 100%; @@ -1894,8 +1894,7 @@ top: 1px; padding: 3px 0 0 0; margin: 0 1px; - filter: alpha(opacity=70); - opacity: 0.7; + display: none; width: 99%; text-align: center; background: url(/web/static/src/img/form_sheetbg.png); @@ -1906,8 +1905,7 @@ box-sizing: border-box; } .openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls { - filter: alpha(opacity=100); - opacity: 1; + display: block; } .openerp .oe_horizontal_border { border-bottom: 1px solid black; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 667743fa365..616caac7739 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1294,10 +1294,10 @@ $colour4: #8a89ba .oe_form_invisible display: none !important .oe_form_editable .oe_form_editable_hidden - display: none + display: none !important .oe_form_readonly .oe_form_readonly_hidden, .oe_form_field:empty - display: none + display: none !important .oe_form .oe_form_field_text width: 100% @@ -1556,7 +1556,7 @@ $colour4: #8a89ba top: 1px padding: 3px 0 0 0 margin: 0 1px - @include opacity(0.7) + display: none width: 99% text-align: center background: url(/web/static/src/img/form_sheetbg.png) @@ -1566,7 +1566,7 @@ $colour4: #8a89ba -ms-box-sizing: border-box box-sizing: border-box &:hover .oe_form_field_image_controls - @include opacity(1) + display: block // }}} // FormView.separator {{{ .oe_horizontal_border -- cgit v1.2.3 From 250ae50514a2371c0db49aa25380d0608ab93b86 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 12 Jun 2012 14:19:47 +0200 Subject: [FIX] box-shadow mixin bzr revid: xmo@openerp.com-20120612121947-67c59hg3fmzwanp3 --- addons/web/static/src/css/base.css | 72 ++++++++++++++++++------------------- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 37 insertions(+), 37 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 0daae4da3c4..aca2a7f0c2a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -177,7 +177,7 @@ border-radius: 3px; -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); -webkit-font-smoothing: antialiased; outline: none; @@ -203,7 +203,7 @@ background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); -moz-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; - -box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; + box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; } .openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active { background: #e3e3e3; @@ -212,14 +212,14 @@ background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f; -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled { background: #efefef !important; border: 1px solid #d1d1d1 !important; -moz-box-shadow: none !important; -webkit-box-shadow: none !important; - -box-shadow: none !important; + box-shadow: none !important; color: #aaaaaa !important; cursor: default; text-shadow: 0 1px 1px white !important; @@ -235,7 +235,7 @@ background-image: linear-gradient(to bottom, #dc5f59, #b33630); -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp button.primary:hover { background-color: #df6b66; @@ -247,7 +247,7 @@ background-image: linear-gradient(to bottom, #df6b66, #bf3a33); -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - -box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } .openerp button.primary:active { background-color: #b33630; @@ -259,7 +259,7 @@ background-image: linear-gradient(to bottom, #b33630, #dc5f59); -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp button.following { color: white; @@ -334,7 +334,7 @@ border-radius: 4px; -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; } .openerp .oe_login input, .openerp .oe_login select { width: 252px; @@ -343,7 +343,7 @@ background: whitesmoke; -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); - -box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); + box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -403,7 +403,7 @@ border-radius: 8px; -moz-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); - -box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); + box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); } .openerp .oe_login .oe_login_pane h2 { margin-top: 0; @@ -447,7 +447,7 @@ border-radius: 4px; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8); -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8); - -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8); } .openerp .oe_login_invalid .oe_login_error_message { display: inline-block; @@ -501,7 +501,7 @@ color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } .openerp .oe_topbar .oe_topbar_item .oe_active { background: #303030; @@ -509,7 +509,7 @@ color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } .openerp .oe_topbar .oe_topbar_avatar { width: 24px; @@ -611,7 +611,7 @@ border-radius: 0 0 6px 6px; -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); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; @@ -640,7 +640,7 @@ background-image: linear-gradient(to bottom, #292929, #191919); -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp .oe_user_menu .oe_dropdown_options li hr { border-top: 1px solid #999999; @@ -678,7 +678,7 @@ border-radius: 0 0 6px 6px; -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); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; @@ -706,7 +706,7 @@ background-image: linear-gradient(to bottom, #292929, #191919); -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp .oe_menu { float: left; @@ -730,7 +730,7 @@ color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } .openerp .oe_menu .oe_active { background: #303030; @@ -738,7 +738,7 @@ color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } .openerp .oe_menu_more_container { position: relative; @@ -794,7 +794,7 @@ border-radius: 4px; -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); } .openerp .oe_secondary_submenu .oe_menu_counter { float: right; @@ -816,7 +816,7 @@ text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); } .openerp .oe_secondary_submenu .oe_active a { color: white; @@ -827,7 +827,7 @@ text-shadow: 0 1px 1px white; -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - -box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); } .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; @@ -879,7 +879,7 @@ background-image: linear-gradient(to bottom, #fcfcfc, #dedede); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); - -box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); } .openerp .oe_view_manager_header .oe_header_row { clear: both; @@ -934,7 +934,7 @@ background: #999999; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; - -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; } .openerp .oe_view_manager_header .oe_button_group .active a { color: white; @@ -982,7 +982,7 @@ background: #999999; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; - -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; } .openerp .oe_pager_group .active a { color: white; @@ -1063,7 +1063,7 @@ border-radius: 3px; -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); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); } .openerp .oe_dropdown_menu li { list-style-type: none; @@ -1092,7 +1092,7 @@ background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp .oe_sidebar { white-space: nowrap; @@ -1111,7 +1111,7 @@ border-radius: 13px; -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; } .openerp .oe_searchview input, .openerp .oe_searchview textarea { padding: 3px; @@ -1127,7 +1127,7 @@ border-color: #a6a6fe; -moz-box-shadow: 0 1px 2px #a6a6fe inset; -webkit-box-shadow: 0 1px 2px #a6a6fe inset; - -box-shadow: 0 1px 2px #a6a6fe inset; + box-shadow: 0 1px 2px #a6a6fe inset; } .openerp .oe_searchview .oe_searchview_clear { cursor: pointer; @@ -1210,7 +1210,7 @@ border-color: #a6a6fe; -moz-box-shadow: 0 0 3px 1px #a6a6fe; -webkit-box-shadow: 0 0 3px 1px #a6a6fe; - -box-shadow: 0 0 3px 1px #a6a6fe; + box-shadow: 0 0 3px 1px #a6a6fe; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_values { background: #f0f0fa; @@ -1276,7 +1276,7 @@ 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); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); } .openerp .oe_searchview .oe_searchview_drawer > div { border-top: 1px solid #cccccc; @@ -1314,7 +1314,7 @@ padding: 0 2px; -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; @@ -1610,7 +1610,7 @@ border: 1px solid #afafb6; -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - -box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); } .openerp .oe_form_invisible { display: none !important; @@ -1729,7 +1729,7 @@ padding-left: 8px; -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; @@ -2105,7 +2105,7 @@ visibility: visible; -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; filter: alpha(opacity=60); opacity: 0.6; } @@ -2128,7 +2128,7 @@ padding: 0; -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp .oe-listview-content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe-listview-content > tbody > tr th.oe_list_checkbox:first-child { width: 17px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 616caac7739..66398bc899d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -52,7 +52,7 @@ $colour4: #8a89ba @mixin box-shadow($bsval: 0px 1px 4px #777) -moz-box-shadow: $bsval -webkit-box-shadow: $bsval - -box-shadow: $bsval + box-shadow: $bsval @mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s)) -webkit-transition: $transval -- cgit v1.2.3 From 554195630b2a184babee7ef43a951c62cd377d46 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 12 Jun 2012 15:15:43 +0200 Subject: [IMP] Improved o2m and m2m viewmanager/listview styling bzr revid: fme@openerp.com-20120612131543-qmltlt7p1h8g5xk5 --- addons/web/static/src/css/base.css | 6 ++++++ addons/web/static/src/css/base.sass | 10 ++++++++++ 2 files changed, 16 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 aca2a7f0c2a..40a97e92f2e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2026,6 +2026,12 @@ .openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { display: none; } +.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { + display: none; +} +.openerp .oe_form .oe_form_field_many2many > .oe-listview .oe_list_pager_single_page { + display: none; +} .openerp .oe_form td.oe_form_group_cell_label { border-right: 1px solid #dddddd; padding: 2px 0px 2px 0px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 66398bc899d..d53d66363a2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1674,6 +1674,16 @@ $colour4: #8a89ba display: none // }}} + // FormView.one2many {{{ + .oe_form .oe_form_field_one2many > .oe_view_manager + .oe_list_pager_single_page + display: none + // }}} + // FormView.many2many {{{ + .oe_form .oe_form_field_many2many > .oe-listview + .oe_list_pager_single_page + display: none + // }}} // FormView.classes for openerp views {{{ .oe_form td.oe_form_group_cell_label -- cgit v1.2.3 From f48bf470246c7b04e440465ef6a30b6c099202d8 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 12 Jun 2012 15:34:37 +0200 Subject: [IMP] Improved sass mixin usage bzr revid: fme@openerp.com-20120612133437-19d75fct3g844p84 --- addons/web/static/src/css/base.css | 48 +++++++++++++++++++---------- addons/web/static/src/css/base.sass | 61 ++++++++++++------------------------- 2 files changed, 51 insertions(+), 58 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 40a97e92f2e..bbb412da384 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1324,8 +1324,9 @@ width: 100%; } .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section > div { - -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; box-sizing: border-box; display: table-cell; width: 50%; @@ -1488,12 +1489,16 @@ .openerp .oe_form_button_save_dirty { color: white; background: #dc5f59; - background: -moz-linear-gradient(#dc5f59, #b33630); - background: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background: -webkit-linear-gradient(#dc5f59, #b33630); + background-color: #dc5f59; + background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); + background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); + background-image: -moz-linear-gradient(top, #dc5f59, #b33630); + background-image: -ms-linear-gradient(top, #dc5f59, #b33630); + background-image: -o-linear-gradient(top, #dc5f59, #b33630); + background-image: linear-gradient(to bottom, #dc5f59, #b33630); -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; font-weight: bold; } .openerp .oe_form_button_save_dirty:hover { @@ -1577,21 +1582,29 @@ .openerp .oe_form_readonly button.oe_form_button_hi { color: white; background: #dc5f59; - background: -moz-linear-gradient(#dc5f59, #b33630); - background: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background: -webkit-linear-gradient(#dc5f59, #b33630); + background-color: #dc5f59; + background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); + background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); + background-image: -moz-linear-gradient(top, #dc5f59, #b33630); + background-image: -ms-linear-gradient(top, #dc5f59, #b33630); + background-image: -o-linear-gradient(top, #dc5f59, #b33630); + background-image: linear-gradient(to bottom, #dc5f59, #b33630); -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp .oe_form_readonly button.oe_form_button_hi:hover { background: #df6b66; - background: -moz-linear-gradient(#df6b66, #bf3a33); - background: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33)); - background: -webkit-linear-gradient(#df6b66, #bf3a33); + background-color: #df6b66; + background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33)); + background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33); + background-image: -moz-linear-gradient(top, #df6b66, #bf3a33); + background-image: -ms-linear-gradient(top, #df6b66, #bf3a33); + background-image: -o-linear-gradient(top, #df6b66, #bf3a33); + background-image: linear-gradient(to bottom, #df6b66, #bf3a33); -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - -box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } .openerp .oe_application .oe_form_sheetbg { background: url(/web/static/src/img/form_sheetbg.png); @@ -1702,8 +1715,8 @@ .openerp .oe_form input[type="file"], .openerp .oe_form select, .openerp .oe_form textarea { - -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; padding: 0 2px; @@ -1766,6 +1779,9 @@ } .openerp .oe_form .oe_form_field_many2manytags .oe_form_field_many2manytags_box { border-radius: 2px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; box-sizing: border-box; position: relative; float: left; @@ -1899,8 +1915,8 @@ text-align: center; background: url(/web/static/src/img/form_sheetbg.png); border-bottom: 1px dotted black; - -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; } @@ -1989,8 +2005,8 @@ .openerp .oe_form .oe_form_field_progressbar.ui-progressbar { height: 22px; font-size: 10px; - -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; border: 1px solid #999999; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d53d66363a2..350b9382d94 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -70,10 +70,12 @@ $colour4: #8a89ba -moz-background-clip: $clip background-clip: $clip -@mixin unscrew-box - -moz-box-sizing: border-box - -webkit-box-sizing: border-box - box-sizing: border-box +@mixin box-sizing($type: content) + // type = border || content || padding + -webkit-box-sizing: #{$type}-box + -moz-box-sizing: #{$type}-box + -ms-box-sizing: #{$type}-box + box-sizing: #{$type}-box // Transforms the (readable) text of an inline element into an mmlicons icon, // allows for actual readable text in-code (and in readers?) with iconic looks @@ -1050,7 +1052,7 @@ $colour4: #8a89ba display: table width: 100% > div - @include unscrew-box + @include box-sizing(border) display: table-cell width: 50% ul @@ -1190,12 +1192,8 @@ $colour4: #8a89ba .oe_form_button_save_dirty color: white background: #dc5f59 - background: -moz-linear-gradient(#dc5f59, #b33630) - background: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)) - background: -webkit-linear-gradient(#dc5f59, #b33630) - -moz-box-shadow: none - -webkit-box-shadow: none - -box-shadow: none + @include vertical-gradient(#dc5f59, #b33630) + @include box-shadow(none) font-weight: bold &:hover background: #ED6F6A @@ -1260,20 +1258,12 @@ $colour4: #8a89ba button.oe_form_button_hi color: white background: #DC5F59 - background: -moz-linear-gradient(#DC5F59, #B33630) - background: -webkit-gradient(linear, left top, left bottom, from(#DC5F59), to(#B33630)) - background: -webkit-linear-gradient(#DC5F59, #B33630) - -moz-box-shadow: none - -webkit-box-shadow: none - -box-shadow: none + @include vertical-gradient(#dc5f59, #b33630) + @include box-shadow(none) button.oe_form_button_hi:hover background: #DF6B66 - background: -moz-linear-gradient( #DF6B66, #BF3A33) - background: -webkit-gradient(linear, left top, left bottom, from( #DF6B66), to( #BF3A33)) - background: -webkit-linear-gradient( #DF6B66, #BF3A33) - -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2) - -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2) - -box-shadow: 0 0 1px rgba(0, 0, 0, 0.2) + @include vertical-gradient(#DF6B66, #BF3A33) + @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) .oe_application .oe_form_sheetbg background: url(/web/static/src/img/form_sheetbg.png) @@ -1375,15 +1365,10 @@ $colour4: #8a89ba input[type="file"], select, textarea - -moz-box-sizing: border-box - -webkit-box-sizing: border-box - -ms-box-sizing: border-box - box-sizing: border-box + @include box-sizing(border) padding: 0 2px border: 1px solid #999 - -moz-border-radius: 3px - -webkit-border-radius: 3px - border-radius: 3px + @include radius(3px) background: white min-width: 70px color: #1f1f1f @@ -1427,7 +1412,7 @@ $colour4: #8a89ba width: 100% !important .oe_form_field_many2manytags_box border-radius: 2px - box-sizing: border-box + @include box-sizing(border) position: relative float: left border: 1px solid #9DACCC @@ -1561,10 +1546,7 @@ $colour4: #8a89ba text-align: center background: url(/web/static/src/img/form_sheetbg.png) border-bottom: 1px dotted black - -moz-box-sizing: border-box - -webkit-box-sizing: border-box - -ms-box-sizing: border-box - box-sizing: border-box + @include box-sizing(border) &:hover .oe_form_field_image_controls display: block // }}} @@ -1637,14 +1619,9 @@ $colour4: #8a89ba .oe_form_field_progressbar.ui-progressbar height: 22px font-size: 10px - -moz-box-sizing: border-box - -webkit-box-sizing: border-box - -ms-box-sizing: border-box - box-sizing: border-box + @include box-sizing(border) border: 1px solid #999 - -moz-border-radius: 3px - -webkit-border-radius: 3px - border-radius: 3px + @include radius(3px) background: white min-width: 50px -- cgit v1.2.3 From bc6de08dad3ff6fdb3f91c450503a5e269e088ee Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 12 Jun 2012 15:44:55 +0200 Subject: [FIX] Hide pager in form select popups bzr revid: fme@openerp.com-20120612134455-vqofc8nkyu3i0chq --- 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 bbb412da384..0ccaf77c809 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2040,7 +2040,7 @@ line-height: 16px; } .openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { - display: none; + display: none !important; } .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 350b9382d94..e6e48089733 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1648,7 +1648,7 @@ $colour4: #8a89ba height: auto line-height: 16px .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager - display: none + display: none !important // }}} // FormView.one2many {{{ -- cgit v1.2.3 From 1ce9ec0718fa6f8ce32dec753ccb5711c18da737 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 13 Jun 2012 12:05:16 +0200 Subject: [IMP] Improved hidden file uploads usage bzr revid: fme@openerp.com-20120613100516-1opf05g81icwuwbr --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 14 +++++++------- 2 files changed, 9 insertions(+), 9 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 0ccaf77c809..eaba96e771a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1875,14 +1875,14 @@ vertical-align: -3px; padding: 0 2px; } -.openerp .oe_form .oe-binary-file-set { +.openerp .oe_hidden_input_file { overflow: hidden; position: relative; display: inline-block; width: 45px; height: 30px; } -.openerp .oe_form input.oe-binary-file { +.openerp .oe_hidden_input_file input.oe-binary-file { z-index: 0; line-height: 0; font-size: 12px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e6e48089733..00fbbb80c58 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1508,13 +1508,12 @@ $colour4: #8a89ba /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image */ - .oe_form - .oe-binary-file-set - overflow: hidden - position: relative - display: inline-block - width: 45px - height: 30px + .oe_hidden_input_file + overflow: hidden + position: relative + display: inline-block + width: 45px + height: 30px input.oe-binary-file z-index: 0 line-height: 0 @@ -1528,6 +1527,7 @@ $colour4: #8a89ba -ms-filter: "alpha(opacity=0)" margin: 0 padding: 0 + .oe_form .oe_form_field_image > img min-width: 100px -- cgit v1.2.3 From 61a17c3f56836e9b2c8808c64278d2607ff32fa4 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 13 Jun 2012 14:08:26 +0200 Subject: Styling of the graph view dropdown menu bzr revid: mit@openerp.com-20120613120826-q1mmzhx1qdx2m8cw --- addons/web/static/src/css/base.css | 5 +++-- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 5 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 0ccaf77c809..6311879a8ed 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"); @@ -153,6 +153,7 @@ } .openerp .oe_fade { color: #888888; + font-size: 12px; } .openerp .oe_bold { font-weight: bold; @@ -1262,7 +1263,7 @@ } .openerp .oe_searchview .oe_searchview_drawer { position: absolute; - z-index: 1; + z-index: 100; margin-top: 4px; top: 100%; right: -1px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e6e48089733..df3c82f499a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -187,7 +187,7 @@ $colour4: #8a89ba cursor: wait .oe_fade color: #888 - //font-size: 12px + font-size: 12px .oe_bold font-weight: bold // }}} @@ -1007,7 +1007,7 @@ $colour4: #8a89ba .oe_searchview_drawer position: absolute - z-index: 1 + z-index: 100 // detach drawer from field slightly margin-top: 4px top: 100% -- cgit v1.2.3 From 8401b686b6bcac4cc44cf0c6790784e8316da2b9 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 13 Jun 2012 16:10:16 +0200 Subject: [FIX] Brought back attachments bzr revid: fme@openerp.com-20120613141016-8m2mj4b7d9zzk7a5 --- addons/web/static/src/css/base.css | 23 +++++++++++++++++++++++ addons/web/static/src/css/base.sass | 11 +++++++++++ 2 files changed, 34 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 eaba96e771a..b65f4da557a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1097,6 +1097,29 @@ .openerp .oe_sidebar { white-space: nowrap; } +.openerp .oe_sidebar .oe_sidebar_add_attachment { + cursor: pointer; + padding-left: 6px; + margin-top: 6px; +} +.openerp .oe_sidebar .oe_sidebar_add_attachment span { + font-weight: bold; +} +.openerp .oe_sidebar .oe_sidebar_add_attachment .oe_hidden_input_file { + width: 200px; +} +.openerp .oe_sidebar .oe_sidebar_add_attachment:hover { + background-color: #f0f0fa; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} .openerp .oe_searchview { cursor: text; position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 00fbbb80c58..7208834a887 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -877,6 +877,17 @@ $colour4: #8a89ba @include box-shadow(none) .oe_sidebar white-space: nowrap + .oe_sidebar_add_attachment + cursor: pointer + padding-left: 6px + margin-top: 6px + span + font-weight: bold + .oe_hidden_input_file + width: 200px + &:hover + @include vertical-gradient(#f0f0fa, #eeeef6) + @include box-shadow(none) // }}} // SearchView {{{ .oe_searchview -- cgit v1.2.3 From 784bec95fd502e8988276137d7ad915623cc33f4 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 13 Jun 2012 18:17:12 +0200 Subject: [ADD] Recovered delete icon for the attachments bzr revid: fme@openerp.com-20120613161712-91h2yvg0rykwun2j --- addons/web/static/src/css/base.css | 53 ++++++++++++++++++++++++++++++------- addons/web/static/src/css/base.sass | 31 ++++++++++++++++++++-- 2 files changed, 72 insertions(+), 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 b65f4da557a..32f520d1a30 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1066,11 +1066,24 @@ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); } .openerp .oe_dropdown_menu li { + position: relative; list-style-type: none; float: none; display: block; background-color: none; } +.openerp .oe_dropdown_menu li:hover { + background-color: #f0f0fa; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} .openerp .oe_dropdown_menu li a { display: block; padding: 3px 6px; @@ -1083,20 +1096,40 @@ } .openerp .oe_dropdown_menu li a:hover { text-decoration: none; - background-color: #f0f0fa; - background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); - background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; +} +.openerp .oe_dropdown_menu li .oe_sidebar_delete_item { + position: absolute; + bottom: 1px; + right: 4px; + display: none; + 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_dropdown_menu li .oe_sidebar_delete_item: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_dropdown_menu li:hover .oe_sidebar_delete_item { + display: inline-block; } .openerp .oe_sidebar { white-space: nowrap; } +.openerp .oe_sidebar .oe_dropdown_menu li { + padding-right: 16px; +} .openerp .oe_sidebar .oe_sidebar_add_attachment { cursor: pointer; padding-left: 6px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 7208834a887..d933550db23 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -858,6 +858,10 @@ $colour4: #8a89ba @include radius(3px) @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) li + &:hover + @include vertical-gradient(#f0f0fa, #eeeef6) + @include box-shadow(none) + position: relative list-style-type: none float: none display: block @@ -873,10 +877,33 @@ $colour4: #8a89ba cursor: pointer &:hover text-decoration: none - @include vertical-gradient(#f0f0fa, #eeeef6) - @include box-shadow(none) + .oe_sidebar_delete_item + position: absolute + bottom: 1px + right: 4px + display: none + 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) + &:hover + .oe_sidebar_delete_item + display: inline-block .oe_sidebar white-space: nowrap + .oe_dropdown_menu li + padding-right: 16px .oe_sidebar_add_attachment cursor: pointer padding-left: 6px -- cgit v1.2.3 From ab36bdc3373e15cbe9c4ccbd6b0a7aa65f19b334 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 13 Jun 2012 18:54:14 +0200 Subject: Improvements to left menu and form view bzr revid: mit@openerp.com-20120613165414-cqc3d703opbytldv --- addons/web/static/src/css/base.css | 46 +++++++++++++++++++++++++++---------- addons/web/static/src/css/base.sass | 38 ++++++++++++++++++++---------- 2 files changed, 60 insertions(+), 24 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 6311879a8ed..3b0d21ae934 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -545,7 +545,6 @@ border-right: 1px solid #afafb6; text-shadow: 0 1px 1px white; padding-bottom: 16px; - line-height: 18px; } .openerp a.oe_logo { width: 220px; @@ -801,9 +800,9 @@ float: right; background: #8a89ba; color: #eeeeee; - font-size: 12px; + font-size: 10px; border: 1px solid lightgray; - padding: 0px 4px 0px 4px; + padding: 2px 4px; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); margin: 0px; -moz-border-radius: 4px; @@ -1618,7 +1617,6 @@ margin: 0 auto; } .openerp .oe_application .oe_form_sheet { - padding: 18px; background: white; min-height: 330px; border: 1px solid #afafb6; @@ -1626,6 +1624,10 @@ -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); } +.openerp .oe_application .oe_form_sheet > .oe_form_group { + margin: 8px 16px; + width: 97%; +} .openerp .oe_form_invisible { display: none !important; } @@ -1845,7 +1847,15 @@ overflow: hidden; } .openerp .oe_form .oe_form_title { - width: 55%; + margin: 16px; + float: left; +} +.openerp .oe_form .oe_form_title h1 { + font-size: 22px; +} +.openerp .oe_form .oe_form_title h2 { + font-size: 14px; + font-weight: normal; } .openerp .oe_form .oe_form_title:after { content: "."; @@ -1855,11 +1865,12 @@ visibility: hidden; } .openerp .oe_form .oe_form_button_box { - width: 200px; - text-align: center; + width: 400px; + margin: 16px; } -.openerp .oe_form .oe_form_group { - margin: 5px 0px 5px 0px; +.openerp .oe_form .oe_form_button_box button { + margin-left: 4px; + float: right; } .openerp .oe_form .oe_form_group_cell .oe_kanban_view { position: static; @@ -1903,9 +1914,6 @@ width: auto; vertical-align: top; } -.openerp .oe_form .oe_form_field_image > img { - min-width: 100px; -} .openerp .oe_form .oe_form_field_image .oe_form_field_image_controls { position: absolute; top: 1px; @@ -2040,6 +2048,20 @@ height: auto; line-height: 16px; } +.openerp .oe_form .oe_form_avatar { + float: left; + margin: 16px 0 16px 16px; +} +.openerp .oe_form .oe_form_avatar img { + height: 50px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + border: none; +} .openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { display: none !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index df3c82f499a..1ddb86ec3de 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -460,7 +460,6 @@ $colour4: #8a89ba border-right: 1px solid #afafb6 text-shadow: 0 1px 1px white padding-bottom: 16px - line-height: 18px a.oe_logo width: 220px display: block @@ -652,9 +651,9 @@ $colour4: #8a89ba float: right background: #8a89ba color: #eee - font-size: 12px + font-size: 10px border: 1px solid lightgray - padding: 0px 4px 0px 4px + padding: 2px 4px text-shadow: 0 1px 1px rgba(0,0,0,0.2) margin: 0px @include radius(4px) @@ -1274,11 +1273,14 @@ $colour4: #8a89ba max-width: 960px margin: 0 auto .oe_form_sheet - padding: 18px background: white min-height: 330px border: 1px solid #afafb6 @include box-shadow(0 0 10px rgba(0,0,0,0.3)) + > .oe_form_group + margin: 8px 16px + width: 97% + // }}} // FormView.layout {{{ .oe_form_invisible @@ -1467,7 +1469,13 @@ $colour4: #8a89ba overflow: hidden .oe_form_title - width: 55% + margin: 16px + float: left + h1 + font-size: 22px + h2 + font-size: 14px + font-weight: normal .oe_form_title:after content: "." display: block @@ -1475,11 +1483,11 @@ $colour4: #8a89ba clear: both visibility: hidden .oe_form_button_box - width: 200px - text-align: center - - .oe_form_group - margin: 5px 0px 5px 0px + width: 400px + margin: 16px + button + margin-left: 4px + float: right .oe_form_group_cell .oe_kanban_view // Hack due to absolute positioning of kanban view messing with o2m @@ -1529,8 +1537,6 @@ $colour4: #8a89ba margin: 0 padding: 0 .oe_form_field_image - > img - min-width: 100px padding: 0 position: relative display: inline-block @@ -1647,6 +1653,14 @@ $colour4: #8a89ba li height: auto line-height: 16px + .oe_form_avatar + float: left + margin: 16px 0 16px 16px + img + height: 50px + @include radius(3px) + @include box-shadow(0 1px 2px rgba(0, 0, 0, 0.2)) + border: none .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager display: none !important -- cgit v1.2.3 From 29584df4208dfdc9f571800feb8ae4150d71cf86 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 14 Jun 2012 10:44:20 +0200 Subject: [IMP] hide [disk drive] button in o2m editable lists bzr revid: xmo@openerp.com-20120614084420-0ky3d41kk2r8zlp8 --- addons/web/static/src/css/base.css | 3 +++ 1 file changed, 3 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 99cb4a31dee..13ffefa9acd 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1346,6 +1346,9 @@ label.error { display: inline; margin: 0 0.5em 0 0; } +.openerp .oe_form_field_one2many .oe-listview .oe-edit-row-save { + visibility: hidden; +} .openerp .oe_forms .oe-listview th.oe-sortable .ui-icon, .openerp .oe_forms .oe-listview th.oe-sortable .ui-icon { -- cgit v1.2.3 From fa86e685ccde7a9bc094ea51694400962908c940 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 14 Jun 2012 15:17:35 +0200 Subject: Removed send email button in edit mode bzr revid: mit@openerp.com-20120614131735-cyprh4ggz3j41igl --- addons/web/static/src/css/base.css | 2 -- addons/web/static/src/css/base.sass | 2 -- 2 files changed, 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 3b0d21ae934..a241b77405a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1753,7 +1753,6 @@ .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_email input, .openerp .oe_form .oe_form_field_url input { border-right: none; -webkit-border-top-right-radius: 0px; @@ -1763,7 +1762,6 @@ border-top-right-radius: 0px; border-bottom-right-radius: 0px; } -.openerp .oe_form .oe_form_field_email button img, .openerp .oe_form .oe_form_field_url button img { vertical-align: top; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1ddb86ec3de..4428b0bee70 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1390,7 +1390,6 @@ $colour4: #8a89ba .oe_form_field_many2one input, .oe_form_field_binary input, .oe_form_field_binary input, - .oe_form_field_email input, .oe_form_field_url input border-right: none -webkit-border-top-right-radius: 0px @@ -1399,7 +1398,6 @@ $colour4: #8a89ba -moz-border-radius-bottomright: 0px border-top-right-radius: 0px border-bottom-right-radius: 0px - .oe_form_field_email button img, .oe_form_field_url button img vertical-align: top .oe_form_field_date, -- cgit v1.2.3 From db054a47d8ae93fc17bb448c48507542da4e4981 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 14 Jun 2012 18:09:55 +0200 Subject: [FIX] Fix back kanban view in o2m bzr revid: fme@openerp.com-20120614160955-r9tdhztskc2bcg8e --- 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 32f520d1a30..d82bf69380a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1879,7 +1879,7 @@ right: 5px; top: 3px; } -.openerp .oe_form .oe_form_group_cell .oe_kanban_view { +.openerp .oe_form .oe_form_field_one2many .oe_kanban_view { position: static; } .openerp .oe_form .oe_form_field_with_button input { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d933550db23..ab29ee4e0f2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1485,7 +1485,7 @@ $colour4: #8a89ba filter: alpha(opacity=50) right: 5px top: 3px - .oe_form_group_cell .oe_kanban_view + .oe_form_field_one2many .oe_kanban_view // Hack due to absolute positioning of kanban view messing with o2m position: static .oe_form_field_with_button -- cgit v1.2.3 From 678101afb0eb92cda51ca8dbc5adac576d89d81a Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 15 Jun 2012 18:59:33 +0200 Subject: [IMP] factorization of view manager design; split global VS one2many CSS bzr revid: fp@tinyerp.com-20120615165933-80vj5e6n6lzmgw0p --- addons/web/static/src/css/base.css | 107 +++++++++--------- addons/web/static/src/css/base.sass | 213 +++++++++++++++++++----------------- 2 files changed, 170 insertions(+), 150 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 d82bf69380a..b3766a0d947 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -48,7 +48,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; @@ -866,91 +866,73 @@ .openerp .oe_application a:hover { text-decoration: underline; } -.openerp .oe_view_manager_header { +.openerp .oe_view_manager .oe_view_manager_header { width: 100%; - border-top: 1px solid #cacaca; - border-bottom: 1px solid #cacaca; - background-color: #fcfcfc; - background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); - background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); - background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); - background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); - background-image: -o-linear-gradient(top, #fcfcfc, #dedede); - background-image: linear-gradient(to bottom, #fcfcfc, #dedede); - -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); - -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); } -.openerp .oe_view_manager_header .oe_header_row { +.openerp .oe_view_manager .oe_view_manager_header .oe_header_row { clear: both; text-shadow: 0 1px 1px white; } -.openerp .oe_view_manager_header .oe_header_row td { - padding: 8px; -} -.openerp .oe_view_manager_header .oe_header_row:last-child td { +.openerp .oe_view_manager .oe_view_manager_header .oe_header_row:last-child td { padding-top: 0; } -.openerp .oe_view_manager_header .oe_header_row:first-child td { - padding-top: 8px; -} -.openerp .oe_view_manager_header .oe_view_manager_sidebar { +.openerp .oe_view_manager .oe_view_manager_header .oe_view_manager_sidebar { margin: 0px auto; width: 400px; text-align: center; } -.openerp .oe_view_manager_header td { +.openerp .oe_view_manager .oe_view_manager_header td { line-height: 26px; } -.openerp .oe_view_manager_header h2 { +.openerp .oe_view_manager .oe_view_manager_header h2 { font-size: 18px; margin: 0; float: left; } -.openerp .oe_view_manager_header h2 a { +.openerp .oe_view_manager .oe_view_manager_header h2 a { color: #8a89ba; } -.openerp .oe_view_manager_header .oe_button_group { +.openerp .oe_view_manager .oe_view_manager_header .oe_button_group { display: inline-block; border: 1px solid #ababab; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; } -.openerp .oe_view_manager_header .oe_button_group li { +.openerp .oe_view_manager .oe_view_manager_header .oe_button_group li { float: left; border-right: 1px solid #ababab; } -.openerp .oe_view_manager_header .oe_button_group li:last-child { +.openerp .oe_view_manager .oe_view_manager_header .oe_button_group li:last-child { border: none; } -.openerp .oe_view_manager_header .oe_button_group a { +.openerp .oe_view_manager .oe_view_manager_header .oe_button_group a { color: #4c4c4c; } -.openerp .oe_view_manager_header .oe_button_group a:hover { +.openerp .oe_view_manager .oe_view_manager_header .oe_button_group a:hover { text-decoration: none; } -.openerp .oe_view_manager_header .oe_button_group .active { +.openerp .oe_view_manager .oe_view_manager_header .oe_button_group .active { background: #999999; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; } -.openerp .oe_view_manager_header .oe_button_group .active a { +.openerp .oe_view_manager .oe_view_manager_header .oe_button_group .active a { color: white; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } -.openerp .oe_view_manager_header .oe_view_manager_buttons { +.openerp .oe_view_manager .oe_view_manager_header .oe_view_manager_buttons { white-space: nowrap; } -.openerp .oe_view_manager_pager { +.openerp .oe_view_manager .oe_view_manager_pager { line-height: 26px; } -.openerp .oe_pager_value { +.openerp .oe_view_manager .oe_pager_value { float: left; margin-right: 8px; } -.openerp .oe_pager_group { +.openerp .oe_view_manager .oe_pager_group { float: left; height: 24px; line-height: 24px; @@ -961,47 +943,47 @@ -webkit-border-radius: 5px; border-radius: 5px; } -.openerp .oe_pager_group li { +.openerp .oe_view_manager .oe_pager_group li { height: 24px; line-height: 24px; padding: 0; float: left; border-right: 1px solid #ababab; } -.openerp .oe_pager_group li:last-child { +.openerp .oe_view_manager .oe_pager_group li:last-child { border: none; } -.openerp .oe_pager_group a { +.openerp .oe_view_manager .oe_pager_group a { color: #4c4c4c; padding: 0 8px; } -.openerp .oe_pager_group a:hover { +.openerp .oe_view_manager .oe_pager_group a:hover { text-decoration: none; } -.openerp .oe_pager_group .active { +.openerp .oe_view_manager .oe_pager_group .active { background: #999999; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; } -.openerp .oe_pager_group .active a { +.openerp .oe_view_manager .oe_pager_group .active a { color: white; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } -.openerp .oe_view_manager_switch li { +.openerp .oe_view_manager .oe_view_manager_switch li { text-align: center; width: 24px; height: 24px; line-height: 16px; } -.openerp .oe_view_manager_switch li a { +.openerp .oe_view_manager .oe_view_manager_switch li a { position: relative; } -.openerp .oe_view_manager_switch .oe_vm_switch_list:after, .openerp .oe_view_manager_switch .oe_vm_switch_tree:after { +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_list:after, .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_tree:after { padding: 2px; content: "i"; } -.openerp .oe_view_manager_switch .oe_vm_switch_graph:after { +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_graph:after { font-family: "mnmliconsRegular" !important; font-size: 21px; font-weight: 300 !important; @@ -1009,7 +991,7 @@ top: -2px; position: relative; } -.openerp .oe_view_manager_switch .oe_vm_switch_gantt:after { +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_gantt:after { font-family: "mnmliconsRegular" !important; font-size: 21px; font-weight: 300 !important; @@ -1017,15 +999,38 @@ top: -2px; position: relative; } -.openerp .oe_view_manager_switch .oe_vm_switch_calendar:after { +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_calendar:after { content: "P"; } -.openerp .oe_view_manager_switch .oe_vm_switch_kanban:after { +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_kanban:after { content: "k"; } -.openerp .oe_view_manager_switch .oe_vm_switch_diagram:after { +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_diagram:after { content: "f"; } +.openerp .oe_view_manager_global > .oe_view_manager_header { + border-top: 1px solid #cacaca; + border-bottom: 1px solid #cacaca; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); + -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); +} +.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row td { + padding: 8px; +} +.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row:first-child td { + padding-top: 8px; +} +.openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top { + display: none; +} .openerp .oe_form_dropdown_section { position: relative; display: inline-block; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ab29ee4e0f2..f83afcfb08d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -704,49 +704,79 @@ $colour4: #8a89ba &:hover text-decoration: underline // }}} - // ViewManager.header {{{ - .oe_view_manager_header - width: 100% - border-top: 1px solid #cacaca - 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))) - .oe_header_row - //min-height: 26px - //line-height: 26px - clear: both - text-shadow: 0 1px 1px white - td - padding: 8px - .oe_header_row:last-child - td - padding-top: 0 - .oe_header_row:first-child + + // ViewManager common styles + .oe_view_manager + // ViewManager.header {{{ + .oe_view_manager_header + width: 100% + .oe_header_row + //min-height: 26px + //line-height: 26px + clear: both + text-shadow: 0 1px 1px white + .oe_header_row:last-child + td + padding-top: 0 + .oe_view_manager_sidebar + margin: 0px auto + width: 400px + text-align: center td - padding-top: 8px - .oe_view_manager_sidebar - margin: 0px auto - width: 400px - text-align: center - td + line-height: 26px + h2 + font-size: 18px + margin: 0 + float: left + a + color: $colour4 + .oe_button_group + display: inline-block + border: 1px solid #ababab + @include radius(5px) + li + float: left + border-right: 1px solid #ababab + &:last-child + border: none + a + color: #4c4c4c + &:hover + text-decoration: none + .active + background: #999 + @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset) + a + color: #fff + text-shadow: 0 1px 2px rgba(0,0,0,0.4) + .oe_view_manager_buttons + white-space: nowrap + // }}} + // ViewManager.pager {{{ + .oe_view_manager_pager line-height: 26px - h2 - font-size: 18px - margin: 0 + .oe_pager_value float: left - a - color: $colour4 - .oe_button_group + margin-right: 8px + .oe_pager_group + float: left + height: 24px + line-height: 24px display: inline-block border: 1px solid #ababab + cursor: pointer @include radius(5px) li + height: 24px + line-height: 24px + padding: 0 float: left border-right: 1px solid #ababab &:last-child border: none a color: #4c4c4c + padding: 0 8px &:hover text-decoration: none .active @@ -755,76 +785,61 @@ $colour4: #8a89ba a color: #fff text-shadow: 0 1px 2px rgba(0,0,0,0.4) - .oe_view_manager_buttons - white-space: nowrap - // }}} - // ViewManager.pager {{{ - .oe_view_manager_pager - line-height: 26px - .oe_pager_value - float: left - margin-right: 8px - .oe_pager_group - float: left - height: 24px - line-height: 24px - display: inline-block - border: 1px solid #ababab - cursor: pointer - @include radius(5px) - li - height: 24px - line-height: 24px - padding: 0 - float: left - border-right: 1px solid #ababab - &:last-child - border: none - a - color: #4c4c4c - padding: 0 8px - &:hover - text-decoration: none - .active - background: #999 - @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset) - a - color: #fff - text-shadow: 0 1px 2px rgba(0,0,0,0.4) - // }}} - // ViewManager.switches {{{ - .oe_view_manager_switch - li - text-align: center - width: 24px - height: 24px - line-height: 16px - a + // }}} + // ViewManager.switches {{{ + .oe_view_manager_switch + li + text-align: center + width: 24px + height: 24px + line-height: 16px + a + position: relative + .oe_vm_switch_list:after, .oe_vm_switch_tree:after + padding: 2px + content: "i" + .oe_vm_switch_graph:after + font-family: "mnmliconsRegular" !important + font-size: 21px + font-weight: 300 !important + content: "}" + top: -2px position: relative - .oe_vm_switch_list:after, .oe_vm_switch_tree:after - padding: 2px - content: "i" - .oe_vm_switch_graph:after - font-family: "mnmliconsRegular" !important - font-size: 21px - font-weight: 300 !important - content: "}" - top: -2px - position: relative - .oe_vm_switch_gantt:after - font-family: "mnmliconsRegular" !important - font-size: 21px - font-weight: 300 !important - content: "y" - top: -2px - position: relative - .oe_vm_switch_calendar:after - content: "P" - .oe_vm_switch_kanban:after - content: "k" - .oe_vm_switch_diagram:after - content: "f" - // }}} + .oe_vm_switch_gantt:after + font-family: "mnmliconsRegular" !important + font-size: 21px + font-weight: 300 !important + content: "y" + top: -2px + position: relative + .oe_vm_switch_calendar:after + content: "P" + .oe_vm_switch_kanban:after + content: "k" + .oe_vm_switch_diagram:after + content: "f" + // }}} + + // ViewManager top header specific style + .oe_view_manager_global + > .oe_view_manager_header + border-top: 1px solid #cacaca + 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))) + .oe_header_row + td + padding: 8px + .oe_header_row:first-child + td + padding-top: 8px + + // ViewManager one2many specific style + .oe_form_field_one2many > .oe_view_manager + .oe_header_row_top + display: none + + // ViewManager.sidebar {{{ .oe_form_dropdown_section position: relative -- cgit v1.2.3 From ff1e444ef823cdbe02bef3682225b6a33be6a49b Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 15 Jun 2012 19:02:46 +0200 Subject: imp bzr revid: fp@tinyerp.com-20120615170246-t00vi1e4btal2xva --- addons/web/static/src/css/base.sass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f83afcfb08d..6ac888ffac9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -820,7 +820,7 @@ $colour4: #8a89ba content: "f" // }}} - // ViewManager top header specific style + // ViewManager top header specific style {{{ .oe_view_manager_global > .oe_view_manager_header border-top: 1px solid #cacaca @@ -833,11 +833,13 @@ $colour4: #8a89ba .oe_header_row:first-child td padding-top: 8px + // }}} - // ViewManager one2many specific style + // ViewManager one2many specific style {{{ .oe_form_field_one2many > .oe_view_manager .oe_header_row_top display: none + // }}} // ViewManager.sidebar {{{ -- cgit v1.2.3 From 9d9449cab41644f575b977e35b4065fbe07d04f5 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 15 Jun 2012 19:03:09 +0200 Subject: Improved styling of form view bzr revid: mit@openerp.com-20120615170309-b5trzymp23b5elm1 --- addons/web/static/src/css/base.css | 79 +++++++++++++++++-------------------- addons/web/static/src/css/base.sass | 63 +++++++++++++---------------- 2 files changed, 64 insertions(+), 78 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 a241b77405a..639e6bdc641 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -112,7 +112,8 @@ .openerp li { list-style-type: none; } -.openerp input, .openerp textarea { +.openerp input, .openerp textarea, .openerp select { + padding: 4px; border: 1px solid #cccccc; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1118,10 +1119,6 @@ height: 14px; font-size: 11px; line-height: 18px; - border: 1px solid #cccccc; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; } .openerp .oe_searchview.oe_focused { border-color: #a6a6fe; @@ -1619,14 +1616,15 @@ .openerp .oe_application .oe_form_sheet { background: white; min-height: 330px; + padding: 16px; border: 1px solid #afafb6; -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); } -.openerp .oe_application .oe_form_sheet > .oe_form_group { - margin: 8px 16px; - width: 97%; +.openerp .oe_application .oe_form_sheet .oe_form_group { + width: 100%; + margin: 8px 0; } .openerp .oe_form_invisible { display: none !important; @@ -1641,11 +1639,14 @@ width: 100%; } .openerp .oe_form .oe_form_field_char input, -.openerp .oe_form .oe_form_field_text textarea, .openerp .oe_form .oe_form_field_url input, +.openerp .oe_form .oe_form_field_text textarea, .openerp .oe_form .oe_form_field_selection select { width: inherit; } +.openerp .oe_form .oe_form_sheet textarea { + width: 49%; +} .openerp .oe_form .oe_form_field_float input { width: 100px; } @@ -1680,7 +1681,7 @@ padding: 0 2px; } .openerp .oe_form .oe_form_field_text textarea { - resize: vertical; + resize: none; } .openerp .oe_form .oe_form_field { width: 100%; @@ -1706,6 +1707,9 @@ .openerp .oe_form .oe_form_inline { width: auto; } +.openerp .oe_form .ui-tabs { + margin: 0 -16px; +} .openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], @@ -1722,11 +1726,6 @@ -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; - padding: 0 2px; - border: 1px solid #999999; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; background: white; min-width: 70px; color: #1f1f1f; @@ -1832,11 +1831,9 @@ } .openerp .oe_form .oe_form_field_with_button > .oe_button { float: right; - -webkit-border-top-left-radius: 0px; - -webkit-border-bottom-left-radius: 0px; - -moz-border-radius-topleft: 0px; - -moz-border-radius-bottomleft: 0px; - border-top-left-radius: 0px; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; border-bottom-left-radius: 0px; height: 22px; } @@ -1845,23 +1842,19 @@ overflow: hidden; } .openerp .oe_form .oe_form_title { - margin: 16px; float: left; + width: 460px; } .openerp .oe_form .oe_form_title h1 { font-size: 22px; } +.openerp .oe_form .oe_form_title h1 input { + width: 100%; +} .openerp .oe_form .oe_form_title h2 { font-size: 14px; font-weight: normal; } -.openerp .oe_form .oe_form_title:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} .openerp .oe_form .oe_form_button_box { width: 400px; margin: 16px; @@ -1870,7 +1863,7 @@ margin-left: 4px; float: right; } -.openerp .oe_form .oe_form_group_cell .oe_kanban_view { +.openerp .oe_form .e_form_group_cell .oe_kanban_view { position: static; } .openerp .oe_form .oe_form_button.oe_button { @@ -1947,11 +1940,19 @@ padding: 0 4px 0 4px; } .openerp .oe_form_notebook { - margin: 8px 0; - padding: 0 8px; + margin-top: 8px; + padding: 0 16px; list-style: none; + border-color: #dddddd; + border-style: solid; + border-width: 0 0 1px; zoom: 1; } +.openerp .oe_form_notebook.ui-corner-all { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; +} .openerp .oe_form_notebook:before, .openerp .oe_form_notebook:after { display: table; content: ""; @@ -1967,14 +1968,8 @@ display: block; color: #4c4c4c; } -.openerp .oe_form_notebook { - border-color: #dddddd; - border-style: solid; - border-width: 0 0 1px; -} .openerp .oe_form_notebook > li { position: relative; - margin-bottom: -1px; } .openerp .oe_form_notebook > li > a { padding: 0 12px; @@ -1997,7 +1992,7 @@ cursor: default; } .openerp .oe_form_notebook_page { - padding: 0; + padding: 16px 16px; } .openerp div.ui-tabs { padding: 3px 0px 3px 0px; @@ -2048,16 +2043,16 @@ } .openerp .oe_form .oe_form_avatar { float: left; - margin: 16px 0 16px 16px; + margin: 0 16px 0 0; } .openerp .oe_form .oe_form_avatar img { height: 50px; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); border: none; } .openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4428b0bee70..4a472a50a4c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -155,7 +155,8 @@ $colour4: #8a89ba padding: 0 li list-style-type: none - input, textarea + input, textarea, select + padding: 4px border: 1px solid #ccc @include radius(3px) img @@ -894,8 +895,6 @@ $colour4: #8a89ba height: 14px font-size: 11px line-height: 18px - border: 1px solid #ccc - @include radius(3px) &.oe_focused border-color: $facets-border-selected @include box-shadow(0 1px 2px $facets-border-selected inset) @@ -1275,11 +1274,12 @@ $colour4: #8a89ba .oe_form_sheet background: white min-height: 330px + padding: 16px border: 1px solid #afafb6 @include box-shadow(0 0 10px rgba(0,0,0,0.3)) - > .oe_form_group - margin: 8px 16px - width: 97% + .oe_form_group + width: 100% + margin: 8px 0 // }}} // FormView.layout {{{ @@ -1295,11 +1295,12 @@ $colour4: #8a89ba width: 100% .oe_form_field_char input, - .oe_form_field_text textarea, .oe_form_field_url input, + .oe_form_field_text textarea, .oe_form_field_selection select width: inherit - + .oe_form_sheet textarea + width: 49% .oe_form_field_float input width: 100px @@ -1336,7 +1337,7 @@ $colour4: #8a89ba // FormView.fields {{{ .oe_form .oe_form_field_text textarea - resize: vertical + resize: none .oe_form_field width: 100% display: inline-block @@ -1344,7 +1345,6 @@ $colour4: #8a89ba line-height: 18px input margin: 0px - .oe_form_field_integer width: 180px .oe_form_field_float @@ -1355,6 +1355,8 @@ $colour4: #8a89ba width: 11em .oe_form_inline width: auto + .ui-tabs + margin: 0 -16px input[type="text"], input[type="password"], @@ -1368,9 +1370,6 @@ $colour4: #8a89ba select, textarea @include box-sizing(border) - padding: 0 2px - border: 1px solid #999 - @include radius(3px) background: white min-width: 70px color: #1f1f1f @@ -1455,11 +1454,7 @@ $colour4: #8a89ba width: 100% > .oe_button float: right - -webkit-border-top-left-radius: 0px - -webkit-border-bottom-left-radius: 0px - -moz-border-radius-topleft: 0px - -moz-border-radius-bottomleft: 0px - border-top-left-radius: 0px + @include radius(0) border-bottom-left-radius: 0px height: 22px > div @@ -1467,19 +1462,15 @@ $colour4: #8a89ba overflow: hidden .oe_form_title - margin: 16px float: left + width: 460px h1 font-size: 22px + input + width: 100% h2 font-size: 14px font-weight: normal - .oe_form_title:after - content: "." - display: block - height: 0 - clear: both - visibility: hidden .oe_form_button_box width: 400px margin: 16px @@ -1487,7 +1478,7 @@ $colour4: #8a89ba margin-left: 4px float: right - .oe_form_group_cell .oe_kanban_view + .e_form_group_cell .oe_kanban_view // Hack due to absolute positioning of kanban view messing with o2m position: static @@ -1570,10 +1561,15 @@ $colour4: #8a89ba // }}} // FormView.notebook {{{ .oe_form_notebook - margin: 8px 0 - padding: 0 8px + margin-top: 8px + padding: 0 16px list-style: none + border-color: #ddd + border-style: solid + border-width: 0 0 1px zoom: 1 + .oe_form_notebook.ui-corner-all + @include radius(0) .oe_form_notebook:before, .oe_form_notebook:after display: table content: "" @@ -1585,13 +1581,8 @@ $colour4: #8a89ba .oe_form_notebook > li > a display: block color: #4c4c4c - .oe_form_notebook - border-color: #ddd - border-style: solid - border-width: 0 0 1px .oe_form_notebook > li position: relative - margin-bottom: -1px .oe_form_notebook > li > a padding: 0 12px margin-right: 2px @@ -1608,7 +1599,7 @@ $colour4: #8a89ba border-bottom-color: transparent cursor: default .oe_form_notebook_page - padding: 0 + padding: 16px 16px div.ui-tabs padding: 3px 0px 3px 0px .ui-tabs-hide @@ -1653,11 +1644,11 @@ $colour4: #8a89ba line-height: 16px .oe_form_avatar float: left - margin: 16px 0 16px 16px + margin: 0 16px 0 0 img height: 50px @include radius(3px) - @include box-shadow(0 1px 2px rgba(0, 0, 0, 0.2)) + @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) border: none .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager display: none !important -- cgit v1.2.3 From 4ce44b0b93d8b22371c487feca409a7abbcc772d Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 15 Jun 2012 22:10:30 +0200 Subject: [IMP] fixing absolute problems on kanban and clean one2many kanban bzr revid: fp@openerp.com-20120615201030-8h6htqs1x8j9re5z --- addons/web/static/src/css/base.css | 20 +- addons/web/static/src/css/base.sass | 1099 ++++++++++++++++++----------------- 2 files changed, 563 insertions(+), 556 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 b3766a0d947..84f1b7ed2a0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -48,7 +48,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; @@ -866,6 +866,15 @@ .openerp .oe_application a:hover { text-decoration: underline; } +.openerp .oe_application > div { + height: 100%; +} +.openerp .oe_view_manager .oe_view_manager_body { + height: inherit; +} +.openerp .oe_view_manager .oe_view_manager_view_kanban { + height: inherit; +} .openerp .oe_view_manager .oe_view_manager_header { width: 100%; } @@ -1008,6 +1017,9 @@ .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_diagram:after { content: "f"; } +.openerp .oe_view_manager_global { + height: 100%; +} .openerp .oe_view_manager_global > .oe_view_manager_header { border-top: 1px solid #cacaca; border-bottom: 1px solid #cacaca; @@ -1884,9 +1896,6 @@ right: 5px; top: 3px; } -.openerp .oe_form .oe_form_field_one2many .oe_kanban_view { - position: static; -} .openerp .oe_form .oe_form_field_with_button input { width: 100%; } @@ -1921,9 +1930,6 @@ .openerp .oe_form .oe_form_group { margin: 5px 0px 5px 0px; } -.openerp .oe_form .oe_form_group_cell .oe_kanban_view { - position: static; -} .openerp .oe_form .oe_form_button.oe_button { height: 22px; white-space: nowrap; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 6ac888ffac9..8aa409d7342 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,545 +1,545 @@ -@charset "utf-8" - -// Variables {{{ -$section-title-color: #8786b7 -$facets-border: #afafb6 -$facets-border-selected: #a6a6fe -$hover-background: #f0f0fa -$colour4: #8a89ba -// }}} -// Mixins {{{ -@font-face - font-family: 'mnmliconsRegular' - src: url('/web/static/src/font/mnmliconsv21-webfont.eot') format('eot') - src: url('/web/static/src/font/mnmliconsv21-webfont.woff') format('woff') - src: url('/web/static/src/font/mnmliconsv21-webfont.ttf') format('truetype') - src: url('/web/static/src/font/mnmliconsv21-webfont.svg') format('svg') active - font-weight: normal - font-style: normal - -@font-face - font-family: 'EntypoRegular' - src: url('/web/static/src/font/entypo-webfont.eot') format('eot') - src: url('/web/static/src/font/entypo-webfont.eot?#iefix') format('embedded-opentype') - src: url('/web/static/src/font/entypo-webfont.woff') format('woff') - src: url('/web/static/src/font/entypo-webfont.ttf') format('truetype') - src: url('/web/static/src/font/entypo-webfont.svg') format('svg') active - font-weight: normal - font-style: normal - -@mixin vertical-gradient($startColor: #555, $endColor: #333) - background-color: $startColor - background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */ - background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */ - background-image: -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */ - background-image: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */ - background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */ - background-image: linear-gradient(to bottom, $startColor, $endColor) - - -@mixin radial-gradient($gradient) - background-position: center center - background-image: -webkit-radial-gradient(circle, $gradient) - background-image: -moz-radial-gradient($gradient) - background-image: -ms-radial-gradient($gradient) - background-image: radial-gradient($gradient) - -@mixin radius($radius: 5px) - -moz-border-radius: $radius - -webkit-border-radius: $radius - border-radius: $radius - -@mixin box-shadow($bsval: 0px 1px 4px #777) - -moz-box-shadow: $bsval - -webkit-box-shadow: $bsval - box-shadow: $bsval - -@mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s)) - -webkit-transition: $transval - -moz-transition: $transval - -ms-transition: $transval - -o-transition: $transval - transition: $transval - -@mixin opacity($opacity: .5) - filter: alpha(opacity=$opacity * 100) - opacity: $opacity - -@mixin background-clip($clip: padding-box) - -webkit-background-clip: $clip - -moz-background-clip: $clip - background-clip: $clip - -@mixin box-sizing($type: content) - // type = border || content || padding - -webkit-box-sizing: #{$type}-box - -moz-box-sizing: #{$type}-box - -ms-box-sizing: #{$type}-box - box-sizing: #{$type}-box - -// Transforms the (readable) text of an inline element into an mmlicons icon, -// allows for actual readable text in-code (and in readers?) with iconic looks -@mixin text-to-icon($icon-name, $color: #404040) - font-size: 1px - letter-spacing: -1px - color: transparent - &:before - font-family: "mnmliconsRegular" - content: $icon-name - font-size: 20px - color: $color - -// }}} - - -.openerp.openerp-web-client-container - height: 100% - position: relative - -// Jquery ui Overrides {{{ -.ui-widget - font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif - font-size: 13px -.ui-menu - .ui-menu-item - margin: 0 8px 0 0 - padding: 0 0 0 12px - width: auto - a.ui-state-active - background: #f0f0fa -// }}} - -.openerp - // Global style {{{ - padding: 0 - margin: 0 - font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif - color: #4c4c4c - font-size: 13px - background: white - // }}} - // Tag reset {{{ - a - text-decoration: none - table - padding: 0 - font-size: 13px - border-collapse: collapse - thead - font-weight: bold - background-color: #f0f0f0 - th - border-right: 1px dotted #afafb6 - &:last-child - border-right: none - th, td - padding: 0 - text-align: left - th - font-weight: bold - vertical-align: middle - td - vertical-align: top - .zebra tbody tr:nth-child(odd) td - background-color: #f0f0fa - @include vertical-gradient(#f0f0fa, #eeeef6) - .zebra tbody tr:hover td - @include vertical-gradient(#eee, #dedede) - .numeric - text-align: right - width: 82px - input - text-align: right - ul, li, ol - margin: 0 - padding: 0 - li - list-style-type: none - input, textarea - border: 1px solid #ccc - @include radius(3px) - img - vertical-align: middle - h4 - margin: 4px 0 - - // }}} - // Generic classes {{{ - .oe_i - font-family: "mnmliconsRegular" !important - font-size: 21px - font-weight: 300 !important - .oe_e - font-family: "entypoRegular" !important - font-size: 34px - font-weight: 300 !important - .oe_left - float: left - margin-right: 8px - .oe_right - float: right - margin-left: 8px - .oe_text_right - text-align: right - .oe_clear - clear: both - .oe_wait - cursor: wait - .oe_fade - color: #888 - //font-size: 12px - .oe_bold - font-weight: bold - // }}} - // Button style {{{ - a.button:link, a.button:visited, button, input[type='submit'] - display: inline-block - border: 1px solid #ababab - color: #404040 - margin: 0 - padding: 3px 12px - font-size: 13px - text-align: center - @include vertical-gradient(#efefef, #d8d8d8) - @include radius(3px) - @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset)) - text-shadow: 0 1px 1px rgba(255, 255, 255, .5) - -webkit-font-smoothing: antialiased - outline: none - - a.button:hover, button:hover, input[type='submit']:hover - @include vertical-gradient(#f6f6f6, #e3e3e3) - cursor: pointer - - a.button:focus, button:focus, input[type='submit']:focus - border: 1px solid #80bfff - @include vertical-gradient(#f6f6f6, #e3e3e3) - @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset)) - - a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active - background: #e3e3e3 - background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f - background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f - background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f - @include box-shadow(none) - - a.button.disabled, button:disabled, input[type='submit']:disabled - background: #efefef !important - border: 1px solid #d1d1d1 !important - @include box-shadow(none !important) - color: #aaa !important - cursor: default - text-shadow: 0 1px 1px #fff !important - - button.primary - color: white - @include vertical-gradient(#dc5f59, #b33630) - @include box-shadow(none) - - button.primary:hover - @include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) - @include box-shadow(0 0 1px rgba(0,0,0,0.2)) - - button.primary:active - @include vertical-gradient(#b33630, #dc5f59) - @include box-shadow(none) - - button.following - color: white - width: 120px - @include vertical-gradient($colour4, darken($colour4, 3%)) - - button.unfollow - display: none - color: white - width: 120px - @include vertical-gradient(#dc5f59, #b33630) - - // }}} - // Loading {{{ - .oe_loading - display: none - z-index: 100 - position: fixed - top: 0 - right: 50% - padding: 4px 12px - background: #A61300 - color: white - text-align: center - border: 1px solid #900 - border-top: none - -moz-border-radius-bottomright: 8px - -moz-border-radius-bottomleft: 8px - border-bottom-right-radius: 8px - border-bottom-left-radius: 8px - // }}} - // Notification {{{ - .oe_notification - z-index: 1050 - // }}} - // Login {{{ - .oe_login - background: url("/web/static/src/img/pattern.png") repeat - text-align: center - font-size: 14px - height: 100% - li - list-style-type: none - padding-bottom: 4px - button - float: right - display: inline-block - cursor: pointer - padding: 6px 16px - border: 1px solid #222 - color: white - margin: 0 - @include vertical-gradient(#b92020, #600606) - @include radius(4px) - @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset)) - input, select - width: 252px - font-family: "Lucida Grande", Helvetica, Verdana, Arial - border: 1px solid #999999 - background: whitesmoke - @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.3)) - @include radius(3px) - input - margin-bottom: 9px - padding: 5px 6px - select - padding: 1px - .oe_login_dbpane - position: fixed - top: 0 - right: 8px - padding: 5px 10px - color: #eee - border: solid 1px #333 - background: #1e1e1e - background: rgba(30,30,30,0.94) - @include radius(0 0 8px 8px) - input - padding: 2px 4px - margin: 4px 0 - .oe_login_bottom - position: absolute - top: 50% - left: 0 - right: 0 - bottom: 0 - text-shadow: 0 1px 1px #999999 - @include vertical-gradient(#b41616, #600606) - .oe_login_pane - position: absolute - top: 50% - left: 50% - margin: -160px -166px - border: solid 1px #333333 - background: #1e1e1e - background: rgba(30,30,30,0.94) - padding: 22px 32px - color: #eee - text-align: left - @include radius(8px) - @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) - h2 - margin-top: 0 - font-size: 18px - .oe_login_logo - position: absolute - top: -70px - left: 0 - width: 100% - margin: 0 auto - text-align: center - .oe_login_footer - position: absolute - bottom: -40px - left: 0 - width: 100% - text-align: center - a - color: #eee - margin: 0 8px - &:hover - text-decoration: underline - span - font-weight: bold - font-size: 16px - .oe_login_error_message - display: none - background-color: #b41616 - color: #eee - padding: 14px 18px - margin-top: 15px - text-align: center - @include radius(4px) - @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.8)) - .oe_login_invalid - .oe_login_error_message - display: inline-block - // }}} - // DatabaseManager {{{ - .oe_database_manager - background: #fff - color: #000 - text-align: left - .oe_database_manager_menu - color: #000 - // }}} - // WebClient {{{ - .oe_webclient - width: 100% - height: 100% - border-spacing: 0px - // }}} - // WebClient.fullscreen {{{ - .oe_content_full_screen - .oe_application - top: 0 - left: 0 - .oe_topbar, .oe_leftbar - display: none - // }}} - // WebClient.topbar {{{ - .oe_topbar - width: 100% - height: 31px - border-top: solid 1px #d3d3d3 - @include vertical-gradient(#646060, #262626) - - .oe_topbar_item - li - float: left - a - display: block - padding: 5px 10px 7px - line-height: 20px - height: 20px - color: #eee - vertical-align: top - text-shadow: 0 1px 1px rgba(0,0,0,0.2) - &:hover - background: #303030 - color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) - .oe_active - background: #303030 - font-weight: bold - color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) - - .oe_topbar_avatar - width: 24px - height: 24px - margin: -2px 2px 0 0 - @include radius(3px) - .oe_topbar_avatar - vertical-align: top - .oe_dropdown_toggle:after - width: 0 - height: 0 - display: inline-block - content: "&darr" - text-indent: -99999px - vertical-align: top - margin-top: 8px - margin-left: 4px - border-left: 4px solid transparent - border-right: 4px solid transparent - border-top: 4px solid white - @include opacity(0.5) - // }}} - // Webclient.leftbar {{{ - .oe_leftbar - display: none - width: 220px - background: #f0eeee - border-right: 1px solid #afafb6 - text-shadow: 0 1px 1px white - padding-bottom: 16px - line-height: 18px - a.oe_logo - width: 220px - display: block - text-align: center - height: 70px - line-height: 70px - img - height: 40px - width: 157px - margin: 14px 0 - .oe_footer - position: fixed - bottom: 0 - padding: 4px 0 - background: #f0eeee - width: 220px - text-align: center - a - font-weight: 800 - font-family: serif - font-size: 16px - color: black - span - color: #c81010 - font-style: italic - // }}} - // UserMenu {{{ - .oe_user_menu - float: right - padding: 0 - margin: 0 - li - list-style-type: none - float: left - .oe_dropdown - position: relative - - .oe_dropdown_options - float: left - background: #333 - background: rgba(37,37,37,0.9) - display: none - position: absolute - top: 32px - right: -1px - border: 0 - z-index: 900 - margin-left: 0 - margin-right: 0 - padding: 6px 0 - zoom: 1 - border-color: #999 - border-color: rgba(0, 0, 0, 0.2) - border-style: solid - border-width: 0 1px 1px - @include radius(0 0 6px 6px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - @include background-clip() - li - float: none - display: block - background-color: none - a - white-space: nowrap - display: block - padding: 4px 15px - clear: both - font-weight: normal - line-height: 18px - color: #eee - &:hover - @include vertical-gradient(#292929, #191919) - @include box-shadow(none) - hr - border-top: 1px solid #999 - border-bottom: 0 - // }}} - // Systray {{{ - .oe_systray > div + @charset "utf-8" + + // Variables {{{ + $section-title-color: #8786b7 + $facets-border: #afafb6 + $facets-border-selected: #a6a6fe + $hover-background: #f0f0fa + $colour4: #8a89ba + // }}} + // Mixins {{{ + @font-face + font-family: 'mnmliconsRegular' + src: url('/web/static/src/font/mnmliconsv21-webfont.eot') format('eot') + src: url('/web/static/src/font/mnmliconsv21-webfont.woff') format('woff') + src: url('/web/static/src/font/mnmliconsv21-webfont.ttf') format('truetype') + src: url('/web/static/src/font/mnmliconsv21-webfont.svg') format('svg') active + font-weight: normal + font-style: normal + + @font-face + font-family: 'EntypoRegular' + src: url('/web/static/src/font/entypo-webfont.eot') format('eot') + src: url('/web/static/src/font/entypo-webfont.eot?#iefix') format('embedded-opentype') + src: url('/web/static/src/font/entypo-webfont.woff') format('woff') + src: url('/web/static/src/font/entypo-webfont.ttf') format('truetype') + src: url('/web/static/src/font/entypo-webfont.svg') format('svg') active + font-weight: normal + font-style: normal + + @mixin vertical-gradient($startColor: #555, $endColor: #333) + background-color: $startColor + background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */ + background-image: -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */ + background-image: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */ + background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */ + background-image: linear-gradient(to bottom, $startColor, $endColor) + + + @mixin radial-gradient($gradient) + background-position: center center + background-image: -webkit-radial-gradient(circle, $gradient) + background-image: -moz-radial-gradient($gradient) + background-image: -ms-radial-gradient($gradient) + background-image: radial-gradient($gradient) + + @mixin radius($radius: 5px) + -moz-border-radius: $radius + -webkit-border-radius: $radius + border-radius: $radius + + @mixin box-shadow($bsval: 0px 1px 4px #777) + -moz-box-shadow: $bsval + -webkit-box-shadow: $bsval + box-shadow: $bsval + + @mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s)) + -webkit-transition: $transval + -moz-transition: $transval + -ms-transition: $transval + -o-transition: $transval + transition: $transval + + @mixin opacity($opacity: .5) + filter: alpha(opacity=$opacity * 100) + opacity: $opacity + + @mixin background-clip($clip: padding-box) + -webkit-background-clip: $clip + -moz-background-clip: $clip + background-clip: $clip + + @mixin box-sizing($type: content) + // type = border || content || padding + -webkit-box-sizing: #{$type}-box + -moz-box-sizing: #{$type}-box + -ms-box-sizing: #{$type}-box + box-sizing: #{$type}-box + + // Transforms the (readable) text of an inline element into an mmlicons icon, + // allows for actual readable text in-code (and in readers?) with iconic looks + @mixin text-to-icon($icon-name, $color: #404040) + font-size: 1px + letter-spacing: -1px + color: transparent + &:before + font-family: "mnmliconsRegular" + content: $icon-name + font-size: 20px + color: $color + + // }}} + + + .openerp.openerp-web-client-container + height: 100% + position: relative + + // Jquery ui Overrides {{{ + .ui-widget + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif + font-size: 13px + .ui-menu + .ui-menu-item + margin: 0 8px 0 0 + padding: 0 0 0 12px + width: auto + a.ui-state-active + background: #f0f0fa + // }}} + + .openerp + // Global style {{{ + padding: 0 + margin: 0 + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif + color: #4c4c4c + font-size: 13px + background: white + // }}} + // Tag reset {{{ + a + text-decoration: none + table + padding: 0 + font-size: 13px + border-collapse: collapse + thead + font-weight: bold + background-color: #f0f0f0 + th + border-right: 1px dotted #afafb6 + &:last-child + border-right: none + th, td + padding: 0 + text-align: left + th + font-weight: bold + vertical-align: middle + td + vertical-align: top + .zebra tbody tr:nth-child(odd) td + background-color: #f0f0fa + @include vertical-gradient(#f0f0fa, #eeeef6) + .zebra tbody tr:hover td + @include vertical-gradient(#eee, #dedede) + .numeric + text-align: right + width: 82px + input + text-align: right + ul, li, ol + margin: 0 + padding: 0 + li + list-style-type: none + input, textarea + border: 1px solid #ccc + @include radius(3px) + img + vertical-align: middle + h4 + margin: 4px 0 + + // }}} + // Generic classes {{{ + .oe_i + font-family: "mnmliconsRegular" !important + font-size: 21px + font-weight: 300 !important + .oe_e + font-family: "entypoRegular" !important + font-size: 34px + font-weight: 300 !important + .oe_left + float: left + margin-right: 8px + .oe_right + float: right + margin-left: 8px + .oe_text_right + text-align: right + .oe_clear + clear: both + .oe_wait + cursor: wait + .oe_fade + color: #888 + //font-size: 12px + .oe_bold + font-weight: bold + // }}} + // Button style {{{ + a.button:link, a.button:visited, button, input[type='submit'] + display: inline-block + border: 1px solid #ababab + color: #404040 + margin: 0 + padding: 3px 12px + font-size: 13px + text-align: center + @include vertical-gradient(#efefef, #d8d8d8) + @include radius(3px) + @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset)) + text-shadow: 0 1px 1px rgba(255, 255, 255, .5) + -webkit-font-smoothing: antialiased + outline: none + + a.button:hover, button:hover, input[type='submit']:hover + @include vertical-gradient(#f6f6f6, #e3e3e3) + cursor: pointer + + a.button:focus, button:focus, input[type='submit']:focus + border: 1px solid #80bfff + @include vertical-gradient(#f6f6f6, #e3e3e3) + @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset)) + + a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active + background: #e3e3e3 + background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f + background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f + background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f + @include box-shadow(none) + + a.button.disabled, button:disabled, input[type='submit']:disabled + background: #efefef !important + border: 1px solid #d1d1d1 !important + @include box-shadow(none !important) + color: #aaa !important + cursor: default + text-shadow: 0 1px 1px #fff !important + + button.primary + color: white + @include vertical-gradient(#dc5f59, #b33630) + @include box-shadow(none) + + button.primary:hover + @include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) + @include box-shadow(0 0 1px rgba(0,0,0,0.2)) + + button.primary:active + @include vertical-gradient(#b33630, #dc5f59) + @include box-shadow(none) + + button.following + color: white + width: 120px + @include vertical-gradient($colour4, darken($colour4, 3%)) + + button.unfollow + display: none + color: white + width: 120px + @include vertical-gradient(#dc5f59, #b33630) + + // }}} + // Loading {{{ + .oe_loading + display: none + z-index: 100 + position: fixed + top: 0 + right: 50% + padding: 4px 12px + background: #A61300 + color: white + text-align: center + border: 1px solid #900 + border-top: none + -moz-border-radius-bottomright: 8px + -moz-border-radius-bottomleft: 8px + border-bottom-right-radius: 8px + border-bottom-left-radius: 8px + // }}} + // Notification {{{ + .oe_notification + z-index: 1050 + // }}} + // Login {{{ + .oe_login + background: url("/web/static/src/img/pattern.png") repeat + text-align: center + font-size: 14px + height: 100% + li + list-style-type: none + padding-bottom: 4px + button + float: right + display: inline-block + cursor: pointer + padding: 6px 16px + border: 1px solid #222 + color: white + margin: 0 + @include vertical-gradient(#b92020, #600606) + @include radius(4px) + @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset)) + input, select + width: 252px + font-family: "Lucida Grande", Helvetica, Verdana, Arial + border: 1px solid #999999 + background: whitesmoke + @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.3)) + @include radius(3px) + input + margin-bottom: 9px + padding: 5px 6px + select + padding: 1px + .oe_login_dbpane + position: fixed + top: 0 + right: 8px + padding: 5px 10px + color: #eee + border: solid 1px #333 + background: #1e1e1e + background: rgba(30,30,30,0.94) + @include radius(0 0 8px 8px) + input + padding: 2px 4px + margin: 4px 0 + .oe_login_bottom + position: absolute + top: 50% + left: 0 + right: 0 + bottom: 0 + text-shadow: 0 1px 1px #999999 + @include vertical-gradient(#b41616, #600606) + .oe_login_pane + position: absolute + top: 50% + left: 50% + margin: -160px -166px + border: solid 1px #333333 + background: #1e1e1e + background: rgba(30,30,30,0.94) + padding: 22px 32px + color: #eee + text-align: left + @include radius(8px) + @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) + h2 + margin-top: 0 + font-size: 18px + .oe_login_logo + position: absolute + top: -70px + left: 0 + width: 100% + margin: 0 auto + text-align: center + .oe_login_footer + position: absolute + bottom: -40px + left: 0 + width: 100% + text-align: center + a + color: #eee + margin: 0 8px + &:hover + text-decoration: underline + span + font-weight: bold + font-size: 16px + .oe_login_error_message + display: none + background-color: #b41616 + color: #eee + padding: 14px 18px + margin-top: 15px + text-align: center + @include radius(4px) + @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.8)) + .oe_login_invalid + .oe_login_error_message + display: inline-block + // }}} + // DatabaseManager {{{ + .oe_database_manager + background: #fff + color: #000 + text-align: left + .oe_database_manager_menu + color: #000 + // }}} + // WebClient {{{ + .oe_webclient + width: 100% + height: 100% + border-spacing: 0px + // }}} + // WebClient.fullscreen {{{ + .oe_content_full_screen + .oe_application + top: 0 + left: 0 + .oe_topbar, .oe_leftbar + display: none + // }}} + // WebClient.topbar {{{ + .oe_topbar + width: 100% + height: 31px + border-top: solid 1px #d3d3d3 + @include vertical-gradient(#646060, #262626) + + .oe_topbar_item + li + float: left + a + display: block + padding: 5px 10px 7px + line-height: 20px + height: 20px + color: #eee + vertical-align: top + text-shadow: 0 1px 1px rgba(0,0,0,0.2) + &:hover + background: #303030 + color: white + @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + .oe_active + background: #303030 + font-weight: bold + color: white + @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + + .oe_topbar_avatar + width: 24px + height: 24px + margin: -2px 2px 0 0 + @include radius(3px) + .oe_topbar_avatar + vertical-align: top + .oe_dropdown_toggle:after + width: 0 + height: 0 + display: inline-block + content: "&darr" + text-indent: -99999px + vertical-align: top + margin-top: 8px + margin-left: 4px + border-left: 4px solid transparent + border-right: 4px solid transparent + border-top: 4px solid white + @include opacity(0.5) + // }}} + // Webclient.leftbar {{{ + .oe_leftbar + display: none + width: 220px + background: #f0eeee + border-right: 1px solid #afafb6 + text-shadow: 0 1px 1px white + padding-bottom: 16px + line-height: 18px + a.oe_logo + width: 220px + display: block + text-align: center + height: 70px + line-height: 70px + img + height: 40px + width: 157px + margin: 14px 0 + .oe_footer + position: fixed + bottom: 0 + padding: 4px 0 + background: #f0eeee + width: 220px + text-align: center + a + font-weight: 800 + font-family: serif + font-size: 16px + color: black + span + color: #c81010 + font-style: italic + // }}} + // UserMenu {{{ + .oe_user_menu + float: right + padding: 0 + margin: 0 + li + list-style-type: none + float: left + .oe_dropdown + position: relative + + .oe_dropdown_options + float: left + background: #333 + background: rgba(37,37,37,0.9) + display: none + position: absolute + top: 32px + right: -1px + border: 0 + z-index: 900 + margin-left: 0 + margin-right: 0 + padding: 6px 0 + zoom: 1 + border-color: #999 + border-color: rgba(0, 0, 0, 0.2) + border-style: solid + border-width: 0 1px 1px + @include radius(0 0 6px 6px) + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + @include background-clip() + li + float: none + display: block + background-color: none + a + white-space: nowrap + display: block + padding: 4px 15px + clear: both + font-weight: normal + line-height: 18px + color: #eee + &:hover + @include vertical-gradient(#292929, #191919) + @include box-shadow(none) + hr + border-top: 1px solid #999 + border-bottom: 0 + // }}} + // Systray {{{ + .oe_systray > div float: left padding: 0 4px 0 4px .oe_systray @@ -703,10 +703,17 @@ $colour4: #8a89ba color: $colour4 &:hover text-decoration: underline + > div + height: 100% // }}} // ViewManager common styles .oe_view_manager + .oe_view_manager_body + height: inherit + .oe_view_manager_view_kanban + height: inherit + // ViewManager.header {{{ .oe_view_manager_header width: 100% @@ -822,6 +829,7 @@ $colour4: #8a89ba // ViewManager top header specific style {{{ .oe_view_manager_global + height: 100% > .oe_view_manager_header border-top: 1px solid #cacaca border-bottom: 1px solid #cacaca @@ -1502,9 +1510,6 @@ $colour4: #8a89ba filter: alpha(opacity=50) right: 5px top: 3px - .oe_form_field_one2many .oe_kanban_view - // Hack due to absolute positioning of kanban view messing with o2m - position: static .oe_form_field_with_button input width: 100% @@ -1536,10 +1541,6 @@ $colour4: #8a89ba .oe_form_group margin: 5px 0px 5px 0px - .oe_form_group_cell .oe_kanban_view - // Hack due to absolute positioning of kanban view messing with o2m - position: static - // }}} // FormView.buttons {{{ .oe_form -- cgit v1.2.3 From 539369b6f9ec26150055c881b1fe1b556475c463 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 15 Jun 2012 22:33:48 +0200 Subject: [IMP] removed tabs bzr revid: fp@openerp.com-20120615203348-apmb6erqtsi4hpmx --- addons/web/static/src/css/base.sass | 1084 +++++++++++++++++------------------ 1 file changed, 542 insertions(+), 542 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8aa409d7342..1640960be4f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,545 +1,545 @@ - @charset "utf-8" - - // Variables {{{ - $section-title-color: #8786b7 - $facets-border: #afafb6 - $facets-border-selected: #a6a6fe - $hover-background: #f0f0fa - $colour4: #8a89ba - // }}} - // Mixins {{{ - @font-face - font-family: 'mnmliconsRegular' - src: url('/web/static/src/font/mnmliconsv21-webfont.eot') format('eot') - src: url('/web/static/src/font/mnmliconsv21-webfont.woff') format('woff') - src: url('/web/static/src/font/mnmliconsv21-webfont.ttf') format('truetype') - src: url('/web/static/src/font/mnmliconsv21-webfont.svg') format('svg') active - font-weight: normal - font-style: normal - - @font-face - font-family: 'EntypoRegular' - src: url('/web/static/src/font/entypo-webfont.eot') format('eot') - src: url('/web/static/src/font/entypo-webfont.eot?#iefix') format('embedded-opentype') - src: url('/web/static/src/font/entypo-webfont.woff') format('woff') - src: url('/web/static/src/font/entypo-webfont.ttf') format('truetype') - src: url('/web/static/src/font/entypo-webfont.svg') format('svg') active - font-weight: normal - font-style: normal - - @mixin vertical-gradient($startColor: #555, $endColor: #333) - background-color: $startColor - background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */ - background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */ - background-image: -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */ - background-image: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */ - background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */ - background-image: linear-gradient(to bottom, $startColor, $endColor) - - - @mixin radial-gradient($gradient) - background-position: center center - background-image: -webkit-radial-gradient(circle, $gradient) - background-image: -moz-radial-gradient($gradient) - background-image: -ms-radial-gradient($gradient) - background-image: radial-gradient($gradient) - - @mixin radius($radius: 5px) - -moz-border-radius: $radius - -webkit-border-radius: $radius - border-radius: $radius - - @mixin box-shadow($bsval: 0px 1px 4px #777) - -moz-box-shadow: $bsval - -webkit-box-shadow: $bsval - box-shadow: $bsval - - @mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s)) - -webkit-transition: $transval - -moz-transition: $transval - -ms-transition: $transval - -o-transition: $transval - transition: $transval - - @mixin opacity($opacity: .5) - filter: alpha(opacity=$opacity * 100) - opacity: $opacity - - @mixin background-clip($clip: padding-box) - -webkit-background-clip: $clip - -moz-background-clip: $clip - background-clip: $clip - - @mixin box-sizing($type: content) - // type = border || content || padding - -webkit-box-sizing: #{$type}-box - -moz-box-sizing: #{$type}-box - -ms-box-sizing: #{$type}-box - box-sizing: #{$type}-box - - // Transforms the (readable) text of an inline element into an mmlicons icon, - // allows for actual readable text in-code (and in readers?) with iconic looks - @mixin text-to-icon($icon-name, $color: #404040) - font-size: 1px - letter-spacing: -1px - color: transparent - &:before - font-family: "mnmliconsRegular" - content: $icon-name - font-size: 20px - color: $color - - // }}} - - - .openerp.openerp-web-client-container - height: 100% - position: relative - - // Jquery ui Overrides {{{ - .ui-widget - font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif - font-size: 13px - .ui-menu - .ui-menu-item - margin: 0 8px 0 0 - padding: 0 0 0 12px - width: auto - a.ui-state-active - background: #f0f0fa - // }}} - - .openerp - // Global style {{{ - padding: 0 - margin: 0 - font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif - color: #4c4c4c - font-size: 13px - background: white - // }}} - // Tag reset {{{ - a - text-decoration: none - table - padding: 0 - font-size: 13px - border-collapse: collapse - thead - font-weight: bold - background-color: #f0f0f0 - th - border-right: 1px dotted #afafb6 - &:last-child - border-right: none - th, td - padding: 0 - text-align: left - th - font-weight: bold - vertical-align: middle - td - vertical-align: top - .zebra tbody tr:nth-child(odd) td - background-color: #f0f0fa - @include vertical-gradient(#f0f0fa, #eeeef6) - .zebra tbody tr:hover td - @include vertical-gradient(#eee, #dedede) - .numeric - text-align: right - width: 82px - input - text-align: right - ul, li, ol - margin: 0 - padding: 0 - li - list-style-type: none - input, textarea - border: 1px solid #ccc - @include radius(3px) - img - vertical-align: middle - h4 - margin: 4px 0 - - // }}} - // Generic classes {{{ - .oe_i - font-family: "mnmliconsRegular" !important - font-size: 21px - font-weight: 300 !important - .oe_e - font-family: "entypoRegular" !important - font-size: 34px - font-weight: 300 !important - .oe_left - float: left - margin-right: 8px - .oe_right - float: right - margin-left: 8px - .oe_text_right - text-align: right - .oe_clear - clear: both - .oe_wait - cursor: wait - .oe_fade - color: #888 - //font-size: 12px - .oe_bold - font-weight: bold - // }}} - // Button style {{{ - a.button:link, a.button:visited, button, input[type='submit'] - display: inline-block - border: 1px solid #ababab - color: #404040 - margin: 0 - padding: 3px 12px - font-size: 13px - text-align: center - @include vertical-gradient(#efefef, #d8d8d8) - @include radius(3px) - @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset)) - text-shadow: 0 1px 1px rgba(255, 255, 255, .5) - -webkit-font-smoothing: antialiased - outline: none - - a.button:hover, button:hover, input[type='submit']:hover - @include vertical-gradient(#f6f6f6, #e3e3e3) - cursor: pointer - - a.button:focus, button:focus, input[type='submit']:focus - border: 1px solid #80bfff - @include vertical-gradient(#f6f6f6, #e3e3e3) - @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset)) - - a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active - background: #e3e3e3 - background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f - background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f - background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f - @include box-shadow(none) - - a.button.disabled, button:disabled, input[type='submit']:disabled - background: #efefef !important - border: 1px solid #d1d1d1 !important - @include box-shadow(none !important) - color: #aaa !important - cursor: default - text-shadow: 0 1px 1px #fff !important - - button.primary - color: white - @include vertical-gradient(#dc5f59, #b33630) - @include box-shadow(none) - - button.primary:hover - @include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) - @include box-shadow(0 0 1px rgba(0,0,0,0.2)) - - button.primary:active - @include vertical-gradient(#b33630, #dc5f59) - @include box-shadow(none) - - button.following - color: white - width: 120px - @include vertical-gradient($colour4, darken($colour4, 3%)) - - button.unfollow - display: none - color: white - width: 120px - @include vertical-gradient(#dc5f59, #b33630) - - // }}} - // Loading {{{ - .oe_loading - display: none - z-index: 100 - position: fixed - top: 0 - right: 50% - padding: 4px 12px - background: #A61300 - color: white - text-align: center - border: 1px solid #900 - border-top: none - -moz-border-radius-bottomright: 8px - -moz-border-radius-bottomleft: 8px - border-bottom-right-radius: 8px - border-bottom-left-radius: 8px - // }}} - // Notification {{{ - .oe_notification - z-index: 1050 - // }}} - // Login {{{ - .oe_login - background: url("/web/static/src/img/pattern.png") repeat - text-align: center - font-size: 14px - height: 100% - li - list-style-type: none - padding-bottom: 4px - button - float: right - display: inline-block - cursor: pointer - padding: 6px 16px - border: 1px solid #222 - color: white - margin: 0 - @include vertical-gradient(#b92020, #600606) - @include radius(4px) - @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset)) - input, select - width: 252px - font-family: "Lucida Grande", Helvetica, Verdana, Arial - border: 1px solid #999999 - background: whitesmoke - @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.3)) - @include radius(3px) - input - margin-bottom: 9px - padding: 5px 6px - select - padding: 1px - .oe_login_dbpane - position: fixed - top: 0 - right: 8px - padding: 5px 10px - color: #eee - border: solid 1px #333 - background: #1e1e1e - background: rgba(30,30,30,0.94) - @include radius(0 0 8px 8px) - input - padding: 2px 4px - margin: 4px 0 - .oe_login_bottom - position: absolute - top: 50% - left: 0 - right: 0 - bottom: 0 - text-shadow: 0 1px 1px #999999 - @include vertical-gradient(#b41616, #600606) - .oe_login_pane - position: absolute - top: 50% - left: 50% - margin: -160px -166px - border: solid 1px #333333 - background: #1e1e1e - background: rgba(30,30,30,0.94) - padding: 22px 32px - color: #eee - text-align: left - @include radius(8px) - @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) - h2 - margin-top: 0 - font-size: 18px - .oe_login_logo - position: absolute - top: -70px - left: 0 - width: 100% - margin: 0 auto - text-align: center - .oe_login_footer - position: absolute - bottom: -40px - left: 0 - width: 100% - text-align: center - a - color: #eee - margin: 0 8px - &:hover - text-decoration: underline - span - font-weight: bold - font-size: 16px - .oe_login_error_message - display: none - background-color: #b41616 - color: #eee - padding: 14px 18px - margin-top: 15px - text-align: center - @include radius(4px) - @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.8)) - .oe_login_invalid - .oe_login_error_message - display: inline-block - // }}} - // DatabaseManager {{{ - .oe_database_manager - background: #fff - color: #000 - text-align: left - .oe_database_manager_menu - color: #000 - // }}} - // WebClient {{{ - .oe_webclient - width: 100% - height: 100% - border-spacing: 0px - // }}} - // WebClient.fullscreen {{{ - .oe_content_full_screen - .oe_application - top: 0 - left: 0 - .oe_topbar, .oe_leftbar - display: none - // }}} - // WebClient.topbar {{{ - .oe_topbar - width: 100% - height: 31px - border-top: solid 1px #d3d3d3 - @include vertical-gradient(#646060, #262626) - - .oe_topbar_item - li - float: left - a - display: block - padding: 5px 10px 7px - line-height: 20px - height: 20px - color: #eee - vertical-align: top - text-shadow: 0 1px 1px rgba(0,0,0,0.2) - &:hover - background: #303030 - color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) - .oe_active - background: #303030 - font-weight: bold - color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) - - .oe_topbar_avatar - width: 24px - height: 24px - margin: -2px 2px 0 0 - @include radius(3px) - .oe_topbar_avatar - vertical-align: top - .oe_dropdown_toggle:after - width: 0 - height: 0 - display: inline-block - content: "&darr" - text-indent: -99999px - vertical-align: top - margin-top: 8px - margin-left: 4px - border-left: 4px solid transparent - border-right: 4px solid transparent - border-top: 4px solid white - @include opacity(0.5) - // }}} - // Webclient.leftbar {{{ - .oe_leftbar - display: none - width: 220px - background: #f0eeee - border-right: 1px solid #afafb6 - text-shadow: 0 1px 1px white - padding-bottom: 16px - line-height: 18px - a.oe_logo - width: 220px - display: block - text-align: center - height: 70px - line-height: 70px - img - height: 40px - width: 157px - margin: 14px 0 - .oe_footer - position: fixed - bottom: 0 - padding: 4px 0 - background: #f0eeee - width: 220px - text-align: center - a - font-weight: 800 - font-family: serif - font-size: 16px - color: black - span - color: #c81010 - font-style: italic - // }}} - // UserMenu {{{ - .oe_user_menu - float: right - padding: 0 - margin: 0 - li - list-style-type: none - float: left - .oe_dropdown - position: relative - - .oe_dropdown_options - float: left - background: #333 - background: rgba(37,37,37,0.9) - display: none - position: absolute - top: 32px - right: -1px - border: 0 - z-index: 900 - margin-left: 0 - margin-right: 0 - padding: 6px 0 - zoom: 1 - border-color: #999 - border-color: rgba(0, 0, 0, 0.2) - border-style: solid - border-width: 0 1px 1px - @include radius(0 0 6px 6px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - @include background-clip() - li - float: none - display: block - background-color: none - a - white-space: nowrap - display: block - padding: 4px 15px - clear: both - font-weight: normal - line-height: 18px - color: #eee - &:hover - @include vertical-gradient(#292929, #191919) - @include box-shadow(none) - hr - border-top: 1px solid #999 - border-bottom: 0 - // }}} - // Systray {{{ - .oe_systray > div +@charset "utf-8" + +// Variables {{{ +$section-title-color: #8786b7 +$facets-border: #afafb6 +$facets-border-selected: #a6a6fe +$hover-background: #f0f0fa +$colour4: #8a89ba +// }}} +// Mixins {{{ +@font-face + font-family: 'mnmliconsRegular' + src: url('/web/static/src/font/mnmliconsv21-webfont.eot') format('eot') + src: url('/web/static/src/font/mnmliconsv21-webfont.woff') format('woff') + src: url('/web/static/src/font/mnmliconsv21-webfont.ttf') format('truetype') + src: url('/web/static/src/font/mnmliconsv21-webfont.svg') format('svg') active + font-weight: normal + font-style: normal + +@font-face + font-family: 'EntypoRegular' + src: url('/web/static/src/font/entypo-webfont.eot') format('eot') + src: url('/web/static/src/font/entypo-webfont.eot?#iefix') format('embedded-opentype') + src: url('/web/static/src/font/entypo-webfont.woff') format('woff') + src: url('/web/static/src/font/entypo-webfont.ttf') format('truetype') + src: url('/web/static/src/font/entypo-webfont.svg') format('svg') active + font-weight: normal + font-style: normal + +@mixin vertical-gradient($startColor: #555, $endColor: #333) + background-color: $startColor + background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */ + background-image: -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */ + background-image: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */ + background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */ + background-image: linear-gradient(to bottom, $startColor, $endColor) + + +@mixin radial-gradient($gradient) + background-position: center center + background-image: -webkit-radial-gradient(circle, $gradient) + background-image: -moz-radial-gradient($gradient) + background-image: -ms-radial-gradient($gradient) + background-image: radial-gradient($gradient) + +@mixin radius($radius: 5px) + -moz-border-radius: $radius + -webkit-border-radius: $radius + border-radius: $radius + +@mixin box-shadow($bsval: 0px 1px 4px #777) + -moz-box-shadow: $bsval + -webkit-box-shadow: $bsval + box-shadow: $bsval + +@mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s)) + -webkit-transition: $transval + -moz-transition: $transval + -ms-transition: $transval + -o-transition: $transval + transition: $transval + +@mixin opacity($opacity: .5) + filter: alpha(opacity=$opacity * 100) + opacity: $opacity + +@mixin background-clip($clip: padding-box) + -webkit-background-clip: $clip + -moz-background-clip: $clip + background-clip: $clip + +@mixin box-sizing($type: content) + // type = border || content || padding + -webkit-box-sizing: #{$type}-box + -moz-box-sizing: #{$type}-box + -ms-box-sizing: #{$type}-box + box-sizing: #{$type}-box + +// Transforms the (readable) text of an inline element into an mmlicons icon, +// allows for actual readable text in-code (and in readers?) with iconic looks +@mixin text-to-icon($icon-name, $color: #404040) + font-size: 1px + letter-spacing: -1px + color: transparent + &:before + font-family: "mnmliconsRegular" + content: $icon-name + font-size: 20px + color: $color + +// }}} + + +.openerp.openerp-web-client-container + height: 100% + position: relative + +// Jquery ui Overrides {{{ +.ui-widget + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif + font-size: 13px +.ui-menu + .ui-menu-item + margin: 0 8px 0 0 + padding: 0 0 0 12px + width: auto + a.ui-state-active + background: #f0f0fa +// }}} + +.openerp + // Global style {{{ + padding: 0 + margin: 0 + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif + color: #4c4c4c + font-size: 13px + background: white + // }}} + // Tag reset {{{ + a + text-decoration: none + table + padding: 0 + font-size: 13px + border-collapse: collapse + thead + font-weight: bold + background-color: #f0f0f0 + th + border-right: 1px dotted #afafb6 + &:last-child + border-right: none + th, td + padding: 0 + text-align: left + th + font-weight: bold + vertical-align: middle + td + vertical-align: top + .zebra tbody tr:nth-child(odd) td + background-color: #f0f0fa + @include vertical-gradient(#f0f0fa, #eeeef6) + .zebra tbody tr:hover td + @include vertical-gradient(#eee, #dedede) + .numeric + text-align: right + width: 82px + input + text-align: right + ul, li, ol + margin: 0 + padding: 0 + li + list-style-type: none + input, textarea + border: 1px solid #ccc + @include radius(3px) + img + vertical-align: middle + h4 + margin: 4px 0 + + // }}} + // Generic classes {{{ + .oe_i + font-family: "mnmliconsRegular" !important + font-size: 21px + font-weight: 300 !important + .oe_e + font-family: "entypoRegular" !important + font-size: 34px + font-weight: 300 !important + .oe_left + float: left + margin-right: 8px + .oe_right + float: right + margin-left: 8px + .oe_text_right + text-align: right + .oe_clear + clear: both + .oe_wait + cursor: wait + .oe_fade + color: #888 + //font-size: 12px + .oe_bold + font-weight: bold + // }}} + // Button style {{{ + a.button:link, a.button:visited, button, input[type='submit'] + display: inline-block + border: 1px solid #ababab + color: #404040 + margin: 0 + padding: 3px 12px + font-size: 13px + text-align: center + @include vertical-gradient(#efefef, #d8d8d8) + @include radius(3px) + @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset)) + text-shadow: 0 1px 1px rgba(255, 255, 255, .5) + -webkit-font-smoothing: antialiased + outline: none + + a.button:hover, button:hover, input[type='submit']:hover + @include vertical-gradient(#f6f6f6, #e3e3e3) + cursor: pointer + + a.button:focus, button:focus, input[type='submit']:focus + border: 1px solid #80bfff + @include vertical-gradient(#f6f6f6, #e3e3e3) + @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset)) + + a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active + background: #e3e3e3 + background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f + background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f + background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f + @include box-shadow(none) + + a.button.disabled, button:disabled, input[type='submit']:disabled + background: #efefef !important + border: 1px solid #d1d1d1 !important + @include box-shadow(none !important) + color: #aaa !important + cursor: default + text-shadow: 0 1px 1px #fff !important + + button.primary + color: white + @include vertical-gradient(#dc5f59, #b33630) + @include box-shadow(none) + + button.primary:hover + @include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) + @include box-shadow(0 0 1px rgba(0,0,0,0.2)) + + button.primary:active + @include vertical-gradient(#b33630, #dc5f59) + @include box-shadow(none) + + button.following + color: white + width: 120px + @include vertical-gradient($colour4, darken($colour4, 3%)) + + button.unfollow + display: none + color: white + width: 120px + @include vertical-gradient(#dc5f59, #b33630) + + // }}} + // Loading {{{ + .oe_loading + display: none + z-index: 100 + position: fixed + top: 0 + right: 50% + padding: 4px 12px + background: #A61300 + color: white + text-align: center + border: 1px solid #900 + border-top: none + -moz-border-radius-bottomright: 8px + -moz-border-radius-bottomleft: 8px + border-bottom-right-radius: 8px + border-bottom-left-radius: 8px + // }}} + // Notification {{{ + .oe_notification + z-index: 1050 + // }}} + // Login {{{ + .oe_login + background: url("/web/static/src/img/pattern.png") repeat + text-align: center + font-size: 14px + height: 100% + li + list-style-type: none + padding-bottom: 4px + button + float: right + display: inline-block + cursor: pointer + padding: 6px 16px + border: 1px solid #222 + color: white + margin: 0 + @include vertical-gradient(#b92020, #600606) + @include radius(4px) + @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset)) + input, select + width: 252px + font-family: "Lucida Grande", Helvetica, Verdana, Arial + border: 1px solid #999999 + background: whitesmoke + @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.3)) + @include radius(3px) + input + margin-bottom: 9px + padding: 5px 6px + select + padding: 1px + .oe_login_dbpane + position: fixed + top: 0 + right: 8px + padding: 5px 10px + color: #eee + border: solid 1px #333 + background: #1e1e1e + background: rgba(30,30,30,0.94) + @include radius(0 0 8px 8px) + input + padding: 2px 4px + margin: 4px 0 + .oe_login_bottom + position: absolute + top: 50% + left: 0 + right: 0 + bottom: 0 + text-shadow: 0 1px 1px #999999 + @include vertical-gradient(#b41616, #600606) + .oe_login_pane + position: absolute + top: 50% + left: 50% + margin: -160px -166px + border: solid 1px #333333 + background: #1e1e1e + background: rgba(30,30,30,0.94) + padding: 22px 32px + color: #eee + text-align: left + @include radius(8px) + @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) + h2 + margin-top: 0 + font-size: 18px + .oe_login_logo + position: absolute + top: -70px + left: 0 + width: 100% + margin: 0 auto + text-align: center + .oe_login_footer + position: absolute + bottom: -40px + left: 0 + width: 100% + text-align: center + a + color: #eee + margin: 0 8px + &:hover + text-decoration: underline + span + font-weight: bold + font-size: 16px + .oe_login_error_message + display: none + background-color: #b41616 + color: #eee + padding: 14px 18px + margin-top: 15px + text-align: center + @include radius(4px) + @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.8)) + .oe_login_invalid + .oe_login_error_message + display: inline-block + // }}} + // DatabaseManager {{{ + .oe_database_manager + background: #fff + color: #000 + text-align: left + .oe_database_manager_menu + color: #000 + // }}} + // WebClient {{{ + .oe_webclient + width: 100% + height: 100% + border-spacing: 0px + // }}} + // WebClient.fullscreen {{{ + .oe_content_full_screen + .oe_application + top: 0 + left: 0 + .oe_topbar, .oe_leftbar + display: none + // }}} + // WebClient.topbar {{{ + .oe_topbar + width: 100% + height: 31px + border-top: solid 1px #d3d3d3 + @include vertical-gradient(#646060, #262626) + + .oe_topbar_item + li + float: left + a + display: block + padding: 5px 10px 7px + line-height: 20px + height: 20px + color: #eee + vertical-align: top + text-shadow: 0 1px 1px rgba(0,0,0,0.2) + &:hover + background: #303030 + color: white + @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + .oe_active + background: #303030 + font-weight: bold + color: white + @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + + .oe_topbar_avatar + width: 24px + height: 24px + margin: -2px 2px 0 0 + @include radius(3px) + .oe_topbar_avatar + vertical-align: top + .oe_dropdown_toggle:after + width: 0 + height: 0 + display: inline-block + content: "&darr" + text-indent: -99999px + vertical-align: top + margin-top: 8px + margin-left: 4px + border-left: 4px solid transparent + border-right: 4px solid transparent + border-top: 4px solid white + @include opacity(0.5) + // }}} + // Webclient.leftbar {{{ + .oe_leftbar + display: none + width: 220px + background: #f0eeee + border-right: 1px solid #afafb6 + text-shadow: 0 1px 1px white + padding-bottom: 16px + line-height: 18px + a.oe_logo + width: 220px + display: block + text-align: center + height: 70px + line-height: 70px + img + height: 40px + width: 157px + margin: 14px 0 + .oe_footer + position: fixed + bottom: 0 + padding: 4px 0 + background: #f0eeee + width: 220px + text-align: center + a + font-weight: 800 + font-family: serif + font-size: 16px + color: black + span + color: #c81010 + font-style: italic + // }}} + // UserMenu {{{ + .oe_user_menu + float: right + padding: 0 + margin: 0 + li + list-style-type: none + float: left + .oe_dropdown + position: relative + + .oe_dropdown_options + float: left + background: #333 + background: rgba(37,37,37,0.9) + display: none + position: absolute + top: 32px + right: -1px + border: 0 + z-index: 900 + margin-left: 0 + margin-right: 0 + padding: 6px 0 + zoom: 1 + border-color: #999 + border-color: rgba(0, 0, 0, 0.2) + border-style: solid + border-width: 0 1px 1px + @include radius(0 0 6px 6px) + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + @include background-clip() + li + float: none + display: block + background-color: none + a + white-space: nowrap + display: block + padding: 4px 15px + clear: both + font-weight: normal + line-height: 18px + color: #eee + &:hover + @include vertical-gradient(#292929, #191919) + @include box-shadow(none) + hr + border-top: 1px solid #999 + border-bottom: 0 + // }}} + // Systray {{{ + .oe_systray > div float: left padding: 0 4px 0 4px .oe_systray -- cgit v1.2.3 From 682f5cbe87e1cb3be515a955501742c681180a3b Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 10:45:26 +0200 Subject: [IMP] sass cleanup bzr revid: al@openerp.com-20120619084526-kif8cq0zdsti8jwy --- addons/web/static/src/css/base.css | 756 ++++++++++++++++++------------------ addons/web/static/src/css/base.sass | 540 ++++++++++++-------------- 2 files changed, 625 insertions(+), 671 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 84f1b7ed2a0..ba10cbcc04c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,20 +25,6 @@ position: relative; } -.ui-widget { - font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; - font-size: 13px; -} - -.ui-menu .ui-menu-item { - margin: 0 8px 0 0; - padding: 0 0 0 12px; - width: auto; -} -.ui-menu .ui-menu-item a.ui-state-active { - background: #f0f0fa; -} - .openerp { padding: 0; margin: 0; @@ -55,7 +41,6 @@ } .openerp table { padding: 0; - font-size: 13px; border-collapse: collapse; } .openerp thead { @@ -98,13 +83,6 @@ background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede); } -.openerp .numeric { - text-align: right; - width: 82px; -} -.openerp .numeric input { - text-align: right; -} .openerp ul, .openerp li, .openerp ol { margin: 0; padding: 0; @@ -124,39 +102,6 @@ .openerp h4 { margin: 4px 0; } -.openerp .oe_i { - font-family: "mnmliconsRegular" !important; - font-size: 21px; - font-weight: 300 !important; -} -.openerp .oe_e { - font-family: "entypoRegular" !important; - font-size: 34px; - font-weight: 300 !important; -} -.openerp .oe_left { - float: left; - margin-right: 8px; -} -.openerp .oe_right { - float: right; - margin-left: 8px; -} -.openerp .oe_text_right { - text-align: right; -} -.openerp .oe_clear { - clear: both; -} -.openerp .oe_wait { - cursor: wait; -} -.openerp .oe_fade { - color: #888888; -} -.openerp .oe_bold { - font-weight: bold; -} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'] { display: inline-block; border: 1px solid #ababab; @@ -284,6 +229,286 @@ background-image: -o-linear-gradient(top, #dc5f59, #b33630); background-image: linear-gradient(to bottom, #dc5f59, #b33630); } +.openerp .ui-widget { + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; + font-size: 13px; +} +.openerp .ui-menu .ui-menu-item { + margin: 0 8px 0 0; + padding: 0 0 0 12px; + width: auto; +} +.openerp .ui-menu .ui-menu-item a.ui-state-active { + background: #f0f0fa; +} +.openerp .oe_i { + font-family: "mnmliconsRegular" !important; + font-size: 21px; + font-weight: 300 !important; +} +.openerp .oe_e { + font-family: "entypoRegular" !important; + font-size: 34px; + font-weight: 300 !important; +} +.openerp .oe_left { + float: left; + margin-right: 8px; +} +.openerp .oe_right { + float: right; + margin-left: 8px; +} +.openerp .oe_text_right { + text-align: right; +} +.openerp .oe_clear { + clear: both; +} +.openerp .oe_wait { + cursor: wait; +} +.openerp .oe_fade { + color: #888888; +} +.openerp .oe_bold { + font-weight: bold; +} +.openerp .oe_inline  { + width: auto; +} +.openerp .oe_highlight { + color: white; + background: #dc5f59; +} +.openerp button.oe_highlight { + background-color: #dc5f59; + background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); + background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); + background-image: -moz-linear-gradient(top, #dc5f59, #b33630); + background-image: -ms-linear-gradient(top, #dc5f59, #b33630); + background-image: -o-linear-gradient(top, #dc5f59, #b33630); + background-image: linear-gradient(to bottom, #dc5f59, #b33630); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp button.oe_highlight:hover { + background: #df6b66; + background-color: #df6b66; + background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33)); + background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33); + background-image: -moz-linear-gradient(top, #df6b66, #bf3a33); + background-image: -ms-linear-gradient(top, #df6b66, #bf3a33); + background-image: -o-linear-gradient(top, #df6b66, #bf3a33); + background-image: linear-gradient(to bottom, #df6b66, #bf3a33); + -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); +} +.openerp.oe_tooltip { + font-size: 12px; +} +.openerp.oe_tooltip .oe_tooltip_string { + color: #ffdd55; + font-weight: bold; + font-size: 13px; +} +.openerp.oe_tooltip .oe_tooltip_help { + white-space: pre-wrap; +} +.openerp.oe_tooltip .oe_tooltip_technical { + padding: 0 0 4px 0; + margin: 5px 0 0 15px; +} +.openerp.oe_tooltip .oe_tooltip_technical li { + list-style: circle; +} +.openerp.oe_tooltip .oe_tooltip_technical_title { + font-weight: bold; +} +.openerp .oe_notebook { + margin: 8px 0; + padding: 0 8px; + list-style: none; + zoom: 1; +} +.openerp .oe_notebook:before, .openerp .oe_notebook:after { + display: table; + content: ""; + zoom: 1; +} +.openerp .oe_notebook:after { + clear: both; +} +.openerp .oe_notebook > li { + float: left; +} +.openerp .oe_notebook > li > a { + display: block; + color: #4c4c4c; +} +.openerp .oe_notebook { + border-color: #dddddd; + border-style: solid; + border-width: 0 0 1px; +} +.openerp .oe_notebook > li { + position: relative; + margin-bottom: -1px; +} +.openerp .oe_notebook > li > a { + padding: 0 12px; + margin-right: 2px; + line-height: 30px; + border: 1px solid transparent; + -moz-border-radius: 4px 4px 0 0; + -webkit-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.openerp .oe_notebook > li > a:hover { + text-decoration: none; + background-color: #eeeeee; + border-color: #eeeeee #eeeeee #dddddd; +} +.openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover { + background-color: white; + border: 1px solid #dddddd; + border-bottom-color: transparent; + cursor: default; +} +.openerp .oe_notebook_page { + padding: 0; +} +.openerp div.ui-tabs { + padding: 3px 0px 3px 0px; +} +.openerp .ui-tabs-hide { + display: none; +} +.openerp .oe_dropdown_toggle:after { + width: 0; + height: 0; + display: inline-block; + content: "&darr"; + text-indent: -99999px; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid white; + filter: alpha(opacity=50); + opacity: 0.5; + margin-top: 7px; + margin-left: 6px; + border-top-color: #404040; +} +.openerp .oe_dropdown_menu { + display: none; + position: absolute; + top: 28px; + left: 0px; + padding: 8px; + border: 1px solid #afafb6; + min-width: 120px; + overflow-x: hidden; + z-index: 900; + text-align: left; + background: white; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -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_dropdown_menu li { + position: relative; + list-style-type: none; + float: none; + display: block; + background-color: none; +} +.openerp .oe_dropdown_menu li:hover { + background-color: #f0f0fa; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp .oe_dropdown_menu li a { + display: block; + padding: 3px 6px; + clear: both; + font-weight: normal; + line-height: 14px; + color: #4c4c4c; + text-decoration: none; + cursor: pointer; +} +.openerp .oe_dropdown_menu li a:hover { + text-decoration: none; +} +.openerp .oe_dropdown_menu li .oe_sidebar_delete_item { + position: absolute; + bottom: 1px; + right: 4px; + display: none; + 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_dropdown_menu li .oe_sidebar_delete_item: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_dropdown_menu li:hover .oe_sidebar_delete_item { + display: inline-block; +} +.openerp .oe_sidebar { + white-space: nowrap; +} +.openerp .oe_sidebar .oe_dropdown_menu li { + padding-right: 16px; +} +.openerp .oe_sidebar .oe_sidebar_add_attachment { + cursor: pointer; + padding-left: 6px; + margin-top: 6px; +} +.openerp .oe_sidebar .oe_sidebar_add_attachment span { + font-weight: bold; +} +.openerp .oe_sidebar .oe_sidebar_add_attachment .oe_hidden_input_file { + width: 200px; +} +.openerp .oe_sidebar .oe_sidebar_add_attachment:hover { + background-color: #f0f0fa; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} .openerp .oe_loading { display: none; z-index: 100; @@ -989,186 +1214,59 @@ position: relative; } .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_list:after, .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_tree:after { - padding: 2px; - content: "i"; -} -.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_graph:after { - font-family: "mnmliconsRegular" !important; - font-size: 21px; - font-weight: 300 !important; - content: "}"; - top: -2px; - position: relative; -} -.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_gantt:after { - font-family: "mnmliconsRegular" !important; - font-size: 21px; - font-weight: 300 !important; - content: "y"; - top: -2px; - position: relative; -} -.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_calendar:after { - content: "P"; -} -.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_kanban:after { - content: "k"; -} -.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_diagram:after { - content: "f"; -} -.openerp .oe_view_manager_global { - height: 100%; -} -.openerp .oe_view_manager_global > .oe_view_manager_header { - border-top: 1px solid #cacaca; - border-bottom: 1px solid #cacaca; - background-color: #fcfcfc; - background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); - background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); - background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); - background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); - background-image: -o-linear-gradient(top, #fcfcfc, #dedede); - background-image: linear-gradient(to bottom, #fcfcfc, #dedede); - -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); - -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); -} -.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row td { - padding: 8px; -} -.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row:first-child td { - padding-top: 8px; -} -.openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top { - display: none; -} -.openerp .oe_form_dropdown_section { - position: relative; - display: inline-block; -} -.openerp .oe_dropdown_toggle:after { - width: 0; - height: 0; - display: inline-block; - content: "&darr"; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid white; - filter: alpha(opacity=50); - opacity: 0.5; - margin-top: 7px; - margin-left: 6px; - border-top-color: #404040; -} -.openerp .oe_dropdown_menu { - display: none; - position: absolute; - top: 28px; - left: 0px; - padding: 8px; - border: 1px solid #afafb6; - min-width: 120px; - overflow-x: hidden; - z-index: 900; - text-align: left; - background: white; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -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_dropdown_menu li { - position: relative; - list-style-type: none; - float: none; - display: block; - background-color: none; -} -.openerp .oe_dropdown_menu li:hover { - background-color: #f0f0fa; - background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); - background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} -.openerp .oe_dropdown_menu li a { - display: block; - padding: 3px 6px; - clear: both; - font-weight: normal; - line-height: 14px; - color: #4c4c4c; - text-decoration: none; - cursor: pointer; -} -.openerp .oe_dropdown_menu li a:hover { - text-decoration: none; -} -.openerp .oe_dropdown_menu li .oe_sidebar_delete_item { - position: absolute; - bottom: 1px; - right: 4px; - display: none; - 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; + padding: 2px; + content: "i"; } -.openerp .oe_dropdown_menu li .oe_sidebar_delete_item: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_view_manager .oe_view_manager_switch .oe_vm_switch_graph:after { + font-family: "mnmliconsRegular" !important; + font-size: 21px; + font-weight: 300 !important; + content: "}"; + top: -2px; + position: relative; } -.openerp .oe_dropdown_menu li:hover .oe_sidebar_delete_item { - display: inline-block; +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_gantt:after { + font-family: "mnmliconsRegular" !important; + font-size: 21px; + font-weight: 300 !important; + content: "y"; + top: -2px; + position: relative; } -.openerp .oe_sidebar { - white-space: nowrap; +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_calendar:after { + content: "P"; } -.openerp .oe_sidebar .oe_dropdown_menu li { - padding-right: 16px; +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_kanban:after { + content: "k"; } -.openerp .oe_sidebar .oe_sidebar_add_attachment { - cursor: pointer; - padding-left: 6px; - margin-top: 6px; +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_diagram:after { + content: "f"; } -.openerp .oe_sidebar .oe_sidebar_add_attachment span { - font-weight: bold; +.openerp .oe_view_manager_global { + height: 100%; } -.openerp .oe_sidebar .oe_sidebar_add_attachment .oe_hidden_input_file { - width: 200px; +.openerp .oe_view_manager_global > .oe_view_manager_header { + border-top: 1px solid #cacaca; + border-bottom: 1px solid #cacaca; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); + -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); } -.openerp .oe_sidebar .oe_sidebar_add_attachment:hover { - background-color: #f0f0fa; - background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); - background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; +.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row td { + padding: 8px; +} +.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row:first-child td { + padding-top: 8px; +} +.openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { + display: none !important; } .openerp .oe_searchview { cursor: text; @@ -1549,6 +1647,10 @@ padding: 0 8px; line-height: 30px; } +.openerp .oe_form_dropdown_section { + position: relative; + display: inline-block; +} .openerp .oe_formview { background: white; } @@ -1652,32 +1754,40 @@ font-weight: bold; color: #b33630; } -.openerp .oe_form_readonly button.oe_form_button_hi { - color: white; - background: #dc5f59; - background-color: #dc5f59; - background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); - background-image: -moz-linear-gradient(top, #dc5f59, #b33630); - background-image: -ms-linear-gradient(top, #dc5f59, #b33630); - background-image: -o-linear-gradient(top, #dc5f59, #b33630); - background-image: linear-gradient(to bottom, #dc5f59, #b33630); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; +.openerp .oe_form td.oe_form_group_cell_label { + border-right: 1px solid #dddddd; + padding: 2px 0px 2px 0px; } -.openerp .oe_form_readonly button.oe_form_button_hi:hover { - background: #df6b66; - background-color: #df6b66; - background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33)); - background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33); - background-image: -moz-linear-gradient(top, #df6b66, #bf3a33); - background-image: -ms-linear-gradient(top, #df6b66, #bf3a33); - background-image: -o-linear-gradient(top, #df6b66, #bf3a33); - background-image: linear-gradient(to bottom, #df6b66, #bf3a33); - -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); +.openerp .oe_form td.oe_form_group_cell_label label { + line-height: 18px; + display: block; + min-width: 120px; +} +.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { + padding-left: 8px; +} +.openerp .oe_form .oe_form_subtotal_footer { + width: auto; + float: right; +} +.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell { + text-align: right; + padding: 0; +} +.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell_label { + border: none; +} +.openerp .oe_form .oe_form_subtotal_footer .oe_form_field { + width: auto !important; +} +.openerp .oe_form .oe_form_subtotal_footer .oe_form_subtotal_footer_separator { + border-top: 1px solid #cacaca; + font-size: 120%; + font-weight: bold; +} +.openerp .oe_form .oe_form_subtotal_footer label.oe_form_subtotal_footer_separator { + font-weight: bold !important; + padding: 2px 8px 2px 0px !important; } .openerp .oe_application .oe_form_sheetbg { background: url(/web/static/src/img/form_sheetbg.png); @@ -1701,10 +1811,10 @@ .openerp .oe_form_invisible { display: none !important; } -.openerp .oe_form_editable .oe_form_editable_hidden { +.openerp .oe_form_editable .oe_edit_only { display: none !important; } -.openerp .oe_form_readonly .oe_form_readonly_hidden, .openerp .oe_form_readonly .oe_form_field:empty { +.openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty { display: none !important; } .openerp .oe_form .oe_form_field_text { @@ -1773,9 +1883,6 @@ .openerp .oe_form .oe_form_field_datetime { width: 11em; } -.openerp .oe_form .oe_form_inline { - width: auto; -} .openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], @@ -2006,65 +2113,6 @@ border-left: 1px solid #666666; padding: 0 4px 0 4px; } -.openerp .oe_form_notebook { - margin: 8px 0; - padding: 0 8px; - list-style: none; - zoom: 1; -} -.openerp .oe_form_notebook:before, .openerp .oe_form_notebook:after { - display: table; - content: ""; - zoom: 1; -} -.openerp .oe_form_notebook:after { - clear: both; -} -.openerp .oe_form_notebook > li { - float: left; -} -.openerp .oe_form_notebook > li > a { - display: block; - color: #4c4c4c; -} -.openerp .oe_form_notebook { - border-color: #dddddd; - border-style: solid; - border-width: 0 0 1px; -} -.openerp .oe_form_notebook > li { - position: relative; - margin-bottom: -1px; -} -.openerp .oe_form_notebook > li > a { - padding: 0 12px; - margin-right: 2px; - line-height: 30px; - border: 1px solid transparent; - -moz-border-radius: 4px 4px 0 0; - -webkit-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.openerp .oe_form_notebook > li > a:hover { - text-decoration: none; - background-color: #eeeeee; - border-color: #eeeeee #eeeeee #dddddd; -} -.openerp .oe_form_notebook > li.ui-state-active > a, .openerp .oe_form_notebook > li.ui-state-active > a:hover { - background-color: white; - border: 1px solid #dddddd; - border-bottom-color: transparent; - cursor: default; -} -.openerp .oe_form_notebook_page { - padding: 0; -} -.openerp div.ui-tabs { - padding: 3px 0px 3px 0px; -} -.openerp .ui-tabs-hide { - display: none; -} .openerp .oe_form .oe_form_field_progressbar { display: inline-block; min-width: 70px; @@ -2091,65 +2139,30 @@ .openerp .oe_form .oe_form_field_progressbar.ui-progressbar .ui-widget-header { background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; } -.openerp .oe_form .oe_view_manager_header2 td { +.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { + display: none; +} +.openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top { + display: none; +} +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td { padding: 0px 8px; line-height: 16px; } -.openerp .oe_form .oe_view_manager_header2 td .oe_i { +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_i { font-size: 13px; } -.openerp .oe_form .oe_view_manager_header2 td .oe_pager_group { +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group { height: auto; line-height: 16px; } -.openerp .oe_form .oe_view_manager_header2 td .oe_pager_group li { +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group li { height: auto; line-height: 16px; } -.openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { - display: none !important; -} -.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { - display: none; -} .openerp .oe_form .oe_form_field_many2many > .oe-listview .oe_list_pager_single_page { display: none; } -.openerp .oe_form td.oe_form_group_cell_label { - border-right: 1px solid #dddddd; - padding: 2px 0px 2px 0px; -} -.openerp .oe_form td.oe_form_group_cell_label label { - line-height: 18px; - display: block; - min-width: 120px; -} -.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { - padding-left: 8px; -} -.openerp .oe_form .oe_form_subtotal_footer { - width: auto; - float: right; -} -.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell { - text-align: right; - padding: 0; -} -.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell_label { - border: none; -} -.openerp .oe_form .oe_form_subtotal_footer .oe_form_field { - width: auto !important; -} -.openerp .oe_form .oe_form_subtotal_footer .oe_form_subtotal_footer_separator { - border-top: 1px solid #cacaca; - font-size: 120%; - font-weight: bold; -} -.openerp .oe_form .oe_form_subtotal_footer label.oe_form_subtotal_footer_separator { - font-weight: bold !important; - padding: 2px 8px 2px 0px !important; -} .openerp .oe-listview-content { width: 100%; } @@ -2263,27 +2276,6 @@ .openerp .oe_trad_field.touched { border: 1px solid green !important; } -.openerp.oe_tooltip { - font-size: 12px; -} -.openerp.oe_tooltip .oe_tooltip_string { - color: #ffdd55; - font-weight: bold; - font-size: 13px; -} -.openerp.oe_tooltip .oe_tooltip_help { - white-space: pre-wrap; -} -.openerp.oe_tooltip .oe_tooltip_technical { - padding: 0 0 4px 0; - margin: 5px 0 0 15px; -} -.openerp.oe_tooltip .oe_tooltip_technical li { - list-style: circle; -} -.openerp.oe_tooltip .oe_tooltip_technical_title { - font-weight: bold; -} .openerp .oe_view_editor { width: 100%; border-collapse: collapse; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1640960be4f..2e59af56e70 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -36,7 +36,6 @@ $colour4: #8a89ba background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */ background-image: linear-gradient(to bottom, $startColor, $endColor) - @mixin radial-gradient($gradient) background-position: center center background-image: -webkit-radial-gradient(circle, $gradient) @@ -91,24 +90,10 @@ $colour4: #8a89ba // }}} - .openerp.openerp-web-client-container height: 100% position: relative -// Jquery ui Overrides {{{ -.ui-widget - font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif - font-size: 13px -.ui-menu - .ui-menu-item - margin: 0 8px 0 0 - padding: 0 0 0 12px - width: auto - a.ui-state-active - background: #f0f0fa -// }}} - .openerp // Global style {{{ padding: 0 @@ -123,7 +108,6 @@ $colour4: #8a89ba text-decoration: none table padding: 0 - font-size: 13px border-collapse: collapse thead font-weight: bold @@ -145,11 +129,6 @@ $colour4: #8a89ba @include vertical-gradient(#f0f0fa, #eeeef6) .zebra tbody tr:hover td @include vertical-gradient(#eee, #dedede) - .numeric - text-align: right - width: 82px - input - text-align: right ul, li, ol margin: 0 padding: 0 @@ -162,34 +141,6 @@ $colour4: #8a89ba vertical-align: middle h4 margin: 4px 0 - - // }}} - // Generic classes {{{ - .oe_i - font-family: "mnmliconsRegular" !important - font-size: 21px - font-weight: 300 !important - .oe_e - font-family: "entypoRegular" !important - font-size: 34px - font-weight: 300 !important - .oe_left - float: left - margin-right: 8px - .oe_right - float: right - margin-left: 8px - .oe_text_right - text-align: right - .oe_clear - clear: both - .oe_wait - cursor: wait - .oe_fade - color: #888 - //font-size: 12px - .oe_bold - font-weight: bold // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'] @@ -256,6 +207,211 @@ $colour4: #8a89ba @include vertical-gradient(#dc5f59, #b33630) // }}} + // Jquery ui Overrides {{{ + .ui-widget + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif + font-size: 13px + .ui-menu + .ui-menu-item + margin: 0 8px 0 0 + padding: 0 0 0 12px + width: auto + a.ui-state-active + background: #f0f0fa + // }}} + // Generic classes {{{ + .oe_i + font-family: "mnmliconsRegular" !important + font-size: 21px + font-weight: 300 !important + .oe_e + font-family: "entypoRegular" !important + font-size: 34px + font-weight: 300 !important + .oe_left + float: left + margin-right: 8px + .oe_right + float: right + margin-left: 8px + .oe_text_right + text-align: right + .oe_clear + clear: both + .oe_wait + cursor: wait + .oe_fade + color: #888 + .oe_bold + font-weight: bold + .oe_inline  + width: auto + .oe_highlight + color: white + background: #DC5F59 + button.oe_highlight + @include vertical-gradient(#dc5f59, #b33630) + @include box-shadow(none) + button.oe_highlight:hover + background: #DF6B66 + @include vertical-gradient(#DF6B66, #BF3A33) + @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + //.oe_avatar  + //.oe_button_box  + //.oe_edit_only  + // }}} + // Tooltips {{{ + &.oe_tooltip + font-size: 12px + .oe_tooltip_string + color: #FD5 + font-weight: bold + font-size: 13px + .oe_tooltip_help + white-space: pre-wrap + .oe_tooltip_technical + padding: 0 0 4px 0 + margin: 5px 0 0 15px + li + list-style: circle + .oe_tooltip_technical_title + font-weight: bold + // }}} + // Notebook {{{ + .oe_notebook + margin: 8px 0 + padding: 0 8px + list-style: none + zoom: 1 + .oe_notebook:before, .oe_notebook:after + display: table + content: "" + zoom: 1 + .oe_notebook:after + clear: both + .oe_notebook > li + float: left + .oe_notebook > li > a + display: block + color: #4c4c4c + .oe_notebook + border-color: #ddd + border-style: solid + border-width: 0 0 1px + .oe_notebook > li + position: relative + margin-bottom: -1px + .oe_notebook > li > a + padding: 0 12px + margin-right: 2px + line-height: 30px + border: 1px solid transparent + @include radius(4px 4px 0 0) + .oe_notebook > li > a:hover + text-decoration: none + background-color: #eee + border-color: #eee #eee #ddd + .oe_notebook > li.ui-state-active > a, .oe_notebook > li.ui-state-active > a:hover + background-color: #ffffff + border: 1px solid #ddd + border-bottom-color: transparent + cursor: default + .oe_notebook_page + padding: 0 + div.ui-tabs + padding: 3px 0px 3px 0px + .ui-tabs-hide + display: none + // }}} + // Dropdown {{{ + .oe_dropdown_toggle:after + width: 0 + height: 0 + display: inline-block + content: "&darr" + text-indent: -99999px + vertical-align: top + border-left: 4px solid transparent + border-right: 4px solid transparent + border-top: 4px solid white + @include opacity(0.5) + margin-top: 7px + margin-left: 6px + border-top-color: #404040 + .oe_dropdown_menu + display: none + position: absolute + top: 28px + left: 0px + padding: 8px + border: 1px solid #afafb6 + min-width: 120px + overflow-x: hidden + z-index: 900 + text-align: left + background: white + @include radius(3px) + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + li + &:hover + @include vertical-gradient(#f0f0fa, #eeeef6) + @include box-shadow(none) + position: relative + list-style-type: none + float: none + display: block + background-color: none + a + display: block + padding: 3px 6px + clear: both + font-weight: normal + line-height: 14px + color: #4c4c4c + text-decoration: none + cursor: pointer + &:hover + text-decoration: none + .oe_sidebar_delete_item + position: absolute + bottom: 1px + right: 4px + display: none + 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) + &:hover + .oe_sidebar_delete_item + display: inline-block + .oe_sidebar + white-space: nowrap + .oe_dropdown_menu li + padding-right: 16px + .oe_sidebar_add_attachment + cursor: pointer + padding-left: 6px + margin-top: 6px + span + font-weight: bold + .oe_hidden_input_file + width: 200px + &:hover + @include vertical-gradient(#f0f0fa, #eeeef6) + @include box-shadow(none) + // }}} + // Loading {{{ .oe_loading display: none @@ -409,7 +565,6 @@ $colour4: #8a89ba height: 31px border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) - .oe_topbar_item li float: left @@ -706,15 +861,13 @@ $colour4: #8a89ba > div height: 100% // }}} - - // ViewManager common styles + // ViewManager common {{{ .oe_view_manager .oe_view_manager_body height: inherit .oe_view_manager_view_kanban height: inherit - // ViewManager.header {{{ .oe_view_manager_header width: 100% .oe_header_row @@ -826,8 +979,7 @@ $colour4: #8a89ba .oe_vm_switch_diagram:after content: "f" // }}} - - // ViewManager top header specific style {{{ + // ViewManager application {{{ .oe_view_manager_global height: 100% > .oe_view_manager_header @@ -842,104 +994,9 @@ $colour4: #8a89ba td padding-top: 8px // }}} - - // ViewManager one2many specific style {{{ - .oe_form_field_one2many > .oe_view_manager - .oe_header_row_top - display: none - // }}} - - - // ViewManager.sidebar {{{ - .oe_form_dropdown_section - position: relative - display: inline-block - .oe_dropdown_toggle:after - width: 0 - height: 0 - display: inline-block - content: "&darr" - text-indent: -99999px - vertical-align: top - border-left: 4px solid transparent - border-right: 4px solid transparent - border-top: 4px solid white - @include opacity(0.5) - margin-top: 7px - margin-left: 6px - border-top-color: #404040 - .oe_dropdown_menu - display: none - position: absolute - top: 28px - left: 0px - padding: 8px - border: 1px solid #afafb6 - min-width: 120px - overflow-x: hidden - z-index: 900 - text-align: left - background: white - @include radius(3px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - li - &:hover - @include vertical-gradient(#f0f0fa, #eeeef6) - @include box-shadow(none) - position: relative - list-style-type: none - float: none - display: block - background-color: none - a - display: block - padding: 3px 6px - clear: both - font-weight: normal - line-height: 14px - color: #4c4c4c - text-decoration: none - cursor: pointer - &:hover - text-decoration: none - .oe_sidebar_delete_item - position: absolute - bottom: 1px - right: 4px - display: none - 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) - &:hover - .oe_sidebar_delete_item - display: inline-block - .oe_sidebar - white-space: nowrap - .oe_dropdown_menu li - padding-right: 16px - .oe_sidebar_add_attachment - cursor: pointer - padding-left: 6px - margin-top: 6px - span - font-weight: bold - .oe_hidden_input_file - width: 200px - &:hover - @include vertical-gradient(#f0f0fa, #eeeef6) - @include box-shadow(none) + // Viewmanager popup {{{ + .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager + display: none !important // }}} // SearchView {{{ .oe_searchview @@ -1244,6 +1301,9 @@ $colour4: #8a89ba line-height: 30px // }}} // FormView.body {{{ + .oe_form_dropdown_section + position: relative + display: inline-block .oe_formview background: white .oe_form_header @@ -1261,7 +1321,7 @@ $colour4: #8a89ba &:hover background: #ED6F6A // }}} - // FormView.customdivs {{{ + // FormView.custom tags and classes {{{ .oe_form header position: relative border-bottom: 1px solid #cacaca @@ -1317,16 +1377,33 @@ $colour4: #8a89ba .oe_form_steps_active font-weight: bold color: #b33630 - .oe_form_readonly - button.oe_form_button_hi - color: white - background: #DC5F59 - @include vertical-gradient(#dc5f59, #b33630) - @include box-shadow(none) - button.oe_form_button_hi:hover - background: #DF6B66 - @include vertical-gradient(#DF6B66, #BF3A33) - @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + .oe_form + td.oe_form_group_cell_label + border-right: 1px solid #ddd + padding: 2px 0px 2px 0px + label + line-height: 18px + display: block + min-width: 120px + td.oe_form_group_cell + .oe_form_group_cell + padding-left: 8px + .oe_form_subtotal_footer + width: auto + float: right + td.oe_form_group_cell + text-align: right + padding: 0 + td.oe_form_group_cell_label + border: none + .oe_form_field + width: auto !important + .oe_form_subtotal_footer_separator + border-top: 1px solid #cacaca + font-size: 120% + font-weight: bold + label.oe_form_subtotal_footer_separator + font-weight: bold !important + padding: 2px 8px 2px 0px !important .oe_application .oe_form_sheetbg background: url(/web/static/src/img/form_sheetbg.png) @@ -1346,10 +1423,10 @@ $colour4: #8a89ba // FormView.layout {{{ .oe_form_invisible display: none !important - .oe_form_editable .oe_form_editable_hidden + .oe_form_editable .oe_edit_only display: none !important .oe_form_readonly - .oe_form_readonly_hidden, .oe_form_field:empty + .oe_edit_only, .oe_form_field:empty display: none !important .oe_form .oe_form_field_text @@ -1414,8 +1491,6 @@ $colour4: #8a89ba width: 7em .oe_form_field_datetime width: 11em - .oe_form_inline - width: auto input[type="text"], input[type="password"], @@ -1553,12 +1628,6 @@ $colour4: #8a89ba .oe_form_button > img vertical-align: -3px padding: 0 2px - // From FP: .oe_form_group_cell > .oe_form_button.oe_button - // From FP: display: block - // From FP: white-space: nowrap - // From FP: min-width: 100% - // From FP: width: 100% - // }}} // FormView.binaryfile {{{ /* http://www.quirksmode.org/dom/inputfile.html @@ -1620,53 +1689,6 @@ $colour4: #8a89ba border-left: 1px solid #666 padding: 0 4px 0 4px // }}} - // FormView.notebook {{{ - .oe_form_notebook - margin: 8px 0 - padding: 0 8px - list-style: none - zoom: 1 - .oe_form_notebook:before, .oe_form_notebook:after - display: table - content: "" - zoom: 1 - .oe_form_notebook:after - clear: both - .oe_form_notebook > li - float: left - .oe_form_notebook > li > a - display: block - color: #4c4c4c - .oe_form_notebook - border-color: #ddd - border-style: solid - border-width: 0 0 1px - .oe_form_notebook > li - position: relative - margin-bottom: -1px - .oe_form_notebook > li > a - padding: 0 12px - margin-right: 2px - line-height: 30px - border: 1px solid transparent - @include radius(4px 4px 0 0) - .oe_form_notebook > li > a:hover - text-decoration: none - background-color: #eee - border-color: #eee #eee #ddd - .oe_form_notebook > li.ui-state-active > a, .oe_form_notebook > li.ui-state-active > a:hover - background-color: #ffffff - border: 1px solid #ddd - border-bottom-color: transparent - cursor: default - .oe_form_notebook_page - padding: 0 - div.ui-tabs - padding: 3px 0px 3px 0px - .ui-tabs-hide - display: none - - // }}} // FormView.progressbar {{{ .oe_form .oe_form_field_progressbar @@ -1689,8 +1711,13 @@ $colour4: #8a89ba .ui-widget-header background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x // }}} - // FormView.viewmanager {{{ - .oe_form + // FormView.one2many {{{ + .oe_form .oe_form_field_one2many > .oe_view_manager + .oe_list_pager_single_page + display: none + .oe_form_field_one2many > .oe_view_manager + .oe_header_row_top + display: none .oe_view_manager_header2 td padding: 0px 8px @@ -1703,49 +1730,12 @@ $colour4: #8a89ba li height: auto line-height: 16px - .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager - display: none !important - - // }}} - // FormView.one2many {{{ - .oe_form .oe_form_field_one2many > .oe_view_manager - .oe_list_pager_single_page - display: none // }}} // FormView.many2many {{{ .oe_form .oe_form_field_many2many > .oe-listview .oe_list_pager_single_page display: none // }}} - // FormView.classes for openerp views {{{ - .oe_form - td.oe_form_group_cell_label - border-right: 1px solid #ddd - padding: 2px 0px 2px 0px - label - line-height: 18px - display: block - min-width: 120px - td.oe_form_group_cell + .oe_form_group_cell - padding-left: 8px - .oe_form_subtotal_footer - width: auto - float: right - td.oe_form_group_cell - text-align: right - padding: 0 - td.oe_form_group_cell_label - border: none - .oe_form_field - width: auto !important - .oe_form_subtotal_footer_separator - border-top: 1px solid #cacaca - font-size: 120% - font-weight: bold - label.oe_form_subtotal_footer_separator - font-weight: bold !important - padding: 2px 8px 2px 0px !important - // }}} // ListView {{{ .oe-listview-content width: 100% @@ -1782,15 +1772,6 @@ $colour4: #8a89ba visibility: visible @include box-shadow(none) @include opacity(0.6) - // TODO mit - //th:hover:after - // border-bottom: none - // border-left: 4px solid transparent - // border-right: 4px solid transparent - // border-top: 4px solid #000 - // visibility: visible - // @include box-shadow(none) - // @include opacity(0.6) > tbody cursor: pointer background: white @@ -1833,23 +1814,6 @@ $colour4: #8a89ba .oe_trad_field.touched border: 1px solid green !important // }}} - // Tooltips {{{ - &.oe_tooltip - font-size: 12px - .oe_tooltip_string - color: #FD5 - font-weight: bold - font-size: 13px - .oe_tooltip_help - white-space: pre-wrap - .oe_tooltip_technical - padding: 0 0 4px 0 - margin: 5px 0 0 15px - li - list-style: circle - .oe_tooltip_technical_title - font-weight: bold - // }}} // View Editor {{{ .oe_view_editor width: 100% @@ -1869,6 +1833,7 @@ $colour4: #8a89ba .oe_view_editor tr:hover background-color: #ecebf2 // }}} + // Debugging stuff {{{ .oe_layout_debugging .oe_form_group @@ -1886,7 +1851,6 @@ $colour4: #8a89ba float: right .oe_form_group_row_incomplete.oe_form_group_row_newline > td:last-child:after content: "[newline]" - .oe_debug_view float: left .oe_debug_view_log @@ -1904,7 +1868,6 @@ $colour4: #8a89ba float: right color: #333 // }}} - // Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) @@ -1913,7 +1876,6 @@ $colour4: #8a89ba >* opacity: 0.70 // }}} - // Transitional overrides for old styles {{{ .openerp .oe_form_field_many2one -- cgit v1.2.3 From b537a14d57b79a29acfacdbfed763ad388176d7c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 11:30:11 +0200 Subject: [IMP] more sass cleanup bzr revid: al@openerp.com-20120619093011-lwid3wsrko5xcukm --- addons/web/static/src/css/base.css | 117 +++++++++++++-------------- addons/web/static/src/css/base.sass | 155 ++++++++++++++++++------------------ 2 files changed, 134 insertions(+), 138 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 ba10cbcc04c..a352b9b452a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -306,6 +306,10 @@ -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } +.openerp .oe_button_box { + width: 200px; + text-align: center; +} .openerp.oe_tooltip { font-size: 12px; } @@ -1706,65 +1710,69 @@ height: 24px; } .openerp .oe_form header ul { + display: inline-block; + float: right; +} +.openerp .oe_form footer { + min-width: 650px; + max-width: 960px; + margin: 0 auto; +} +.openerp ul.oe_form_steps { height: 30px; padding: 0; margin: 0; text-shadow: 0 1px 1px white; - border-left: 1px solid #cacaca; - border-right: 1px solid #cacaca; } -.openerp .oe_form header ul li { +.openerp ul.oe_form_steps img { + vertical-align: top; + margin-left: 8px; +} +.openerp ul.oe_form_steps li { + border-right: none; padding: 0; margin: 0; float: left; vertical-align: top; - border-right: 1px solid #cacaca; height: 30px; - padding: 0 12px; + padding: 0 0 0 12px; } -.openerp .oe_form header ul li:first-child { +.openerp ul.oe_form_steps li:first-child { border-left: 1px solid #cacaca; } -.openerp .oe_form header ul li a { +.openerp ul.oe_form_steps li:last-child { + margin-right: 12px; + padding-right: 12px; + border-right: 1px solid #cacaca; +} +.openerp ul.oe_form_steps li a { color: #4c4c4c; } -.openerp .oe_form header ul li a:hover { +.openerp ul.oe_form_steps li a:hover { color: black; } -.openerp .oe_form header .oe_form_steps { - display: inline-block; - float: right; -} -.openerp .oe_form header .oe_form_steps img { - margin: 0 8px; - vertical-align: top; -} -.openerp .oe_form header .oe_form_steps li { - border-right: none; - padding: 0; -} -.openerp .oe_form header .oe_form_steps li:first-child { - margin-left: 12px; - border-left: none; -} -.openerp .oe_form header .oe_form_steps li:last-child { - margin-right: 12px; -} -.openerp .oe_form header .oe_form_steps_active { +.openerp ul.oe_form_steps .oe_form_steps_active { font-weight: bold; color: #b33630; } -.openerp .oe_form td.oe_form_group_cell_label { - border-right: 1px solid #dddddd; - padding: 2px 0px 2px 0px; +.openerp .oe_application .oe_form_sheetbg { + background: url(/web/static/src/img/form_sheetbg.png); + padding: 8px 0; + border-bottom: 1px solid #dddddd; } -.openerp .oe_form td.oe_form_group_cell_label label { - line-height: 18px; - display: block; - min-width: 120px; +.openerp .oe_application .oe_form_sheet_width { + min-width: 650px; + max-width: 960px; + margin: 0 auto; } -.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { - padding-left: 8px; +.openerp .oe_application .oe_form_sheet { + padding: 18px; + background: white; + min-height: 330px; + border: 1px solid #afafb6; + -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); } .openerp .oe_form .oe_form_subtotal_footer { width: auto; @@ -1789,25 +1797,6 @@ font-weight: bold !important; padding: 2px 8px 2px 0px !important; } -.openerp .oe_application .oe_form_sheetbg { - background: url(/web/static/src/img/form_sheetbg.png); - padding: 8px 0; - border-bottom: 1px solid #dddddd; -} -.openerp .oe_application .oe_form_sheet_width, .openerp .oe_application footer { - min-width: 650px; - max-width: 960px; - margin: 0 auto; -} -.openerp .oe_application .oe_form_sheet { - padding: 18px; - background: white; - min-height: 330px; - border: 1px solid #afafb6; - -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); -} .openerp .oe_form_invisible { display: none !important; } @@ -1846,6 +1835,18 @@ margin-left: 10px !important; margin-right: 10px !important; } +.openerp .oe_form td.oe_form_group_cell_label { + border-right: 1px solid #dddddd; + padding: 2px 0px 2px 0px; +} +.openerp .oe_form td.oe_form_group_cell_label label { + line-height: 18px; + display: block; + min-width: 120px; +} +.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { + padding-left: 8px; +} .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; white-space: nowrap; @@ -2030,10 +2031,6 @@ clear: both; visibility: hidden; } -.openerp .oe_form .oe_form_button_box { - width: 200px; - text-align: center; -} .openerp .oe_form .oe_form_group { margin: 5px 0px 5px 0px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2e59af56e70..b1484b2de7b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -256,8 +256,10 @@ $colour4: #8a89ba background: #DF6B66 @include vertical-gradient(#DF6B66, #BF3A33) @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + .oe_button_box + width: 200px + text-align: center //.oe_avatar  - //.oe_button_box  //.oe_edit_only  // }}} // Tooltips {{{ @@ -1322,71 +1324,76 @@ $colour4: #8a89ba background: #ED6F6A // }}} // FormView.custom tags and classes {{{ - .oe_form header - position: relative - border-bottom: 1px solid #cacaca - @include vertical-gradient(#fcfcfc, #dedede) - padding: 0 8px - line-height: 30px - button - font-size: 12px - float: left - height: 24px !important - line-height: 24px + .oe_form + header + position: relative + border-bottom: 1px solid #cacaca + @include vertical-gradient(#fcfcfc, #dedede) + padding: 0 8px + line-height: 30px + button + font-size: 12px + float: left + height: 24px !important + line-height: 24px + vertical-align: top + padding: 0 10px + margin: 3px 4px 3px 0 + span.i + line-height: 20px + height: 24px + ul + display: inline-block + float: right + footer + min-width: 650px + max-width: 960px + margin: 0 auto + ul.oe_form_steps + height: 30px + padding: 0 + margin: 0 + text-shadow: 0 1px 1px white + img vertical-align: top - padding: 0 10px - margin: 3px 4px 3px 0 - span.i - line-height: 20px - height: 24px - ul - height: 30px + margin-left: 8px + li + border-right: none padding: 0 margin: 0 - text-shadow: 0 1px 1px white - border-left: 1px solid #cacaca - border-right: 1px solid #cacaca - li - padding: 0 - margin: 0 - float: left - vertical-align: top + float: left + vertical-align: top + height: 30px + padding: 0 0 0 12px + &:first-child + border-left: 1px solid #cacaca + &:last-child + margin-right: 12px + padding-right: 12px border-right: 1px solid #cacaca - height: 30px - padding: 0 12px - &:first-child - border-left: 1px solid #cacaca - a - color: #4c4c4c - &:hover - color: black - .oe_form_steps - display: inline-block - float: right - img - margin: 0 8px - vertical-align: top - li - border-right: none - padding: 0 - &:first-child - margin-left: 12px - border-left: none - &:last-child - margin-right: 12px + a + color: #4c4c4c + &:hover + color: black .oe_form_steps_active - font-weight: bold + font-weight: bold color: #b33630 + .oe_application + .oe_form_sheetbg + background: url(/web/static/src/img/form_sheetbg.png) + padding: 8px 0 + border-bottom: 1px solid #ddd + .oe_form_sheet_width + min-width: 650px + max-width: 960px + margin: 0 auto + .oe_form_sheet + padding: 18px + background: white + min-height: 330px + border: 1px solid #afafb6 + @include box-shadow(0 0 10px rgba(0,0,0,0.3)) .oe_form - td.oe_form_group_cell_label - border-right: 1px solid #ddd - padding: 2px 0px 2px 0px - label - line-height: 18px - display: block - min-width: 120px - td.oe_form_group_cell + .oe_form_group_cell - padding-left: 8px .oe_form_subtotal_footer width: auto float: right @@ -1404,21 +1411,6 @@ $colour4: #8a89ba label.oe_form_subtotal_footer_separator font-weight: bold !important padding: 2px 8px 2px 0px !important - .oe_application - .oe_form_sheetbg - background: url(/web/static/src/img/form_sheetbg.png) - padding: 8px 0 - border-bottom: 1px solid #ddd - .oe_form_sheet_width, footer - min-width: 650px - max-width: 960px - margin: 0 auto - .oe_form_sheet - padding: 18px - background: white - min-height: 330px - border: 1px solid #afafb6 - @include box-shadow(0 0 10px rgba(0,0,0,0.3)) // }}} // FormView.layout {{{ .oe_form_invisible @@ -1456,6 +1448,17 @@ $colour4: #8a89ba margin-left: 10px !important margin-right: 10px !important + .oe_form + td.oe_form_group_cell_label + border-right: 1px solid #ddd + padding: 2px 0px 2px 0px + label + line-height: 18px + display: block + min-width: 120px + td.oe_form_group_cell + .oe_form_group_cell + padding-left: 8px + // }}} // FormView.label {{{ .oe_form @@ -1609,10 +1612,6 @@ $colour4: #8a89ba height: 0 clear: both visibility: hidden - .oe_form_button_box - width: 200px - text-align: center - .oe_form_group margin: 5px 0px 5px 0px -- cgit v1.2.3 From 613803f3c2ab7385f9b4cf2f23f42f332c1463ad Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 14:51:02 +0200 Subject: [IMP] sass button styling bzr revid: al@openerp.com-20120619125102-xq1u5il44f81tlet --- addons/web/static/src/css/base.css | 100 +++++------------------------------- addons/web/static/src/css/base.sass | 55 ++------------------ 2 files changed, 18 insertions(+), 137 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 a352b9b452a..b096e33c511 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -106,7 +106,7 @@ display: inline-block; border: 1px solid #ababab; color: #404040; - margin: 0; + margin: 0 4px 0 0; padding: 3px 12px; font-size: 13px; text-align: center; @@ -169,66 +169,6 @@ cursor: default; text-shadow: 0 1px 1px white !important; } -.openerp button.primary { - color: white; - background-color: #dc5f59; - background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); - background-image: -moz-linear-gradient(top, #dc5f59, #b33630); - background-image: -ms-linear-gradient(top, #dc5f59, #b33630); - background-image: -o-linear-gradient(top, #dc5f59, #b33630); - background-image: linear-gradient(to bottom, #dc5f59, #b33630); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} -.openerp button.primary:hover { - background-color: #df6b66; - background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33)); - background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33); - background-image: -moz-linear-gradient(top, #df6b66, #bf3a33); - background-image: -ms-linear-gradient(top, #df6b66, #bf3a33); - background-image: -o-linear-gradient(top, #df6b66, #bf3a33); - background-image: linear-gradient(to bottom, #df6b66, #bf3a33); - -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); -} -.openerp button.primary:active { - background-color: #b33630; - background-image: -webkit-gradient(linear, left top, left bottom, from(#b33630), to(#dc5f59)); - background-image: -webkit-linear-gradient(top, #b33630, #dc5f59); - background-image: -moz-linear-gradient(top, #b33630, #dc5f59); - background-image: -ms-linear-gradient(top, #b33630, #dc5f59); - background-image: -o-linear-gradient(top, #b33630, #dc5f59); - background-image: linear-gradient(to bottom, #b33630, #dc5f59); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} -.openerp button.following { - color: white; - width: 120px; - background-color: #8a89ba; - background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4)); - background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4); - background-image: -moz-linear-gradient(top, #8a89ba, #807fb4); - background-image: -ms-linear-gradient(top, #8a89ba, #807fb4); - background-image: -o-linear-gradient(top, #8a89ba, #807fb4); - background-image: linear-gradient(to bottom, #8a89ba, #807fb4); -} -.openerp button.unfollow { - display: none; - color: white; - width: 120px; - background-color: #dc5f59; - background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); - background-image: -moz-linear-gradient(top, #dc5f59, #b33630); - background-image: -ms-linear-gradient(top, #dc5f59, #b33630); - background-image: -o-linear-gradient(top, #dc5f59, #b33630); - background-image: linear-gradient(to bottom, #dc5f59, #b33630); -} .openerp .ui-widget { font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; font-size: 13px; @@ -293,8 +233,19 @@ -webkit-box-shadow: none; box-shadow: none; } +.openerp button.oe_highlight:active { + background-color: #b33630; + background-image: -webkit-gradient(linear, left top, left bottom, from(#b33630), to(#dc5f59)); + background-image: -webkit-linear-gradient(top, #b33630, #dc5f59); + background-image: -moz-linear-gradient(top, #b33630, #dc5f59); + background-image: -ms-linear-gradient(top, #b33630, #dc5f59); + background-image: -o-linear-gradient(top, #b33630, #dc5f59); + background-image: linear-gradient(to bottom, #b33630, #dc5f59); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} .openerp button.oe_highlight:hover { - background: #df6b66; background-color: #df6b66; background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33)); background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33); @@ -1696,19 +1647,6 @@ padding: 0 8px; line-height: 30px; } -.openerp .oe_form header button { - font-size: 12px; - float: left; - height: 24px !important; - line-height: 24px; - vertical-align: top; - padding: 0 10px; - margin: 3px 4px 3px 0; -} -.openerp .oe_form header button span.i { - line-height: 20px; - height: 24px; -} .openerp .oe_form header ul { display: inline-block; float: right; @@ -2034,18 +1972,6 @@ .openerp .oe_form .oe_form_group { margin: 5px 0px 5px 0px; } -.openerp .oe_form .oe_form_button.oe_button { - height: 22px; - white-space: nowrap; -} -.openerp .oe_form .oe_form_button.oe_button span { - position: relative; - vertical-align: top; -} -.openerp .oe_form .oe_form_button > img { - vertical-align: -3px; - padding: 0 2px; -} .openerp .oe_hidden_input_file { overflow: hidden; position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b1484b2de7b..3b90fe2e0e2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -147,7 +147,7 @@ $colour4: #8a89ba display: inline-block border: 1px solid #ababab color: #404040 - margin: 0 + margin: 0 4px 0 0 padding: 3px 12px font-size: 13px text-align: center @@ -181,31 +181,6 @@ $colour4: #8a89ba color: #aaa !important cursor: default text-shadow: 0 1px 1px #fff !important - - button.primary - color: white - @include vertical-gradient(#dc5f59, #b33630) - @include box-shadow(none) - - button.primary:hover - @include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) - @include box-shadow(0 0 1px rgba(0,0,0,0.2)) - - button.primary:active - @include vertical-gradient(#b33630, #dc5f59) - @include box-shadow(none) - - button.following - color: white - width: 120px - @include vertical-gradient($colour4, darken($colour4, 3%)) - - button.unfollow - display: none - color: white - width: 120px - @include vertical-gradient(#dc5f59, #b33630) - // }}} // Jquery ui Overrides {{{ .ui-widget @@ -252,9 +227,12 @@ $colour4: #8a89ba button.oe_highlight @include vertical-gradient(#dc5f59, #b33630) @include box-shadow(none) + button.oe_highlight:active + @include vertical-gradient(#b33630, #dc5f59) + @include box-shadow(none) button.oe_highlight:hover - background: #DF6B66 @include vertical-gradient(#DF6B66, #BF3A33) + //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) .oe_button_box width: 200px @@ -1331,17 +1309,6 @@ $colour4: #8a89ba @include vertical-gradient(#fcfcfc, #dedede) padding: 0 8px line-height: 30px - button - font-size: 12px - float: left - height: 24px !important - line-height: 24px - vertical-align: top - padding: 0 10px - margin: 3px 4px 3px 0 - span.i - line-height: 20px - height: 24px ul display: inline-block float: right @@ -1616,18 +1583,6 @@ $colour4: #8a89ba margin: 5px 0px 5px 0px // }}} - // FormView.buttons {{{ - .oe_form - .oe_form_button.oe_button - height: 22px - white-space: nowrap - span - position: relative - vertical-align: top - .oe_form_button > img - vertical-align: -3px - padding: 0 2px - // }}} // FormView.binaryfile {{{ /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image -- cgit v1.2.3 From 80a46d9133214cffdeb2b0544054e0ae87e0ed8c Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 19 Jun 2012 14:52:33 +0200 Subject: Adjustement to textarea bzr revid: mit@openerp.com-20120619125233-fz0qzbae7xc2eh9m --- 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 639e6bdc641..826cb0cba4b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1645,7 +1645,7 @@ width: inherit; } .openerp .oe_form .oe_form_sheet textarea { - width: 49%; + width: 500px; } .openerp .oe_form .oe_form_field_float input { width: 100px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4a472a50a4c..3b7c41723bd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1300,7 +1300,7 @@ $colour4: #8a89ba .oe_form_field_selection select width: inherit .oe_form_sheet textarea - width: 49% + width: 500px .oe_form_field_float input width: 100px -- cgit v1.2.3 From 7de902b0678676408e46f2856a8db450902d0470 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 15:01:44 +0200 Subject: [MERGE] trunk bzr revid: al@openerp.com-20120619130144-g5o2h09qbegc4ssh --- addons/web/static/src/css/base.sass | 2 -- 1 file changed, 2 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3de546d547a..341755cbcb2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1451,8 +1451,6 @@ $colour4: #8a89ba // }}} // FormView.fields {{{ .oe_form - .oe_form_field_text textarea - resize: none .oe_form_field width: 100% display: inline-block -- cgit v1.2.3 From 717de3937e1b264c04e8ba3fa5dac7aaf25038bc Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 19 Jun 2012 15:14:32 +0200 Subject: [WIP] Changed oe_topbar_item bzr revid: fme@openerp.com-20120619131432-69tuwtw3dr0jhjo8 --- addons/web/static/src/css/base.css | 7 ++----- addons/web/static/src/css/base.sass | 25 +++++++++++-------------- 2 files changed, 13 insertions(+), 19 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 d55b320b969..13f04ab6593 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -682,10 +682,7 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } -.openerp .oe_topbar .oe_topbar_item li { - float: left; -} -.openerp .oe_topbar .oe_topbar_item li a { +.openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; line-height: 20px; @@ -694,7 +691,7 @@ vertical-align: top; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); } -.openerp .oe_topbar .oe_topbar_item li a:hover { +.openerp .oe_topbar .oe_topbar_item:hover { background: #303030; color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 341755cbcb2..5d91ed64a1d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -556,20 +556,17 @@ $colour4: #8a89ba border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) .oe_topbar_item - li - float: left - a - display: block - padding: 5px 10px 7px - line-height: 20px - height: 20px - color: #eee - vertical-align: top - text-shadow: 0 1px 1px rgba(0,0,0,0.2) - &:hover - background: #303030 - color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + display: block + padding: 5px 10px 7px + line-height: 20px + height: 20px + color: #eee + vertical-align: top + text-shadow: 0 1px 1px rgba(0,0,0,0.2) + &:hover + background: #303030 + color: white + @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) .oe_active background: #303030 font-weight: bold -- cgit v1.2.3 From f0f74adfef677f65c6802980533b0959a16b906b Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 15:23:58 +0200 Subject: [IMP] sass form cleanups bzr revid: al@openerp.com-20120619132358-25it8p6mt79kf5bf --- addons/web/static/src/css/base.css | 74 +++++++++++++------------------- addons/web/static/src/css/base.sass | 84 ++++++++++++++++--------------------- 2 files changed, 65 insertions(+), 93 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 d55b320b969..f1211d2167c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -107,7 +107,7 @@ display: inline-block; border: 1px solid #ababab; color: #404040; - margin: 0 4px 0 0; + margin: 0; padding: 3px 12px; font-size: 13px; text-align: center; @@ -1603,18 +1603,6 @@ max-width: 700px; font-size: 125%; } -.openerp .oe_view_topbar { - border-bottom: 1px solid #cacaca; - background-color: #fcfcfc; - background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); - background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); - background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); - background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); - background-image: -o-linear-gradient(top, #fcfcfc, #dedede); - background-image: linear-gradient(to bottom, #fcfcfc, #dedede); - padding: 0 8px; - line-height: 30px; -} .openerp .oe_form_dropdown_section { position: relative; display: inline-block; @@ -1622,9 +1610,6 @@ .openerp .oe_formview { background: white; } -.openerp .oe_form_header { - padding: 8px; -} .openerp .oe_form_invalid input, .openerp .oe_form_invalid select, .openerp .oe_form_invalid textarea { background-color: #ff6666 !important; border: 1px solid #dd0000 !important; @@ -1706,6 +1691,29 @@ font-weight: bold; color: #b33630; } +.openerp .oe_form_subtotal_footer { + width: auto; + float: right; +} +.openerp .oe_form_subtotal_footer td.oe_form_group_cell { + text-align: right; + padding: 0; +} +.openerp .oe_form_subtotal_footer td.oe_form_group_cell_label { + border: none; +} +.openerp .oe_form_subtotal_footer .oe_form_field { + width: auto !important; +} +.openerp .oe_form_subtotal_footer .oe_form_subtotal_footer_separator { + border-top: 1px solid #cacaca; + font-size: 120%; + font-weight: bold; +} +.openerp .oe_form_subtotal_footer label.oe_form_subtotal_footer_separator { + font-weight: bold !important; + padding: 2px 8px 2px 0px !important; +} .openerp .oe_application .oe_form_sheetbg { background: url(/web/static/src/img/form_sheetbg.png); padding: 8px 0; @@ -1725,29 +1733,6 @@ -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); } -.openerp .oe_form .oe_form_subtotal_footer { - width: auto; - float: right; -} -.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell { - text-align: right; - padding: 0; -} -.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell_label { - border: none; -} -.openerp .oe_form .oe_form_subtotal_footer .oe_form_field { - width: auto !important; -} -.openerp .oe_form .oe_form_subtotal_footer .oe_form_subtotal_footer_separator { - border-top: 1px solid #cacaca; - font-size: 120%; - font-weight: bold; -} -.openerp .oe_form .oe_form_subtotal_footer label.oe_form_subtotal_footer_separator { - font-weight: bold !important; - padding: 2px 8px 2px 0px !important; -} .openerp .oe_form_invisible { display: none !important; } @@ -1814,9 +1799,6 @@ top: -4px; padding: 0 2px; } -.openerp .oe_form .oe_form_field_text textarea { - resize: none; -} .openerp .oe_form .oe_form_field { width: 100%; display: inline-block; @@ -2040,11 +2022,11 @@ border-left: 1px solid #666666; padding: 0 4px 0 4px; } -.openerp .oe_form .oe_form_field_progressbar { +.openerp .oe_form_field_progressbar { display: inline-block; min-width: 70px; } -.openerp .oe_form .oe_form_field_progressbar.ui-progressbar { +.openerp .oe_form_field_progressbar.ui-progressbar { height: 22px; font-size: 10px; -webkit-box-sizing: border-box; @@ -2058,12 +2040,12 @@ background: white; min-width: 50px; } -.openerp .oe_form .oe_form_field_progressbar.ui-progressbar span { +.openerp .oe_form_field_progressbar.ui-progressbar span { position: absolute; margin-left: 10px; font-weight: bold; } -.openerp .oe_form .oe_form_field_progressbar.ui-progressbar .ui-widget-header { +.openerp .oe_form_field_progressbar.ui-progressbar .ui-widget-header { background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; } .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 341755cbcb2..89f149b378b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -148,7 +148,7 @@ $colour4: #8a89ba display: inline-block border: 1px solid #ababab color: #404040 - margin: 0 4px 0 0 + margin: 0 padding: 3px 12px font-size: 13px text-align: center @@ -1281,11 +1281,6 @@ $colour4: #8a89ba padding: 35px 0px 0px 0px max-width: 700px font-size: 125% - .oe_view_topbar - border-bottom: 1px solid #cacaca - @include vertical-gradient(#fcfcfc, #dedede) - padding: 0 8px - line-height: 30px // }}} // FormView.body {{{ .oe_form_dropdown_section @@ -1293,8 +1288,6 @@ $colour4: #8a89ba display: inline-block .oe_formview background: white - .oe_form_header - padding: 8px .oe_form_invalid input, select, textarea background-color: #F66 !important @@ -1352,6 +1345,24 @@ $colour4: #8a89ba .oe_form_steps_active font-weight: bold color: #b33630 + .oe_form_subtotal_footer + width: auto + float: right + td.oe_form_group_cell + text-align: right + padding: 0 + td.oe_form_group_cell_label + border: none + .oe_form_field + width: auto !important + .oe_form_subtotal_footer_separator + border-top: 1px solid #cacaca + font-size: 120% + font-weight: bold + label.oe_form_subtotal_footer_separator + font-weight: bold !important + padding: 2px 8px 2px 0px !important + // no sheet in popups .oe_application .oe_form_sheetbg background: url(/web/static/src/img/form_sheetbg.png) @@ -1367,24 +1378,6 @@ $colour4: #8a89ba padding: 16px border: 1px solid #afafb6 @include box-shadow(0 0 10px rgba(0,0,0,0.3)) - .oe_form - .oe_form_subtotal_footer - width: auto - float: right - td.oe_form_group_cell - text-align: right - padding: 0 - td.oe_form_group_cell_label - border: none - .oe_form_field - width: auto !important - .oe_form_subtotal_footer_separator - border-top: 1px solid #cacaca - font-size: 120% - font-weight: bold - label.oe_form_subtotal_footer_separator - font-weight: bold !important - padding: 2px 8px 2px 0px !important // }}} // FormView.layout {{{ .oe_form_invisible @@ -1577,7 +1570,7 @@ $colour4: #8a89ba .oe_form_group margin: 5px 0px 5px 0px // }}} - // FormView.binaryfile {{{ + // FormView.fields_binary {{{ /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image */ @@ -1636,26 +1629,23 @@ $colour4: #8a89ba padding: 0 4px 0 4px // }}} // FormView.progressbar {{{ - .oe_form - .oe_form_field_progressbar - display: inline-block - min-width: 70px - .oe_form_field_progressbar.ui-progressbar - height: 22px - font-size: 10px - @include box-sizing(border) - border: 1px solid #999 - @include radius(3px) - background: white - min-width: 50px - - span - position: absolute - margin-left: 10px - font-weight: bold - - .ui-widget-header - background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x + .oe_form_field_progressbar + display: inline-block + min-width: 70px + .oe_form_field_progressbar.ui-progressbar + height: 22px + font-size: 10px + @include box-sizing(border) + border: 1px solid #999 + @include radius(3px) + background: white + min-width: 50px + span + position: absolute + margin-left: 10px + font-weight: bold + .ui-widget-header + background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager -- cgit v1.2.3 From 3239a583c63276402bbae438ff5936174289e279 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 15:42:02 +0200 Subject: [IMP] sass form reorganisationa bzr revid: al@openerp.com-20120619134202-8ueuiytk6lrjrmm3 --- addons/web/static/src/css/base.css | 193 +++++++++++++++++------------------- addons/web/static/src/css/base.sass | 180 +++++++++++++++------------------ 2 files changed, 167 insertions(+), 206 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 f1211d2167c..985eba051d1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1603,13 +1603,13 @@ max-width: 700px; font-size: 125%; } +.openerp .oe_formview { + background: white; +} .openerp .oe_form_dropdown_section { position: relative; display: inline-block; } -.openerp .oe_formview { - background: white; -} .openerp .oe_form_invalid input, .openerp .oe_form_invalid select, .openerp .oe_form_invalid textarea { background-color: #ff6666 !important; border: 1px solid #dd0000 !important; @@ -1632,6 +1632,19 @@ .openerp .oe_form_button_save_dirty:hover { background: #ed6f6a; } +.openerp .oe_form_invisible { + display: none !important; +} +.openerp .oe_form_editable .oe_edit_only { + display: none !important; +} +.openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty { + display: none !important; +} +.openerp .oe_form_nosheet > *:not(.oe_form_topbar) { + margin-left: 10px !important; + margin-right: 10px !important; +} .openerp .oe_form header { position: relative; border-bottom: 1px solid #cacaca; @@ -1733,14 +1746,72 @@ -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); } -.openerp .oe_form_invisible { - display: none !important; +.openerp .oe_form td.oe_form_group_cell_label { + border-right: 1px solid #dddddd; + padding: 2px 0px 2px 0px; } -.openerp .oe_form_editable .oe_edit_only { - display: none !important; +.openerp .oe_form td.oe_form_group_cell_label label { + line-height: 18px; + display: block; + min-width: 120px; } -.openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty { - display: none !important; +.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { + padding-left: 8px; +} +.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { + font-weight: bold; + white-space: nowrap; + padding-right: 8px; +} +.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { + font-size: 80%; + color: darkGreen; + vertical-align: top; + position: relative; + top: -4px; + padding: 0 2px; +} +.openerp .oe_horizontal_border { + border-bottom: 1px solid black; +} +.openerp .oe_horizontal_separator { + font-weight: bold; + font-size: 20px; + margin: 20px 0px 10px 0px; + color: #aaaabb; +} +.openerp .oe_horizontal_separator:empty { + height: 5px; +} +.openerp .oe_vertical_separator { + border-left: 1px solid #666666; + padding: 0 4px 0 4px; +} +.openerp .oe_form_field_progressbar { + display: inline-block; + min-width: 70px; +} +.openerp .oe_form_field_progressbar.ui-progressbar { + height: 22px; + font-size: 10px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; + border: 1px solid #999999; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background: white; + min-width: 50px; +} +.openerp .oe_form_field_progressbar.ui-progressbar span { + position: absolute; + margin-left: 10px; + font-weight: bold; +} +.openerp .oe_form_field_progressbar.ui-progressbar .ui-widget-header { + background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; } .openerp .oe_form .oe_form_field_text { width: 100%; @@ -1770,35 +1841,6 @@ height: inherit !important; font-size: inherit; } -.openerp .oe_form_nosheet > *:not(.oe_form_topbar) { - margin-left: 10px !important; - margin-right: 10px !important; -} -.openerp .oe_form td.oe_form_group_cell_label { - border-right: 1px solid #dddddd; - padding: 2px 0px 2px 0px; -} -.openerp .oe_form td.oe_form_group_cell_label label { - line-height: 18px; - display: block; - min-width: 120px; -} -.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { - padding-left: 8px; -} -.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { - font-weight: bold; - white-space: nowrap; - padding-right: 8px; -} -.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { - font-size: 80%; - color: darkGreen; - vertical-align: top; - position: relative; - top: -4px; - padding: 0 2px; -} .openerp .oe_form .oe_form_field { width: 100%; display: inline-block; @@ -1820,18 +1862,11 @@ .openerp .oe_form .oe_form_field_datetime { width: 11em; } -.openerp .oe_form input[type="text"], -.openerp .oe_form input[type="password"], -.openerp .oe_form input[type="file"], -.openerp .oe_form select { +.openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select { height: 22px; padding-top: 2px; } -.openerp .oe_form input[type="text"], -.openerp .oe_form input[type="password"], -.openerp .oe_form input[type="file"], -.openerp .oe_form select, -.openerp .oe_form textarea { +.openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select, .openerp .oe_form textarea { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; @@ -1840,11 +1875,7 @@ min-width: 70px; color: #1f1f1f; } -.openerp .oe_form input[readonly], -.openerp .oe_form select[readonly], -.openerp .oe_form textarea[readonly], -.openerp .oe_form input[disabled], -.openerp .oe_form select[disabled] { +.openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] { background: #e5e5e5 !important; color: #666666; } @@ -1859,10 +1890,7 @@ -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 { +.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; @@ -2006,47 +2034,13 @@ .openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls { display: block; } -.openerp .oe_horizontal_border { - border-bottom: 1px solid black; -} -.openerp .oe_horizontal_separator { - font-weight: bold; - font-size: 20px; - margin: 20px 0px 10px 0px; - color: #aaaabb; -} -.openerp .oe_horizontal_separator:empty { - height: 5px; -} -.openerp .oe_vertical_separator { - border-left: 1px solid #666666; - padding: 0 4px 0 4px; -} -.openerp .oe_form_field_progressbar { - display: inline-block; - min-width: 70px; -} -.openerp .oe_form_field_progressbar.ui-progressbar { - height: 22px; - font-size: 10px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - border: 1px solid #999999; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background: white; - min-width: 50px; +.openerp .oe_form_field_many2one td:first-child { + position: relative; } -.openerp .oe_form_field_progressbar.ui-progressbar span { +.openerp .oe_form_field_many2one span.oe-m2o-drop-down-button { position: absolute; - margin-left: 10px; - font-weight: bold; -} -.openerp .oe_form_field_progressbar.ui-progressbar .ui-widget-header { - background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; + top: 3px; + right: 2px; } .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; @@ -2255,12 +2249,3 @@ .kitten-mode-activated > * { opacity: 0.7; } - -.openerp .oe_form_field_many2one td:first-child { - position: relative; -} -.openerp .oe_form_field_many2one span.oe-m2o-drop-down-button { - position: absolute; - top: 3px; - right: 2px; -} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 89f149b378b..eb442256f36 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -401,7 +401,6 @@ $colour4: #8a89ba @include vertical-gradient(#f0f0fa, #eeeef6) @include box-shadow(none) // }}} - // Loading {{{ .oe_loading display: none @@ -1282,12 +1281,12 @@ $colour4: #8a89ba max-width: 700px font-size: 125% // }}} - // FormView.body {{{ + // FormView.base and dynamic tags {{{ + .oe_formview + background: white .oe_form_dropdown_section position: relative display: inline-block - .oe_formview - background: white .oe_form_invalid input, select, textarea background-color: #F66 !important @@ -1300,6 +1299,16 @@ $colour4: #8a89ba font-weight: bold &:hover background: #ED6F6A + .oe_form_invisible + display: none !important + .oe_form_editable .oe_edit_only + display: none !important + .oe_form_readonly + .oe_edit_only, .oe_form_field:empty + display: none !important + .oe_form_nosheet > *:not(.oe_form_topbar) + margin-left: 10px !important + margin-right: 10px !important // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1379,43 +1388,7 @@ $colour4: #8a89ba border: 1px solid #afafb6 @include box-shadow(0 0 10px rgba(0,0,0,0.3)) // }}} - // FormView.layout {{{ - .oe_form_invisible - display: none !important - .oe_form_editable .oe_edit_only - display: none !important - .oe_form_readonly - .oe_edit_only, .oe_form_field:empty - display: none !important - .oe_form - .oe_form_field_text - width: 100% - - .oe_form_field_char input, - .oe_form_field_url input, - .oe_form_field_text textarea, - .oe_form_field_selection select - width: inherit - .oe_form_sheet textarea - width: 500px - .oe_form_field_float input - width: 100px - - h1 .oe_form_field_float input - width: 140px - - h2 .oe_form_field_float input - width: 120px - - h1, h2, h3, h4, h5, h6 - margin: 0 0 4px 0 - input - height: inherit !important - font-size: inherit - .oe_form_nosheet > *:not(.oe_form_topbar) - margin-left: 10px !important - margin-right: 10px !important - + // FormView.group {{{ .oe_form td.oe_form_group_cell_label border-right: 1px solid #ddd @@ -1442,8 +1415,61 @@ $colour4: #8a89ba top: -4px padding: 0 2px // }}} + // FormView.separator {{{ + .oe_horizontal_border + border-bottom: 1px solid black + .oe_horizontal_separator + font-weight: bold + font-size: 20px + margin: 20px 0px 10px 0px + color: #aab + .oe_horizontal_separator:empty + height: 5px + .oe_vertical_separator + border-left: 1px solid #666 + padding: 0 4px 0 4px + // }}} + // FormView.progressbar {{{ + .oe_form_field_progressbar + display: inline-block + min-width: 70px + .oe_form_field_progressbar.ui-progressbar + height: 22px + font-size: 10px + @include box-sizing(border) + border: 1px solid #999 + @include radius(3px) + background: white + min-width: 50px + span + position: absolute + margin-left: 10px + font-weight: bold + .ui-widget-header + background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x + // }}} // FormView.fields {{{ .oe_form + .oe_form_field_text + width: 100% + .oe_form_field_char input, + .oe_form_field_url input, + .oe_form_field_text textarea, + .oe_form_field_selection select + width: inherit + .oe_form_sheet textarea + width: 500px + .oe_form_field_float input + width: 100px + h1 .oe_form_field_float input + width: 140px + h2 .oe_form_field_float input + width: 120px + h1, h2, h3, h4, h5, h6 + margin: 0 0 4px 0 + input + height: inherit !important + font-size: inherit .oe_form_field width: 100% display: inline-block @@ -1459,26 +1485,15 @@ $colour4: #8a89ba width: 7em .oe_form_field_datetime width: 11em - input[type="text"], - input[type="password"], - input[type="file"], - select + input[type="text"], input[type="password"], input[type="file"], select height: 22px padding-top: 2px - input[type="text"], - input[type="password"], - input[type="file"], - select, - textarea + input[type="text"], input[type="password"], input[type="file"], select, textarea @include box-sizing(border) background: white min-width: 70px color: #1f1f1f - input[readonly], - select[readonly], - textarea[readonly], - input[disabled], - select[disabled] + input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled] background: #E5E5E5 !important color: #666 textarea[disabled] @@ -1487,10 +1502,7 @@ $colour4: #8a89ba 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 + .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 @@ -1558,7 +1570,6 @@ $colour4: #8a89ba > div position: relative overflow: hidden - .oe_form_title width: 55% .oe_form_title:after @@ -1614,38 +1625,14 @@ $colour4: #8a89ba &:hover .oe_form_field_image_controls display: block // }}} - // FormView.separator {{{ - .oe_horizontal_border - border-bottom: 1px solid black - .oe_horizontal_separator - font-weight: bold - font-size: 20px - margin: 20px 0px 10px 0px - color: #aab - .oe_horizontal_separator:empty - height: 5px - .oe_vertical_separator - border-left: 1px solid #666 - padding: 0 4px 0 4px - // }}} - // FormView.progressbar {{{ - .oe_form_field_progressbar - display: inline-block - min-width: 70px - .oe_form_field_progressbar.ui-progressbar - height: 22px - font-size: 10px - @include box-sizing(border) - border: 1px solid #999 - @include radius(3px) - background: white - min-width: 50px - span + // FormView.many2one {{{ + .oe_form_field_many2one + td:first-child + position: relative + span.oe-m2o-drop-down-button position: absolute - margin-left: 10px - font-weight: bold - .ui-widget-header - background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x + top: 3px + right: 2px // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager @@ -1769,7 +1756,6 @@ $colour4: #8a89ba .oe_view_editor tr:hover background-color: #ecebf2 // }}} - // Debugging stuff {{{ .oe_layout_debugging .oe_form_group @@ -1812,16 +1798,6 @@ $colour4: #8a89ba >* opacity: 0.70 // }}} -// Transitional overrides for old styles {{{ -.openerp - .oe_form_field_many2one - td:first-child - position: relative - span.oe-m2o-drop-down-button - position: absolute - top: 3px - right: 2px -// }}} // 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 57edcce3a0a58b6ea4c5b06a66e266d2cfa01756 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 15:51:15 +0200 Subject: fix tabs form cleanups bzr revid: al@openerp.com-20120619135115-2c559uf6lega2v6c --- addons/web/static/src/css/base.sass | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index eb442256f36..beebd5b2e5f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -194,8 +194,6 @@ $colour4: #8a89ba width: auto a.ui-state-active background: #f0f0fa - .ui-tabs - margin: 0 -16px // }}} // Generic classes {{{ .oe_i @@ -1325,6 +1323,14 @@ $colour4: #8a89ba min-width: 650px max-width: 960px margin: 0 auto + .oe_form_title + width: 55% + .oe_form_title:after + content: "." + display: block + height: 0 + clear: both + visibility: hidden ul.oe_form_steps height: 30px padding: 0 @@ -1387,6 +1393,8 @@ $colour4: #8a89ba padding: 16px border: 1px solid #afafb6 @include box-shadow(0 0 10px rgba(0,0,0,0.3)) + .ui-tabs + margin: 0 -16px // }}} // FormView.group {{{ .oe_form @@ -1399,7 +1407,8 @@ $colour4: #8a89ba min-width: 120px td.oe_form_group_cell + .oe_form_group_cell padding-left: 8px - + .oe_form_group + margin: 5px 0px 5px 0px // }}} // FormView.label {{{ .oe_form @@ -1570,16 +1579,6 @@ $colour4: #8a89ba > div position: relative overflow: hidden - .oe_form_title - width: 55% - .oe_form_title:after - content: "." - display: block - height: 0 - clear: both - visibility: hidden - .oe_form_group - margin: 5px 0px 5px 0px // }}} // FormView.fields_binary {{{ /* http://www.quirksmode.org/dom/inputfile.html -- cgit v1.2.3 From 69363d82889fceac121a5ce62a72ee3a94102153 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 19 Jun 2012 15:53:57 +0200 Subject: fixed tabs flickering and margin bzr revid: mit@openerp.com-20120619135357-5wa1ywcvqh90086j --- addons/web/static/src/css/base.css | 37 ++++++++++++++++++------------------- addons/web/static/src/css/base.sass | 3 +-- 2 files changed, 19 insertions(+), 21 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 985eba051d1..23f91aec952 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"); @@ -182,9 +182,6 @@ .openerp .ui-menu .ui-menu-item a.ui-state-active { background: #f0f0fa; } -.openerp .ui-tabs { - margin: 0 -16px; -} .openerp .oe_i { font-family: "mnmliconsRegular" !important; font-size: 21px; @@ -302,7 +299,7 @@ } .openerp .oe_notebook { margin: 8px 0; - padding: 0 8px; + padding: 0 16px; list-style: none; zoom: 1; } @@ -328,7 +325,6 @@ } .openerp .oe_notebook > li { position: relative; - margin-bottom: -1px; } .openerp .oe_notebook > li > a { padding: 0 12px; @@ -1667,6 +1663,16 @@ max-width: 960px; margin: 0 auto; } +.openerp .oe_form_title { + width: 55%; +} +.openerp .oe_form_title:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} .openerp ul.oe_form_steps { height: 30px; padding: 0; @@ -1746,6 +1752,9 @@ -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); } +.openerp .oe_application .oe_form_sheet .ui-tabs { + margin: 0 -16px; +} .openerp .oe_form td.oe_form_group_cell_label { border-right: 1px solid #dddddd; padding: 2px 0px 2px 0px; @@ -1758,6 +1767,9 @@ .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding-left: 8px; } +.openerp .oe_form .oe_form_group { + margin: 5px 0px 5px 0px; +} .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; white-space: nowrap; @@ -1976,19 +1988,6 @@ position: relative; overflow: hidden; } -.openerp .oe_form .oe_form_title { - width: 55%; -} -.openerp .oe_form .oe_form_title:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} -.openerp .oe_form .oe_form_group { - margin: 5px 0px 5px 0px; -} .openerp .oe_hidden_input_file { overflow: hidden; position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index beebd5b2e5f..b63995b3e87 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -268,7 +268,7 @@ $colour4: #8a89ba // Notebook {{{ .oe_notebook margin: 8px 0 - padding: 0 8px + padding: 0 16px list-style: none zoom: 1 .oe_notebook:before, .oe_notebook:after @@ -288,7 +288,6 @@ $colour4: #8a89ba border-width: 0 0 1px .oe_notebook > li position: relative - margin-bottom: -1px .oe_notebook > li > a padding: 0 12px margin-right: 2px -- cgit v1.2.3 From 1ca85cf20e60ca9efa802789c28ffe74d7e4659b Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 16:07:24 +0200 Subject: fix groups bzr revid: al@openerp.com-20120619140724-2k5pxakw99emft7y --- addons/web/static/src/css/base.css | 3 ++- addons/web/static/src/css/base.sass | 1 + 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 23f91aec952..dc211a93c36 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"); @@ -1768,6 +1768,7 @@ padding-left: 8px; } .openerp .oe_form .oe_form_group { + width: 100%; margin: 5px 0px 5px 0px; } .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b63995b3e87..f0d0c4ba155 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1407,6 +1407,7 @@ $colour4: #8a89ba td.oe_form_group_cell + .oe_form_group_cell padding-left: 8px .oe_form_group + width: 100% margin: 5px 0px 5px 0px // }}} // FormView.label {{{ -- cgit v1.2.3 From 2f2dcd29d0c37cd7bc80b7ce4c622fd3510e18eb Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 16:21:09 +0200 Subject: fix notebook in sheet bzr revid: al@openerp.com-20120619142109-9q269mjhus62ads6 --- addons/web/static/src/css/base.css | 7 +++++-- addons/web/static/src/css/base.sass | 6 ++++-- 2 files changed, 9 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 dc211a93c36..024ecbbb965 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1755,6 +1755,9 @@ .openerp .oe_application .oe_form_sheet .ui-tabs { margin: 0 -16px; } +.openerp .oe_application .oe_form_sheet .oe_notebook_page { + padding: 0 16px; +} .openerp .oe_form td.oe_form_group_cell_label { border-right: 1px solid #dddddd; padding: 2px 0px 2px 0px; @@ -1769,7 +1772,7 @@ } .openerp .oe_form .oe_form_group { width: 100%; - margin: 5px 0px 5px 0px; + margin: 4px 0 4px 0; } .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; @@ -1790,7 +1793,7 @@ .openerp .oe_horizontal_separator { font-weight: bold; font-size: 20px; - margin: 20px 0px 10px 0px; + margin: 8px 0px 8px 0px; color: #aaaabb; } .openerp .oe_horizontal_separator:empty { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f0d0c4ba155..1d092ef041e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1394,6 +1394,8 @@ $colour4: #8a89ba @include box-shadow(0 0 10px rgba(0,0,0,0.3)) .ui-tabs margin: 0 -16px + .oe_notebook_page + padding: 0 16px // }}} // FormView.group {{{ .oe_form @@ -1408,7 +1410,7 @@ $colour4: #8a89ba padding-left: 8px .oe_form_group width: 100% - margin: 5px 0px 5px 0px + margin: 4px 0 4px 0 // }}} // FormView.label {{{ .oe_form @@ -1430,7 +1432,7 @@ $colour4: #8a89ba .oe_horizontal_separator font-weight: bold font-size: 20px - margin: 20px 0px 10px 0px + margin: 8px 0px 8px 0px color: #aab .oe_horizontal_separator:empty height: 5px -- cgit v1.2.3 From 944a5bee47550874bf28d67831248cce11f5da74 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 18:18:42 +0200 Subject: [FIX] no sheet header bzr revid: al@openerp.com-20120619161842-xf5xki44bb91njvy --- 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 024ecbbb965..8a2f1169e0a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1637,7 +1637,7 @@ .openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty { display: none !important; } -.openerp .oe_form_nosheet > *:not(.oe_form_topbar) { +.openerp .oe_form_nosheet > *:not(header) { margin-left: 10px !important; margin-right: 10px !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1d092ef041e..5eb61ac5f9e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1303,7 +1303,7 @@ $colour4: #8a89ba .oe_form_readonly .oe_edit_only, .oe_form_field:empty display: none !important - .oe_form_nosheet > *:not(.oe_form_topbar) + .oe_form_nosheet > *:not(header) margin-left: 10px !important margin-right: 10px !important // }}} -- cgit v1.2.3 From c005a6a2ba7a2700dbde43e050e1c728704c5737 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 19 Jun 2012 22:55:30 +0200 Subject: [WIP] UserMenu cropdown bzr revid: fme@openerp.com-20120619205530-t0uuaerrspja3084 --- addons/web/static/src/css/base.css | 200 +++++++++++++----------------------- addons/web/static/src/css/base.sass | 139 +++++++++---------------- 2 files changed, 118 insertions(+), 221 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 13f04ab6593..a2682b5c85b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -359,6 +359,33 @@ .openerp .ui-tabs-hide { display: none; } +.openerp .oe_cropdown, .openerp .oe_cropdown_hover, .openerp .oe_cropdown_toggle { + position: relative; + cursor: pointer; +} +.openerp .oe_cropdown_hover:hover .oe_cropdown_menu, .openerp .oe_cropdown_menu.oe_opened { + display: block; +} +.openerp .oe_cropdown_menu { + display: none; + position: absolute; + z-index: 1; +} +.openerp .oe_cropdown_arrow:after { + width: 0; + height: 0; + display: inline-block; + content: "&darr"; + text-indent: -99999px; + vertical-align: top; + margin-top: 8px; + margin-left: 4px; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top-color: #404040; + filter: alpha(opacity=50); + opacity: 0.5; +} .openerp .oe_dropdown_toggle:after { width: 0; height: 0; @@ -373,7 +400,6 @@ opacity: 0.5; margin-top: 7px; margin-left: 6px; - border-top-color: #404040; } .openerp .oe_dropdown_menu { display: none; @@ -717,20 +743,45 @@ .openerp .oe_topbar .oe_topbar_avatar { vertical-align: top; } -.openerp .oe_topbar .oe_dropdown_toggle:after { - width: 0; - height: 0; - display: inline-block; - content: "&darr"; - text-indent: -99999px; - vertical-align: top; - margin-top: 8px; - margin-left: 4px; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid white; - filter: alpha(opacity=50); - opacity: 0.5; +.openerp .oe_topbar .oe_cropdown_menu { + background: #333333; + background: rgba(37, 37, 37, 0.9); + padding: 6px 0; + border-color: #999999; + border-color: rgba(0, 0, 0, 0.2); + border-style: solid; + border-width: 0 1px 1px; + -moz-border-radius: 0 0 6px 6px; + -webkit-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + -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); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; +} +.openerp .oe_topbar .oe_cropdown_menu li { + float: none; + display: block; +} +.openerp .oe_topbar .oe_cropdown_menu li a { + white-space: nowrap; + display: block; + padding: 4px 15px; + color: #eeeeee; +} +.openerp .oe_topbar .oe_cropdown_menu li a:hover { + background-color: #292929; + background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); + background-image: -webkit-linear-gradient(top, #292929, #191919); + background-image: -moz-linear-gradient(top, #292929, #191919); + background-image: -ms-linear-gradient(top, #292929, #191919); + background-image: -o-linear-gradient(top, #292929, #191919); + background-image: linear-gradient(to bottom, #292929, #191919); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; } .openerp .oe_leftbar { display: none; @@ -779,66 +830,11 @@ list-style-type: none; float: left; } -.openerp .oe_user_menu .oe_dropdown { - position: relative; +.openerp .oe_user_menu.oe_cropdown_toggle:after, .openerp .oe_user_menu .oe_cropdown_toggle:after { + border-top: 4px solid white; } -.openerp .oe_user_menu .oe_dropdown_options { - float: left; - background: #333333; - background: rgba(37, 37, 37, 0.9); - display: none; - position: absolute; - top: 32px; +.openerp .oe_user_menu .oe_cropdown_menu { right: -1px; - border: 0; - z-index: 900; - margin-left: 0; - margin-right: 0; - padding: 6px 0; - zoom: 1; - border-color: #999999; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 0 1px 1px; - -moz-border-radius: 0 0 6px 6px; - -webkit-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -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); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.openerp .oe_user_menu .oe_dropdown_options li { - float: none; - display: block; - background-color: none; -} -.openerp .oe_user_menu .oe_dropdown_options li a { - white-space: nowrap; - display: block; - padding: 4px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #eeeeee; -} -.openerp .oe_user_menu .oe_dropdown_options li a:hover { - background-color: #292929; - background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); - background-image: -webkit-linear-gradient(top, #292929, #191919); - background-image: -moz-linear-gradient(top, #292929, #191919); - background-image: -ms-linear-gradient(top, #292929, #191919); - background-image: -o-linear-gradient(top, #292929, #191919); - background-image: linear-gradient(to bottom, #292929, #191919); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} -.openerp .oe_user_menu .oe_dropdown_options li hr { - border-top: 1px solid #999999; - border-bottom: 0; } .openerp .oe_systray > div { float: left; @@ -847,61 +843,6 @@ .openerp .oe_systray { float: right; } -.openerp .oe_systray .oe_systray_dropdown { - position: relative; -} -.openerp .oe_systray .oe_systray_dropdown:hover .oe_systray_dropdown_options { - display: block; -} -.openerp .oe_systray .oe_systray_dropdown_options { - background: #333333; - background: rgba(37, 37, 37, 0.9); - display: none; - position: absolute; - z-index: 900; - border: 0; - margin-left: 0; - margin-right: 0; - padding: 6px 0; - border-color: #999999; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 0 1px 1px; - -moz-border-radius: 0 0 6px 6px; - -webkit-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -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); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.openerp .oe_systray .oe_systray_dropdown_options li { - float: none; - display: block; - background-color: none; -} -.openerp .oe_systray .oe_systray_dropdown_options li a { - display: block; - padding: 4px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #eeeeee; -} -.openerp .oe_systray .oe_systray_dropdown_options li a:hover { - background-color: #292929; - background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); - background-image: -webkit-linear-gradient(top, #292929, #191919); - background-image: -moz-linear-gradient(top, #292929, #191919); - background-image: -ms-linear-gradient(top, #292929, #191919); - background-image: -o-linear-gradient(top, #292929, #191919); - background-image: linear-gradient(to bottom, #292929, #191919); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} .openerp .oe_menu { float: left; padding: 0; @@ -1811,9 +1752,6 @@ top: -4px; padding: 0 2px; } -.openerp .oe_form .oe_form_field_text textarea { - resize: none; -} .openerp .oe_form .oe_form_field { width: 100%; display: inline-block; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5d91ed64a1d..bc15c9a840a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -314,6 +314,30 @@ $colour4: #8a89ba display: none // }}} // Dropdown {{{ + .oe_cropdown, .oe_cropdown_hover, .oe_cropdown_toggle + position: relative + cursor: pointer + .oe_cropdown_hover:hover .oe_cropdown_menu, .oe_cropdown_menu.oe_opened + display: block + .oe_cropdown_menu + display: none + position: absolute + z-index: 1 + .oe_cropdown_arrow:after + width: 0 + height: 0 + display: inline-block + content: "&darr" + text-indent: -99999px + vertical-align: top + margin-top: 8px + margin-left: 4px + border-left: 4px solid transparent + border-right: 4px solid transparent + border-top-color: #404040 + @include opacity(0.5) + + .oe_dropdown_toggle:after width: 0 height: 0 @@ -327,7 +351,6 @@ $colour4: #8a89ba @include opacity(0.5) margin-top: 7px margin-left: 6px - border-top-color: #404040 .oe_dropdown_menu display: none position: absolute @@ -580,19 +603,28 @@ $colour4: #8a89ba @include radius(3px) .oe_topbar_avatar vertical-align: top - .oe_dropdown_toggle:after - width: 0 - height: 0 - display: inline-block - content: "&darr" - text-indent: -99999px - vertical-align: top - margin-top: 8px - margin-left: 4px - border-left: 4px solid transparent - border-right: 4px solid transparent - border-top: 4px solid white - @include opacity(0.5) + .oe_cropdown_menu + background: #333 + background: rgba(37,37,37,0.9) + padding: 6px 0 + border-color: #999 + border-color: rgba(0, 0, 0, 0.2) + border-style: solid + border-width: 0 1px 1px + @include radius(0 0 6px 6px) + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + @include background-clip() + li + float: none + display: block + a + white-space: nowrap + display: block + padding: 4px 15px + color: #eee + &:hover + @include vertical-gradient(#292929, #191919) + @include box-shadow(none) // }}} // Webclient.leftbar {{{ .oe_leftbar @@ -636,48 +668,10 @@ $colour4: #8a89ba li list-style-type: none float: left - .oe_dropdown - position: relative - - .oe_dropdown_options - float: left - background: #333 - background: rgba(37,37,37,0.9) - display: none - position: absolute - top: 32px + &.oe_cropdown_toggle:after, .oe_cropdown_toggle:after + border-top: 4px solid white + .oe_cropdown_menu right: -1px - border: 0 - z-index: 900 - margin-left: 0 - margin-right: 0 - padding: 6px 0 - zoom: 1 - border-color: #999 - border-color: rgba(0, 0, 0, 0.2) - border-style: solid - border-width: 0 1px 1px - @include radius(0 0 6px 6px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - @include background-clip() - li - float: none - display: block - background-color: none - a - white-space: nowrap - display: block - padding: 4px 15px - clear: both - font-weight: normal - line-height: 18px - color: #eee - &:hover - @include vertical-gradient(#292929, #191919) - @include box-shadow(none) - hr - border-top: 1px solid #999 - border-bottom: 0 // }}} // Systray {{{ .oe_systray > div @@ -686,41 +680,6 @@ $colour4: #8a89ba .oe_systray float: right - .oe_systray_dropdown - position: relative - .oe_systray_dropdown:hover .oe_systray_dropdown_options - display: block - .oe_systray_dropdown_options - background: #333 - background: rgba(37,37,37,0.9) - display: none - position: absolute - z-index: 900 - border: 0 - margin-left: 0 - margin-right: 0 - padding: 6px 0 - border-color: #999 - border-color: rgba(0, 0, 0, 0.2) - border-style: solid - border-width: 0 1px 1px - @include radius(0 0 6px 6px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - @include background-clip() - li - float: none - display: block - background-color: none - a - display: block - padding: 4px 15px - clear: both - font-weight: normal - line-height: 18px - color: #eee - &:hover - @include vertical-gradient(#292929, #191919) - @include box-shadow(none) // }}} // Menu {{{ .oe_menu -- cgit v1.2.3 From da09aec9ca73b6e4e2f9c9563c902d3d6ca06fa8 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 19 Jun 2012 23:22:12 +0200 Subject: [WIP] Update Menu [More...] bzr revid: fme@openerp.com-20120619212212-k2yl19h2x1oan1o6 --- addons/web/static/src/css/base.css | 24 +++--------------------- addons/web/static/src/css/base.sass | 18 ++---------------- 2 files changed, 5 insertions(+), 37 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 a2682b5c85b..c094c1adc6b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -743,6 +743,9 @@ .openerp .oe_topbar .oe_topbar_avatar { vertical-align: top; } +.openerp .oe_topbar .oe_cropdown_toggle:after { + border-top: 4px solid white; +} .openerp .oe_topbar .oe_cropdown_menu { background: #333333; background: rgba(37, 37, 37, 0.9); @@ -830,9 +833,6 @@ list-style-type: none; float: left; } -.openerp .oe_user_menu.oe_cropdown_toggle:after, .openerp .oe_user_menu .oe_cropdown_toggle:after { - border-top: 4px solid white; -} .openerp .oe_user_menu .oe_cropdown_menu { right: -1px; } @@ -875,24 +875,6 @@ -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } -.openerp .oe_menu_more_container { - position: relative; -} -.openerp .oe_menu_more_container .oe_menu_more { - position: absolute; - padding: 0; - background-color: #646060; - z-index: 1; - border: 1px solid black; - border-bottom-left-radius: 5px; - border-bottom-right-radius: 5px; -} -.openerp .oe_menu_more_container .oe_menu_more li { - float: none; -} -.openerp .oe_menu_more_container .oe_menu_more li a { - white-space: nowrap; -} .openerp .oe_secondary_menu_section { font-weight: bold; margin-left: 8px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index bc15c9a840a..c8751a65e1e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -603,6 +603,8 @@ $colour4: #8a89ba @include radius(3px) .oe_topbar_avatar vertical-align: top + .oe_cropdown_toggle:after + border-top: 4px solid white .oe_cropdown_menu background: #333 background: rgba(37,37,37,0.9) @@ -668,8 +670,6 @@ $colour4: #8a89ba li list-style-type: none float: left - &.oe_cropdown_toggle:after, .oe_cropdown_toggle:after - border-top: 4px solid white .oe_cropdown_menu right: -1px // }}} @@ -705,20 +705,6 @@ $colour4: #8a89ba font-weight: bold color: white @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) - .oe_menu_more_container - position: relative - .oe_menu_more - position: absolute - padding: 0 - background-color: #646060 - z-index: 1 - border: 1px solid black - border-bottom-left-radius: 5px - border-bottom-right-radius: 5px - li - float: none - a - white-space: nowrap .oe_secondary_menu_section font-weight: bold margin-left: 8px -- cgit v1.2.3 From 590937d49a802f4565daa712f1e0d63c96b0bf6b Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 20 Jun 2012 11:45:20 +0200 Subject: [FIX] listview sass bzr revid: al@openerp.com-20120620094520-4051lhn04rpx3di1 --- addons/web/static/src/css/base.sass | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5eb61ac5f9e..82e6a39961d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1664,7 +1664,6 @@ $colour4: #8a89ba .oe-listview-content width: 100% td:first-child, th:first-child - width: 17px &:after border-width: 0 > thead -- cgit v1.2.3 From 135be629b12625323ed73d7622ee5eb04f361e13 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 20 Jun 2012 12:21:26 +0200 Subject: [FIX] Sidebar dropdown bzr revid: fme@openerp.com-20120620102126-nax3dlhuj9ja2x2w --- addons/web/static/src/css/base.css | 145 ++++++++++++++---------------------- addons/web/static/src/css/base.sass | 142 ++++++++++++++--------------------- 2 files changed, 110 insertions(+), 177 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 c094c1adc6b..6bc652ecab7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -367,52 +367,15 @@ display: block; } .openerp .oe_cropdown_menu { - display: none; - position: absolute; - z-index: 1; -} -.openerp .oe_cropdown_arrow:after { - width: 0; - height: 0; - display: inline-block; - content: "&darr"; - text-indent: -99999px; - vertical-align: top; - margin-top: 8px; - margin-left: 4px; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top-color: #404040; - filter: alpha(opacity=50); - opacity: 0.5; -} -.openerp .oe_dropdown_toggle:after { - width: 0; - height: 0; - display: inline-block; - content: "&darr"; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid white; - filter: alpha(opacity=50); - opacity: 0.5; - margin-top: 7px; - margin-left: 6px; -} -.openerp .oe_dropdown_menu { display: none; position: absolute; top: 28px; - left: 0px; - padding: 8px; + z-index: 1; border: 1px solid #afafb6; + background: white; + padding: 8px; min-width: 120px; - overflow-x: hidden; - z-index: 900; text-align: left; - background: white; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -420,14 +383,13 @@ -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_dropdown_menu li { - position: relative; +.openerp .oe_cropdown_menu li { list-style-type: none; float: none; display: block; - background-color: none; + position: relative; } -.openerp .oe_dropdown_menu li:hover { +.openerp .oe_cropdown_menu li:hover { background-color: #f0f0fa; background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); @@ -439,64 +401,47 @@ -webkit-box-shadow: none; box-shadow: none; } -.openerp .oe_dropdown_menu li a { +.openerp .oe_cropdown_menu li a { + white-space: nowrap; display: block; padding: 3px 6px; - clear: both; - font-weight: normal; - line-height: 14px; color: #4c4c4c; text-decoration: none; - cursor: pointer; -} -.openerp .oe_dropdown_menu li a:hover { - text-decoration: none; -} -.openerp .oe_dropdown_menu li .oe_sidebar_delete_item { - position: absolute; - bottom: 1px; - right: 4px; - display: none; - 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_dropdown_menu li .oe_sidebar_delete_item:hover { +.openerp .oe_cropdown_menu li a: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_dropdown_menu li:hover .oe_sidebar_delete_item { +.openerp .oe_cropdown_arrow:after { + width: 0; + height: 0; display: inline-block; + content: "&darr"; + text-indent: -99999px; + vertical-align: top; + margin-top: 8px; + margin-left: 4px; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #404040; + filter: alpha(opacity=50); + opacity: 0.5; } .openerp .oe_sidebar { white-space: nowrap; } -.openerp .oe_sidebar .oe_dropdown_menu li { - padding-right: 16px; -} -.openerp .oe_sidebar .oe_sidebar_add_attachment { +.openerp .oe_sidebar .oe_cropdown_menu .oe_sidebar_add_attachment { + height: 20px; cursor: pointer; padding-left: 6px; margin-top: 6px; } -.openerp .oe_sidebar .oe_sidebar_add_attachment span { +.openerp .oe_sidebar .oe_cropdown_menu .oe_sidebar_add_attachment span { font-weight: bold; } -.openerp .oe_sidebar .oe_sidebar_add_attachment .oe_hidden_input_file { +.openerp .oe_sidebar .oe_cropdown_menu .oe_sidebar_add_attachment .oe_hidden_input_file { width: 200px; } -.openerp .oe_sidebar .oe_sidebar_add_attachment:hover { +.openerp .oe_sidebar .oe_cropdown_menu .oe_sidebar_add_attachment:hover { background-color: #f0f0fa; background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); @@ -508,6 +453,32 @@ -webkit-box-shadow: none; box-shadow: none; } +.openerp .oe_sidebar .oe_cropdown_menu li .oe_sidebar_delete_item { + position: absolute; + top: 4px; + right: 4px; + display: none; + width: 12px; + height: 12px; + padding: 1px; + color: #8786b7; + line-height: 8px; + text-align: center; + font-weight: bold; + text-shadow: 0 1px 1px white; +} +.openerp .oe_sidebar .oe_cropdown_menu li .oe_sidebar_delete_item: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_sidebar .oe_cropdown_menu li:hover .oe_sidebar_delete_item { + display: inline-block; +} .openerp .oe_loading { display: none; z-index: 100; @@ -743,13 +714,12 @@ .openerp .oe_topbar .oe_topbar_avatar { vertical-align: top; } -.openerp .oe_topbar .oe_cropdown_toggle:after { +.openerp .oe_topbar .oe_cropdown_arrow:after { border-top: 4px solid white; } .openerp .oe_topbar .oe_cropdown_menu { background: #333333; background: rgba(37, 37, 37, 0.9); - padding: 6px 0; border-color: #999999; border-color: rgba(0, 0, 0, 0.2); border-style: solid; @@ -757,21 +727,14 @@ -moz-border-radius: 0 0 6px 6px; -webkit-border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px; - -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); -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; } .openerp .oe_topbar .oe_cropdown_menu li { float: none; - display: block; } .openerp .oe_topbar .oe_cropdown_menu li a { - white-space: nowrap; - display: block; - padding: 4px 15px; color: #eeeeee; } .openerp .oe_topbar .oe_cropdown_menu li a:hover { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c8751a65e1e..dee67590e07 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -320,109 +320,85 @@ $colour4: #8a89ba .oe_cropdown_hover:hover .oe_cropdown_menu, .oe_cropdown_menu.oe_opened display: block .oe_cropdown_menu - display: none - position: absolute - z-index: 1 - .oe_cropdown_arrow:after - width: 0 - height: 0 - display: inline-block - content: "&darr" - text-indent: -99999px - vertical-align: top - margin-top: 8px - margin-left: 4px - border-left: 4px solid transparent - border-right: 4px solid transparent - border-top-color: #404040 - @include opacity(0.5) - - - .oe_dropdown_toggle:after - width: 0 - height: 0 - display: inline-block - content: "&darr" - text-indent: -99999px - vertical-align: top - border-left: 4px solid transparent - border-right: 4px solid transparent - border-top: 4px solid white - @include opacity(0.5) - margin-top: 7px - margin-left: 6px - .oe_dropdown_menu display: none position: absolute top: 28px - left: 0px - padding: 8px + z-index: 1 border: 1px solid #afafb6 + background: white + padding: 8px min-width: 120px - overflow-x: hidden - z-index: 900 text-align: left - background: white @include radius(3px) @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) li &:hover @include vertical-gradient(#f0f0fa, #eeeef6) @include box-shadow(none) - position: relative list-style-type: none float: none display: block - background-color: none + position: relative a + white-space: nowrap display: block padding: 3px 6px - clear: both - font-weight: normal - line-height: 14px color: #4c4c4c text-decoration: none - cursor: pointer - &:hover - text-decoration: none - .oe_sidebar_delete_item - position: absolute - bottom: 1px - right: 4px - display: none - 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) - &:hover - .oe_sidebar_delete_item - display: inline-block + .oe_cropdown_arrow:after + width: 0 + height: 0 + display: inline-block + content: "&darr" + text-indent: -99999px + vertical-align: top + margin-top: 8px + margin-left: 4px + border-left: 4px solid transparent + border-right: 4px solid transparent + border-top: 4px solid#404040 + @include opacity(0.5) + .oe_sidebar white-space: nowrap - .oe_dropdown_menu li - padding-right: 16px - .oe_sidebar_add_attachment - cursor: pointer - padding-left: 6px - margin-top: 6px - span - font-weight: bold - .oe_hidden_input_file - width: 200px - &:hover - @include vertical-gradient(#f0f0fa, #eeeef6) - @include box-shadow(none) + .oe_cropdown_menu + .oe_sidebar_add_attachment + height: 20px + cursor: pointer + padding-left: 6px + margin-top: 6px + span + font-weight: bold + .oe_hidden_input_file + width: 200px + &:hover + @include vertical-gradient(#f0f0fa, #eeeef6) + @include box-shadow(none) + li + .oe_sidebar_delete_item + position: absolute + top: 4px + right: 4px + display: none + width: 12px + 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) + &:hover + .oe_sidebar_delete_item + display: inline-block // }}} // Loading {{{ @@ -603,26 +579,20 @@ $colour4: #8a89ba @include radius(3px) .oe_topbar_avatar vertical-align: top - .oe_cropdown_toggle:after + .oe_cropdown_arrow:after border-top: 4px solid white .oe_cropdown_menu background: #333 background: rgba(37,37,37,0.9) - padding: 6px 0 border-color: #999 border-color: rgba(0, 0, 0, 0.2) border-style: solid border-width: 0 1px 1px @include radius(0 0 6px 6px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) @include background-clip() li float: none - display: block a - white-space: nowrap - display: block - padding: 4px 15px color: #eee &:hover @include vertical-gradient(#292929, #191919) -- cgit v1.2.3 From 6a4adf2a3bc1f1e1cf3a05051e01b772fadbfbc5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 20 Jun 2012 13:15:27 +0200 Subject: [FIX] blur/focus handling in most (if not all) form widgets bzr revid: xmo@openerp.com-20120620111527-2j23k13zc6td2deo --- addons/web/static/src/css/base.css | 3 ++- 1 file changed, 2 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 13ffefa9acd..220a7d9e4c6 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1346,7 +1346,8 @@ label.error { display: inline; margin: 0 0.5em 0 0; } -.openerp .oe_form_field_one2many .oe-listview .oe-edit-row-save { +.openerp .oe_form_field_one2many .oe-listview .oe-edit-row-save, +.openerp .oe_form_field_one2many_list .oe-listview .oe-edit-row-save { visibility: hidden; } -- cgit v1.2.3 From 02898a6c0f599f7998efc1dd71743880d86e5da7 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 20 Jun 2012 15:59:31 +0200 Subject: [WIP] Kanban dropdown bzr revid: fme@openerp.com-20120620135931-32of1kgyjb1otj12 --- addons/web/static/src/css/base.css | 8 ++++---- addons/web/static/src/css/base.sass | 5 ++--- 2 files changed, 6 insertions(+), 7 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 6bc652ecab7..91c8b311d4f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -383,13 +383,13 @@ -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_cropdown_menu li { +.openerp .oe_cropdown_menu > li { list-style-type: none; float: none; display: block; position: relative; } -.openerp .oe_cropdown_menu li:hover { +.openerp .oe_cropdown_menu > li:hover { background-color: #f0f0fa; background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); @@ -401,14 +401,14 @@ -webkit-box-shadow: none; box-shadow: none; } -.openerp .oe_cropdown_menu li a { +.openerp .oe_cropdown_menu > li > a { white-space: nowrap; display: block; padding: 3px 6px; color: #4c4c4c; text-decoration: none; } -.openerp .oe_cropdown_menu li a:hover { +.openerp .oe_cropdown_menu > li > a:hover { text-decoration: none; } .openerp .oe_cropdown_arrow:after { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index dee67590e07..03eae6097a4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -331,7 +331,7 @@ $colour4: #8a89ba text-align: left @include radius(3px) @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - li + > li &:hover @include vertical-gradient(#f0f0fa, #eeeef6) @include box-shadow(none) @@ -339,7 +339,7 @@ $colour4: #8a89ba float: none display: block position: relative - a + > a white-space: nowrap display: block padding: 3px 6px @@ -649,7 +649,6 @@ $colour4: #8a89ba padding: 0 4px 0 4px .oe_systray float: right - // }}} // Menu {{{ .oe_menu -- cgit v1.2.3 From 53a540c57892d3a954eb43c2e97cad45b52f7261 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Wed, 20 Jun 2012 19:38:20 +0530 Subject: [REM]remove extra css. bzr revid: vme@tinyerp.com-20120620140820-zzo10tauy1baikxk --- addons/web/static/src/css/base.css | 10 ---------- addons/web/static/src/css/base.sass | 9 +-------- 2 files changed, 1 insertion(+), 18 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 c599d62ccba..9165811eab0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1460,16 +1460,6 @@ display: none; margin-top: 2px; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_dashboard ul { - list-style: none; - padding: 0; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_dashboard li { - position: relative; - list-style: none; - margin: 0; - white-space: nowrap; -} .openerp .oe_searchview .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 4ee0dcf1dfb..7c2e1cbf314 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1149,14 +1149,7 @@ $colour4: #8a89ba form display: none margin-top: 2px - ul - list-style: none - padding: 0 - li - position: relative - list-style: none - margin: 0 - white-space: nowrap + .oe_searchview_advanced form display: none -- cgit v1.2.3 From f1a2b708acb2294374ad30ec50700b67784c61f4 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 20 Jun 2012 17:14:53 +0200 Subject: [WIP] Replaced cropdown by dropdown bzr revid: fme@openerp.com-20120620151453-9g32rrbv3x0b1v8p --- addons/web/static/src/css/base.css | 77 ++++++++++--------------------------- addons/web/static/src/css/base.sass | 16 ++++---- 2 files changed, 29 insertions(+), 64 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 fa9974e7e36..5cccbea317c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -355,14 +355,14 @@ .openerp .ui-tabs-hide { display: none; } -.openerp .oe_cropdown, .openerp .oe_cropdown_hover, .openerp .oe_cropdown_toggle { +.openerp .oe_dropdown, .openerp .oe_dropdown_hover, .openerp .oe_dropdown_toggle { position: relative; cursor: pointer; } -.openerp .oe_cropdown_hover:hover .oe_cropdown_menu, .openerp .oe_cropdown_menu.oe_opened { +.openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { display: block; } -.openerp .oe_cropdown_menu { +.openerp .oe_dropdown_menu { display: none; position: absolute; top: 28px; @@ -379,13 +379,13 @@ -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_cropdown_menu > li { +.openerp .oe_dropdown_menu > li { list-style-type: none; float: none; display: block; position: relative; } -.openerp .oe_cropdown_menu > li:hover { +.openerp .oe_dropdown_menu > li:hover { background-color: #f0f0fa; background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); @@ -397,17 +397,17 @@ -webkit-box-shadow: none; box-shadow: none; } -.openerp .oe_cropdown_menu > li > a { +.openerp .oe_dropdown_menu > li > a { white-space: nowrap; display: block; padding: 3px 6px; color: #4c4c4c; text-decoration: none; } -.openerp .oe_cropdown_menu > li > a:hover { +.openerp .oe_dropdown_menu > li > a:hover { text-decoration: none; } -.openerp .oe_cropdown_arrow:after { +.openerp .oe_dropdown_arrow:after { width: 0; height: 0; display: inline-block; @@ -425,19 +425,19 @@ .openerp .oe_sidebar { white-space: nowrap; } -.openerp .oe_sidebar .oe_cropdown_menu .oe_sidebar_add_attachment { +.openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment { height: 20px; cursor: pointer; padding-left: 6px; margin-top: 6px; } -.openerp .oe_sidebar .oe_cropdown_menu .oe_sidebar_add_attachment span { +.openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment span { font-weight: bold; } -.openerp .oe_sidebar .oe_cropdown_menu .oe_sidebar_add_attachment .oe_hidden_input_file { +.openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment .oe_hidden_input_file { width: 200px; } -.openerp .oe_sidebar .oe_cropdown_menu .oe_sidebar_add_attachment:hover { +.openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment:hover { background-color: #f0f0fa; background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); @@ -449,7 +449,7 @@ -webkit-box-shadow: none; box-shadow: none; } -.openerp .oe_sidebar .oe_cropdown_menu li .oe_sidebar_delete_item { +.openerp .oe_sidebar .oe_dropdown_menu li .oe_sidebar_delete_item { position: absolute; top: 4px; right: 4px; @@ -463,7 +463,7 @@ font-weight: bold; text-shadow: 0 1px 1px white; } -.openerp .oe_sidebar .oe_cropdown_menu li .oe_sidebar_delete_item:hover { +.openerp .oe_sidebar .oe_dropdown_menu li .oe_sidebar_delete_item:hover { text-decoration: none; color: white; background: #8786b7; @@ -472,7 +472,7 @@ -webkit-border-radius: 2px; border-radius: 2px; } -.openerp .oe_sidebar .oe_cropdown_menu li:hover .oe_sidebar_delete_item { +.openerp .oe_sidebar .oe_dropdown_menu li:hover .oe_sidebar_delete_item { display: inline-block; } .openerp .oe_loading { @@ -710,10 +710,10 @@ .openerp .oe_topbar .oe_topbar_avatar { vertical-align: top; } -.openerp .oe_topbar .oe_cropdown_arrow:after { +.openerp .oe_topbar .oe_dropdown_arrow:after { border-top: 4px solid white; } -.openerp .oe_topbar .oe_cropdown_menu { +.openerp .oe_topbar .oe_dropdown_menu { background: #333333; background: rgba(37, 37, 37, 0.9); border-color: #999999; @@ -727,13 +727,13 @@ -moz-background-clip: padding-box; background-clip: padding-box; } -.openerp .oe_topbar .oe_cropdown_menu li { +.openerp .oe_topbar .oe_dropdown_menu li { float: none; } -.openerp .oe_topbar .oe_cropdown_menu li a { +.openerp .oe_topbar .oe_dropdown_menu li a { color: #eeeeee; } -.openerp .oe_topbar .oe_cropdown_menu li a:hover { +.openerp .oe_topbar .oe_dropdown_menu li a:hover { background-color: #292929; background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); background-image: -webkit-linear-gradient(top, #292929, #191919); @@ -792,7 +792,7 @@ list-style-type: none; float: left; } -.openerp .oe_user_menu .oe_cropdown_menu { +.openerp .oe_user_menu .oe_dropdown_menu { right: -1px; } .openerp .oe_systray > div { @@ -1740,38 +1740,6 @@ height: inherit !important; font-size: inherit; } -<<<<<<< TREE -.openerp .oe_form_nosheet > *:not(.oe_form_topbar) { - margin-left: 10px !important; - margin-right: 10px !important; -} -.openerp .oe_form td.oe_form_group_cell_label { - border-right: 1px solid #dddddd; - padding: 2px 0px 2px 0px; -} -.openerp .oe_form td.oe_form_group_cell_label label { - line-height: 18px; - display: block; - min-width: 120px; -} -.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { - padding-left: 8px; -} -.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { - font-weight: bold; - white-space: nowrap; - padding-right: 8px; -} -.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { - font-size: 80%; - color: darkGreen; - vertical-align: top; - position: relative; - top: -4px; - padding: 0 2px; -} -======= ->>>>>>> MERGE-SOURCE .openerp .oe_form .oe_form_field { width: 100%; display: inline-block; @@ -1987,9 +1955,6 @@ .openerp .oe-listview-content { width: 100%; } -.openerp .oe-listview-content td:first-child, .openerp .oe-listview-content th:first-child { - width: 17px; -} .openerp .oe-listview-content td:first-child:after, .openerp .oe-listview-content th:first-child:after { border-width: 0; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3c004dd7c39..fa47fc6d0a0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -311,12 +311,12 @@ $colour4: #8a89ba display: none // }}} // Dropdown {{{ - .oe_cropdown, .oe_cropdown_hover, .oe_cropdown_toggle + .oe_dropdown, .oe_dropdown_hover, .oe_dropdown_toggle position: relative cursor: pointer - .oe_cropdown_hover:hover .oe_cropdown_menu, .oe_cropdown_menu.oe_opened + .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened display: block - .oe_cropdown_menu + .oe_dropdown_menu display: none position: absolute top: 28px @@ -344,7 +344,7 @@ $colour4: #8a89ba text-decoration: none &:hover text-decoration: none - .oe_cropdown_arrow:after + .oe_dropdown_arrow:after width: 0 height: 0 display: inline-block @@ -360,7 +360,7 @@ $colour4: #8a89ba .oe_sidebar white-space: nowrap - .oe_cropdown_menu + .oe_dropdown_menu .oe_sidebar_add_attachment height: 20px cursor: pointer @@ -575,9 +575,9 @@ $colour4: #8a89ba @include radius(3px) .oe_topbar_avatar vertical-align: top - .oe_cropdown_arrow:after + .oe_dropdown_arrow:after border-top: 4px solid white - .oe_cropdown_menu + .oe_dropdown_menu background: #333 background: rgba(37,37,37,0.9) border-color: #999 @@ -636,7 +636,7 @@ $colour4: #8a89ba li list-style-type: none float: left - .oe_cropdown_menu + .oe_dropdown_menu right: -1px // }}} // Systray {{{ -- cgit v1.2.3 From 3939df18a2d4e6dd09e8d3ed35710f2a5f5ca40c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 20 Jun 2012 18:41:44 +0200 Subject: [FIX] display form switch bzr revid: al@openerp.com-20120620164144-xo8enp0i4hmqf50l --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 5 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 5cccbea317c..1a5e0b18231 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1068,6 +1068,9 @@ padding: 2px; content: "i"; } +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_form:after { + content: "m"; +} .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_graph:after { font-family: "mnmliconsRegular" !important; font-size: 21px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fa47fc6d0a0..16586e4d4e7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -854,6 +854,8 @@ $colour4: #8a89ba .oe_vm_switch_list:after, .oe_vm_switch_tree:after padding: 2px content: "i" + .oe_vm_switch_form:after + content: "m" .oe_vm_switch_graph:after font-family: "mnmliconsRegular" !important font-size: 21px -- cgit v1.2.3 From da7c964068ed317f94f2e55624b94388583c861c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 20 Jun 2012 18:51:57 +0200 Subject: [FIX] oe_right oe_title bzr revid: al@openerp.com-20120620165157-ke4uneci6t0pmy9h --- addons/web/static/src/css/base.css | 21 ++++++++++----------- addons/web/static/src/css/base.sass | 17 ++++++++--------- 2 files changed, 18 insertions(+), 20 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 1a5e0b18231..5c34e40ec7f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -258,12 +258,21 @@ -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } +.openerp .oe_title { + width: 55%; +} +.openerp .oe_title:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} .openerp .oe_button_box { width: 200px; text-align: center; } .openerp .oe_avatar { - float: left; margin: 0 16px 0 0; } .openerp .oe_avatar img { @@ -1549,16 +1558,6 @@ max-width: 960px; margin: 0 auto; } -.openerp .oe_form_title { - width: 55%; -} -.openerp .oe_form_title:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} .openerp ul.oe_form_steps { height: 30px; padding: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 16586e4d4e7..0b1d22e5345 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -235,11 +235,18 @@ $colour4: #8a89ba @include vertical-gradient(#DF6B66, #BF3A33) //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + .oe_title + width: 55% + .oe_title:after + content: "." + display: block + height: 0 + clear: both + visibility: hidden .oe_button_box width: 200px text-align: center .oe_avatar - float: left margin: 0 16px 0 0 img height: 50px @@ -1235,14 +1242,6 @@ $colour4: #8a89ba min-width: 650px max-width: 960px margin: 0 auto - .oe_form_title - width: 55% - .oe_form_title:after - content: "." - display: block - height: 0 - clear: both - visibility: hidden ul.oe_form_steps height: 30px padding: 0 -- cgit v1.2.3 From 47589848ba3343f1b167192f95b73ffd44028096 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 11:29:43 +0200 Subject: [FIX] Fixed oe_edit_only bzr revid: fme@openerp.com-20120621092943-rrc94sjoobybhjxk --- addons/web/static/src/css/base.css | 3 --- addons/web/static/src/css/base.sass | 2 -- 2 files changed, 5 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 5c34e40ec7f..e381ca5b573 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1526,9 +1526,6 @@ .openerp .oe_form_invisible { display: none !important; } -.openerp .oe_form_editable .oe_edit_only { - display: none !important; -} .openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty { display: none !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0b1d22e5345..7b54f079ddb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1218,8 +1218,6 @@ $colour4: #8a89ba background: #ED6F6A .oe_form_invisible display: none !important - .oe_form_editable .oe_edit_only - display: none !important .oe_form_readonly .oe_edit_only, .oe_form_field:empty display: none !important -- cgit v1.2.3 From 7a48f76737f3b4d90935b1546236139ec144cb3c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 13:34:45 +0200 Subject: [FIX] Fixed oe_form_field_boolean css bzr revid: fme@openerp.com-20120621113445-u7gx1ztrwxc7tn5d --- 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 e381ca5b573..05217f8e10a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1806,6 +1806,7 @@ } .openerp .oe_form .oe_form_field_boolean { padding-top: 4px; + width: auto; } .openerp .oe_form .oe_form_field_many2manytags .text-wrap { width: 100% !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 7b54f079ddb..c34cec6b1b1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1438,6 +1438,7 @@ $colour4: #8a89ba white-space: nowrap .oe_form_field_boolean padding-top: 4px + width: auto .oe_form_field_many2manytags .text-wrap width: 100% !important -- cgit v1.2.3 From e65eeb26b808881562ccf372b947c455b6cfdd6d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 15:07:58 +0200 Subject: [FIX] Fixed oe_inline. WARNING: We're using too much !important's bzr revid: fme@openerp.com-20120621130758-dgr0n3uksq4o1uh2 --- 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 05217f8e10a..1bc566db860 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -215,8 +215,8 @@ .openerp .oe_bold { font-weight: bold; } -.openerp .oe_inline  { - width: auto; +.openerp .oe_inline { + width: auto !important; } .openerp .oe_highlight { color: white; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c34cec6b1b1..07026bc69d1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -220,8 +220,8 @@ $colour4: #8a89ba color: #888 .oe_bold font-weight: bold - .oe_inline  - width: auto + .oe_inline + width: auto !important .oe_highlight color: white background: #DC5F59 -- cgit v1.2.3 From e0f324ac25b0f89065c39bec8b6d216f0365009d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 16:06:42 +0200 Subject: [FIX] field text width bzr revid: fme@openerp.com-20120621140642-s96lwuycykbxo719 --- 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 1bc566db860..b5276c982d6 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1720,7 +1720,7 @@ .openerp .oe_form .oe_form_field_selection select { width: inherit; } -.openerp .oe_form .oe_form_sheet textarea { +.openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea { width: 500px; } .openerp .oe_form .oe_form_field_float input { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 07026bc69d1..4db214a7a48 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1378,7 +1378,7 @@ $colour4: #8a89ba .oe_form_field_text textarea, .oe_form_field_selection select width: inherit - .oe_form_sheet textarea + .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea width: 500px .oe_form_field_float input width: 100px -- cgit v1.2.3 From ab407563ed8eac5774fb81ae8da94459b715f6d7 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 17:49:14 +0200 Subject: [FIX] Fixed oe_subtotal_footer bzr revid: fme@openerp.com-20120621154914-kpkbank4wfchzyoh --- addons/web/static/src/css/base.css | 21 ++++++++++----------- addons/web/static/src/css/base.sass | 15 +++++++-------- 2 files changed, 17 insertions(+), 19 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 b5276c982d6..3245942c64d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1592,26 +1592,25 @@ font-weight: bold; color: #b33630; } -.openerp .oe_form_subtotal_footer { - width: auto; - float: right; +.openerp .oe_form .oe_subtotal_footer { + width: 1% !important; } -.openerp .oe_form_subtotal_footer td.oe_form_group_cell { +.openerp .oe_form .oe_subtotal_footer td.oe_form_group_cell { text-align: right; - padding: 0; + padding: 0 !important; } -.openerp .oe_form_subtotal_footer td.oe_form_group_cell_label { - border: none; +.openerp .oe_form .oe_subtotal_footer td.oe_form_group_cell_label { + border-right: none; } -.openerp .oe_form_subtotal_footer .oe_form_field { +.openerp .oe_form .oe_subtotal_footer .oe_form_field { width: auto !important; } -.openerp .oe_form_subtotal_footer .oe_form_subtotal_footer_separator { +.openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator { border-top: 1px solid #cacaca; - font-size: 120%; + font-sie: 120%; font-weight: bold; } -.openerp .oe_form_subtotal_footer label.oe_form_subtotal_footer_separator { +.openerp .oe_form .oe_subtotal_footer label.oe_subtotal_footer_separator { font-weight: bold !important; padding: 2px 8px 2px 0px !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4db214a7a48..dea2fbc534b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1269,21 +1269,20 @@ $colour4: #8a89ba .oe_form_steps_active font-weight: bold color: #b33630 - .oe_form_subtotal_footer - width: auto - float: right + .oe_form .oe_subtotal_footer + width: 1% !important td.oe_form_group_cell text-align: right - padding: 0 + padding: 0 !important td.oe_form_group_cell_label - border: none + border-right: none .oe_form_field width: auto !important - .oe_form_subtotal_footer_separator + .oe_subtotal_footer_separator border-top: 1px solid #cacaca - font-size: 120% + font-sie: 120% font-weight: bold - label.oe_form_subtotal_footer_separator + label.oe_subtotal_footer_separator font-weight: bold !important padding: 2px 8px 2px 0px !important // no sheet in popups -- cgit v1.2.3 From c3bbd6012b47d7ba8974ca8e9068164a215df215 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 18:18:49 +0200 Subject: [IMP] Void oe_highlight in oe_form_editable bzr revid: fme@openerp.com-20120621161849-dzedftfw2g789vwn --- addons/web/static/src/css/base.css | 10 +++++----- addons/web/static/src/css/base.sass | 10 +++++----- 2 files changed, 10 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 3245942c64d..91600f08a25 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -103,7 +103,7 @@ .openerp h4 { margin: 4px 0; } -.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'] { +.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .oe_form_editable button.oe_highlight { display: inline-block; border: 1px solid #ababab; color: #404040; @@ -128,7 +128,7 @@ -webkit-font-smoothing: antialiased; outline: none; } -.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover { +.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover, .openerp .oe_form_editable button.oe_highlight:hover { background-color: #f6f6f6; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); @@ -138,7 +138,7 @@ background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); cursor: pointer; } -.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus { +.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus, .openerp .oe_form_editable button.oe_highlight:focus { border: 1px solid #80bfff; background-color: #f6f6f6; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); @@ -151,7 +151,7 @@ -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; } -.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active { +.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .oe_form_editable button.oe_highlight:active { background: #e3e3e3; background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f; background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f; @@ -160,7 +160,7 @@ -webkit-box-shadow: none; box-shadow: none; } -.openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled { +.openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled, .openerp .oe_form_editable button.oe_highlight:disabled { background: #efefef !important; border: 1px solid #d1d1d1 !important; -moz-box-shadow: none !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index dea2fbc534b..f4e4f5762da 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -144,7 +144,7 @@ $colour4: #8a89ba margin: 4px 0 // }}} // Button style {{{ - a.button:link, a.button:visited, button, input[type='submit'] + a.button:link, a.button:visited, button, input[type='submit'], .oe_form_editable button.oe_highlight display: inline-block border: 1px solid #ababab color: #404040 @@ -159,23 +159,23 @@ $colour4: #8a89ba -webkit-font-smoothing: antialiased outline: none - a.button:hover, button:hover, input[type='submit']:hover + a.button:hover, button:hover, input[type='submit']:hover, .oe_form_editable button.oe_highlight:hover @include vertical-gradient(#f6f6f6, #e3e3e3) cursor: pointer - a.button:focus, button:focus, input[type='submit']:focus + a.button:focus, button:focus, input[type='submit']:focus, .oe_form_editable button.oe_highlight:focus border: 1px solid #80bfff @include vertical-gradient(#f6f6f6, #e3e3e3) @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset)) - a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active + a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active, .oe_form_editable button.oe_highlight:active background: #e3e3e3 background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f @include box-shadow(none) - a.button.disabled, button:disabled, input[type='submit']:disabled + a.button.disabled, button:disabled, input[type='submit']:disabled, .oe_form_editable button.oe_highlight:disabled background: #efefef !important border: 1px solid #d1d1d1 !important @include box-shadow(none !important) -- cgit v1.2.3 From 7d78741af4797a092caa874c687de0e221a3b743 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 18:38:31 +0200 Subject: [FIX] Override oe_higlight in oe_form_editable mode bzr revid: fme@openerp.com-20120621163831-75qqmcsit353i9o2 --- addons/web/static/src/css/base.css | 61 +++++++++++++++++++++++++++++++------ addons/web/static/src/css/base.sass | 28 +++++++++++------ 2 files changed, 71 insertions(+), 18 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 91600f08a25..0d4912c2840 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -103,7 +103,7 @@ .openerp h4 { margin: 4px 0; } -.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .oe_form_editable button.oe_highlight { +.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'] { display: inline-block; border: 1px solid #ababab; color: #404040; @@ -128,7 +128,7 @@ -webkit-font-smoothing: antialiased; outline: none; } -.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover, .openerp .oe_form_editable button.oe_highlight:hover { +.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover { background-color: #f6f6f6; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); @@ -138,7 +138,7 @@ background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); cursor: pointer; } -.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus, .openerp .oe_form_editable button.oe_highlight:focus { +.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus { border: 1px solid #80bfff; background-color: #f6f6f6; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); @@ -151,16 +151,19 @@ -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; } -.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .oe_form_editable button.oe_highlight:active { - background: #e3e3e3; - background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f; - background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f; - background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f; +.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active { + background-color: #e3e3e3; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)); + background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: -moz-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: -ms-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: -o-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: linear-gradient(to bottom, #e3e3e3, #f6f6f6); -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } -.openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled, .openerp .oe_form_editable button.oe_highlight:disabled { +.openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled { background: #efefef !important; border: 1px solid #d1d1d1 !important; -moz-box-shadow: none !important; @@ -1523,6 +1526,46 @@ .openerp .oe_form_button_save_dirty:hover { background: #ed6f6a; } +.openerp .oe_form_editable .oe_highlight { + color: #404040; + background: none; +} +.openerp .oe_form_editable button.oe_highlight { + background-color: #efefef; + background-image: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8)); + background-image: -webkit-linear-gradient(top, #efefef, #d8d8d8); + background-image: -moz-linear-gradient(top, #efefef, #d8d8d8); + background-image: -ms-linear-gradient(top, #efefef, #d8d8d8); + background-image: -o-linear-gradient(top, #efefef, #d8d8d8); + background-image: linear-gradient(to bottom, #efefef, #d8d8d8); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; +} +.openerp .oe_form_editable button.oe_highlight:active { + background-color: #e3e3e3; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)); + background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: -moz-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: -ms-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: -o-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: linear-gradient(to bottom, #e3e3e3, #f6f6f6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp .oe_form_editable button.oe_highlight:hover { + background-color: #f6f6f6; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); + background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -moz-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -ms-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; +} .openerp .oe_form_invisible { display: none !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f4e4f5762da..35e1d08e17f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -144,7 +144,7 @@ $colour4: #8a89ba margin: 4px 0 // }}} // Button style {{{ - a.button:link, a.button:visited, button, input[type='submit'], .oe_form_editable button.oe_highlight + a.button:link, a.button:visited, button, input[type='submit'] display: inline-block border: 1px solid #ababab color: #404040 @@ -159,23 +159,20 @@ $colour4: #8a89ba -webkit-font-smoothing: antialiased outline: none - a.button:hover, button:hover, input[type='submit']:hover, .oe_form_editable button.oe_highlight:hover + a.button:hover, button:hover, input[type='submit']:hover @include vertical-gradient(#f6f6f6, #e3e3e3) cursor: pointer - a.button:focus, button:focus, input[type='submit']:focus, .oe_form_editable button.oe_highlight:focus + a.button:focus, button:focus, input[type='submit']:focus border: 1px solid #80bfff @include vertical-gradient(#f6f6f6, #e3e3e3) @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset)) - a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active, .oe_form_editable button.oe_highlight:active - background: #e3e3e3 - background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f - background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f - background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f + a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active + @include vertical-gradient(#e3e3e3, #f6f6f6) @include box-shadow(none) - a.button.disabled, button:disabled, input[type='submit']:disabled, .oe_form_editable button.oe_highlight:disabled + a.button.disabled, button:disabled, input[type='submit']:disabled background: #efefef !important border: 1px solid #d1d1d1 !important @include box-shadow(none !important) @@ -1216,6 +1213,19 @@ $colour4: #8a89ba font-weight: bold &:hover background: #ED6F6A + .oe_form_editable + .oe_highlight + color: #404040 + background: none + button.oe_highlight + @include vertical-gradient(#efefef, #d8d8d8) + @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset)) + button.oe_highlight:active + @include vertical-gradient(#e3e3e3, #f6f6f6) + @include box-shadow(none) + button.oe_highlight:hover + @include vertical-gradient(#f6f6f6, #e3e3e3) + @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset)) .oe_form_invisible display: none !important .oe_form_readonly -- cgit v1.2.3 From a227e1e43cb04ed4b9a1430810eab0f38e64695a Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 25 Jun 2012 08:58:12 +0200 Subject: [CHG] reintroduce a button at the end of the line, but use the cross as a cancel bzr revid: xmo@openerp.com-20120625065812-6n8lxb0zimzvq1ee --- addons/web/static/src/css/base.css | 2 +- 1 file changed, 1 insertion(+), 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 220a7d9e4c6..49752f66c40 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1348,7 +1348,7 @@ label.error { } .openerp .oe_form_field_one2many .oe-listview .oe-edit-row-save, .openerp .oe_form_field_one2many_list .oe-listview .oe-edit-row-save { - visibility: hidden; + background-image: url("/web/static/src/img/iconset-b-remove.png"); } .openerp .oe_forms .oe-listview th.oe-sortable .ui-icon, -- cgit v1.2.3 From f12e5ffd030678a228f7df2e6afe33e2b8dd44c8 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 25 Jun 2012 11:46:02 +0200 Subject: [REM] Removed base_old.css bzr revid: fme@openerp.com-20120625094602-mxc6fbhtskxu2xj5 --- addons/web/static/src/css/base_old.css | 999 --------------------------------- 1 file changed, 999 deletions(-) delete mode 100644 addons/web/static/src/css/base_old.css (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base_old.css b/addons/web/static/src/css/base_old.css deleted file mode 100644 index 74b660f7613..00000000000 --- a/addons/web/static/src/css/base_old.css +++ /dev/null @@ -1,999 +0,0 @@ -.openerp { - padding: 0; - margin: 0; - font-size: 80%; - font-family: Ubuntu, Helvetica, sans-serif; -} - -.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option, -.openerp button, .openerp .ui-widget { - font-family: Ubuntu, Helvetica, sans-serif; - font-size:85%; -} - -.openerp .view-manager-main-content { - width: 100%; -} - -.openerp .oe_form_group_cell .view-manager-main-content { - padding: 0; -} - -.oe_box { - border: 1px solid #aaf; - padding: 2px; - margin: 2px; -} - - -#oe_errors pre { - margin: 0; -} - -.openerp .oe-listview .oe-number { - text-align: right !important; -} -.oe-listview-header-columns { - background: #d1d1d1; /* Old browsers */ - background: -moz-linear-gradient(top, #ffffff 0%, #d1d1d1 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#d1d1d1)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #ffffff 0%,#d1d1d1 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #ffffff 0%,#d1d1d1 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #ffffff 0%,#d1d1d1 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#d1d1d1',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #ffffff 0%,#d1d1d1 100%); /* W3C */ -} - -.openerp .oe_hide { - display: none !important; -} - -/* STATES */ -.openerp .on_logged, -.openerp .db_options_row { - display: none; -} - - - -/* Database */ -.login .oe-database-manager { - display: none; - height: 100%; - width: 100%; - background-color: white; -} -.login.database_block .bottom, -.login.database_block .login_error_message, -.login.database_block .pane { - display: none; -} -.login.database_block .oe-database-manager { - display: block; -} - -.login .database { - float: left; - width: 202px; - height: 100%; - background: #666666; -} -.login .oe_db_options { - margin-left: 202px; - color: black; - padding-top: 20px; -} - -.login .database ul { - margin-top: 65px; -} - -ul.db_options li { - padding: 5px 0 10px 5px; - background: #949292; /* Old browsers */ - background: -moz-linear-gradient(top, #949292 30%, #6d6b6b 95%, #282828 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(30%,#949292), color-stop(95%,#6d6b6b), color-stop(100%,#282828)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #949292 30%,#6d6b6b 95%,#282828 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #949292 30%,#6d6b6b 95%,#282828 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #949292 30%,#6d6b6b 95%,#282828 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#282828',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #949292 30%,#6d6b6b 95%,#282828 100%); /* W3C */ - /* for ie9 */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#5B5A5A',GradientType=0 ); /* IE6-9 */ - border: none; - /* overriding jquery ui */ - -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; - display: block; - font-weight: bold; - text-transform: uppercase; - margin: 1px; - color: #EEEEEE; - cursor: pointer; - width: 195px; - font-size: 12px; -} - -.db_option_table { - border: 1px solid #5A5858; - padding: 5px; - -moz-border-radius: 10px; -} - -table.db_option_table input.required { - background-color: #D2D2FF !important; -} - -.db_option_table label { - display: block; - text-align: right; -} - -.db_option_table input[type="text"], -.db_option_table input[type="password"], -.db_option_table input[type="file"], -.db_option_table select { - width: 300px; -} - -.option_string { - font-weight: bold; - color: #555; - width: 100%; - text-align: center; - padding: 10px 0; - font-size: large; -} - -label.error { - float: none; - color: red; - padding-left: .5em; - vertical-align: top; -} - -/* Main*/ -.openerp .main_table { - width: 100%; - height: 100%; - background: #f0eeee; -} -.openerp .oe-application { - height: 100%; -} -.openerp .oe-application-container { - width: 100%; - height: 100%; -} - -/* IE Hack - for IE < 9 - * Avoids footer to be placed statically at 100% cutting the middle of the views - * */ -.openerp .oe-application-container { - height: auto\9; - min-height: 100%\9; -} - - -/* Main Application */ -.openerp .oe-main-content { - padding: 0; - height: 100%; -} - -.openerp h2.oe_view_title { - font-size: 110%; - font-weight: normal; - margin: 2px 0; - color: #252424; - text-shadow: white 0 1px 0; -} -.openerp div[id^="notebook"] .oe_view_title { - font-size:85%; - padding-bottom:4px; -} - -/* List */ -.openerp table.oe-listview-content { - clear: right; - width: 100%; - border-spacing: 0; - border: 1px solid silver; -} - -.openerp .oe-listview thead table { - width: 100%; - border: none; -} -.openerp .oe-listview tr.odd { - background-color: #f3f3f3; -} -.openerp .oe-listview tbody tr:hover { - background-color: #ecebf2; -} -.openerp .oe-listview tbody tr:hover { - background-color: #eae9f0; -} -.openerp .oe-listview thead table tr, -.openerp .oe-listview thead table tr:hover { - background: none; -} - -.openerp .oe-listview > table > tbody > tr > td, -.openerp .oe-listview th { - vertical-align: middle; - text-align: left; - padding: 1px 2px; -} - -.openerp .oe-record-delete button, -.openerp button.oe-edit-row-save { - border: none; - height: 12px; - width: 12px; - background: url("/web/static/src/img/iconset-b-remove.png") no-repeat scroll center center transparent; - cursor: pointer; -} -.openerp button.oe-edit-row-save { - background-image: url('/web/static/src/img/icons/save-document.png'); -} - -/* Could use :not selectors if they were supported by MSIE8... */ -.openerp .oe-listview > table > tbody > tr > td { - border-left: 1px solid #dadada; /*currently commenting to test with no vertical lines in list view*/ -} -.openerp .oe-listview tbody td:first-child, -.openerp .oe-listview tbody td.oe-button, -.openerp .oe-listview tbody td.oe-button, -.openerp .oe-listview tbody th.oe-record-selector, -.openerp .oe-listview tbody td.oe-record-delete { - border-left: none; -} - -.openerp .oe-listview td.oe-record-delete { - text-align: right; -} -.openerp .oe-listview th.oe-sortable { - cursor: pointer; - font-size: 75%; - text-transform: uppercase; - padding: 0; - margin: 0; - padding-left: 3px; - color: #333; -} -.openerp .oe-listview th.oe-sortable .ui-icon { - height: 60%; - margin: -6px 0 0; - display: inline; - display: inline-block; - vertical-align: middle; -} - -.openerp .oe-listview > table > tbody > tr > td { - border-bottom: 1px solid #E3E3E3; -} - - -.openerp .oe-listview td.oe-actions { - border-bottom:none; -} - -.openerp .oe-listview .oe-record-selector, .openerp .oe-listview .oe-record-edit-link { - border-bottom: 1px solid #E3E3E3; -} -.openerp .oe-listview .oe-record-edit-link { - cursor: pointer; -} - -.openerp .oe-listview .oe-field-cell { - cursor: pointer; - margin-top: 0; - margin-bottom: 0; - padding-top: 3px; - padding-bottom: 3px; - font-size: 80%; -} -.openerp .oe-listview .oe-field-cell progress { - width: 100%; -} -.openerp .oe-listview .oe-field-cell.oe-button button, -.openerp .oe-listview .oe_form_button button { - margin: 0; - padding: 0; - border: none; - background: none; - width: 16px; - box-shadow: none; - -moz-box-shadow: none; - -webkit-box-shadow: none; -} -.openerp .oe-listview .oe-field-cell button:active { - opacity: 0.5; -} -.openerp .oe-listview .oe-field-cell button img { - cursor: pointer; -} -.openerp .oe-listview .oe-field-cell button img:hover { - opacity: 0.75; -} - -.openerp .oe-listview .oe-field-cell .oe-listview-button-disabled img { - opacity: 0.5; -} - -.openerp .oe-listview th.oe-actions { - text-align: left; - white-space: nowrap; -} -.openerp .oe-listview th.oe-list-pager { - text-align: right; - white-space: nowrap; -} -.openerp .oe-list-pager .oe-pager-state { - cursor: pointer; - font-size: 90%; - color: #555; -} - -.openerp .oe_button.oe_button_pager, -.openerp .oe-list-pager > span, -.openerp .oe_form_pager > span { - line-height: 17px; - height: 17px; - cursor: pointer; - color: gray; - font-weight: bold; - vertical-align: middle; -} -.openerp .oe_button.oe_button_pager, -.openerp .oe_button.oe_button_pager:disabled { - padding: 0 3px 0 3px; - margin: 0; - height: 17px; -} -.openerp .oe-listview .oe-group-name { - padding-right: 1em; -} -.openerp .oe-listview .oe-group-name, -.openerp .oe-listview .oe-group-pagination { - white-space: nowrap; -} - -.openerp .oe-listview tfoot td { - padding: 3px 3px 0; -} -.openerp .oe-listview .oe-list-footer { - text-align: center; - white-space: nowrap; - color: #444; - font-size: 85%; -} -.openerp .oe-listview .oe-list-footer span { - margin: 0 1em; -} -.openerp .oe-listview .oe-list-footer progress { - vertical-align:-10% !important; - width: 100%; -} - -/** list rounded corners - - rounded corners are a pain on tables: need to round not only table, but - also on the first and last children of the first and last row - */ -.openerp .oe-listview table.oe-listview-content { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.openerp .oe-listview table.oe-listview-content thead tr:first-child th:first-child { - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; -} -.openerp .oe-listview table.oe-listview-content thead tr:first-child th:last-child { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; -} -.openerp .oe-listview table.oe-listview-content tfoot tr:last-child th:first-child, -.openerp .oe-listview table.oe-listview-content tfoot tr:last-child td:first-child, -.openerp .oe-listview table.oe-listview-content tbody:last-child tr:last-child th:first-child { - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; -} -.openerp .oe-listview table.oe-listview-content tfoot tr:last-child th:last-child, -.openerp .oe-listview table.oe-listview-content tfoot tr:last-child td:last-child, -.openerp .oe-listview table.oe-listview-content tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; -} - -/* Form */ -.openerp .oe_form_group_cell input[type="checkbox"] { - margin-top: 3px; - vertical-align: middle; -} -.openerp .oe_form_group_cell .input[type="text"] { - padding-bottom: 1px; -} - -.openerp table.oe_form_group td { - color: #4c4c4c; -} -.openerp table.oe_form_group { - color: #4c4c4c; -} -.openerp fieldset.oe_group_box { - border: 1px solid #AAAAAA; - moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - background: #F9F9F9; - padding: 4px; -} -.openerp fieldset.oe_group_box legend { - font-weight: bold; -} -.openerp .required.error { - border: 1px solid #900; -} -.openerp .oe_form_buttons, .openerp .oe_list_buttons { - float: left; -} -.openerp .oe_form_pager, .openerp .oe_list_pager { - float: right; - font-size: 80%; - color: gray; - font-weight: bold; -} - -.openerp .oe_form_pager { - margin-right: 3px; -} - -.openerp .oe_align_left { - text-align: left; -} -.openerp .oe_align_right { - text-align: right; -} -.openerp .oe_align_center { - text-align: center; -} -.openerp .oe_form .oe_form_paragraph { - margin: 3px 0 0 0; - white-space: normal; -} - -.openerp .oe_form .oe_form_paragraph.oe_multilines { - white-space: pre; -} - -.openerp .oe_form_field_one2many .oe-actions h3.oe_view_title, -.openerp .oe_form_field_one2many_list .oe-actions h3.oe_view_title{ - display: inline; - margin: 0 0.5em 0 0; -} - -.openerp .oe_form .oe-listview th.oe-sortable .ui-icon, -.openerp .oe_form .oe-listview th.oe-sortable .ui-icon { - height: 100%; - margin-top: -9px; -} - -.openerp table.oe_form_group .oe-listview-content td { - color: inherit; -} - -/* Uneditable Form View */ -.openerp .oe_form_readonly { - -} -.openerp .oe_form_readonly .oe_form_group_cell .field_text, -.openerp .oe_form_readonly .field_char, -.openerp .oe_form_readonly .field_int, -.openerp .oe_form_readonly .field_float, -.openerp .oe_form_readonly .field_email, -.openerp .oe_form_readonly .field_date, -.openerp .oe_form_readonly .field_selection, -.openerp .oe_form_readonly .oe_form_field_many2one { - padding: 3px 2px 2px 2px; - background-color: white; - height: 17px; -} -.openerp .oe_form_readonly .oe_form_group_cell .field_text { - height: auto; -} -.openerp .oe_form_readonly .field_datetime { - padding: 1px 2px 2px 2px; - background-color: white; - height:19px; -} -.openerp .oe_form_readonly .oe_form_field_many2one div { - background-color:white; - height:18px; - margin-bottom:1px; - padding: 0px 2px 5px 2px; -} - -.openerp .oe_form_readonly .oe_form_field_email div { - background-color: white; - padding: 1px 2px 3px 2px; -} - - -.openerp .oe_form_readonly .oe_form_field_text div.field_text, -.openerp .oe_form_readonly .oe_form_field_text_html div.field_text_html { - white-space: pre-wrap; -} -.openerp .oe_form_readonly .oe_form_group_cell .field_text { - min-height:100px; -} -/* Inputs */ -/* vertically recentering filter management select tag */ -.openerp select.oe_search-view-filters-management { - margin-top:2px; -} - - -@-moz-document url-prefix() { - /* Strange firefox behaviour on width: 100% + white-space: nowrap */ - .openerp .oe_form .oe_form_button .oe_button { - width: auto; - } -} -/* IE Hack - for IE < 9 - * Avoids buttons overflow - * */ -.openerp .oe_form .oe_form_button .oe_button { - min-width: auto\9; -} - - -/* jQuery UI override */ -.openerp .ui-widget { - font-size: 1em; -} -.openerp tbody.ui-widget-content { - margin-bottom: 10px; - border-spacing: 4px; -} -.openerp .ui-widget-header { - background: white none; -} - -/* Sidebar */ -.openerp .view-manager-main-table { - margin: 0; - width:100%; - border-collapse:collapse; - height:100%; -} - -.openerp .view-manager-main-table tbody { - vertical-align: top; -} - -.openerp .oe-view-manager-header { - overflow: auto; - background: url("/web/static/src/img/sep-a.gif") 0 100% repeat-x; - margin:6px 0 6px 2px; -} -.openerp .oe_form_group_cell .oe-view-manager-header { /* Trick: remove the background when element is in a formular */ - background: none; -} - -.openerp .oe-view-manager-header h2 { - float: left; -} - -.openerp .oe_view_manager_menu_tips blockquote { - display: none; - font-size: 85%; - margin: 0; - background: #fff; - border-bottom: 1px solid #CECBCB; - padding: 1px 10px; - color: #4C4C4C; -} -.openerp .oe_view_manager_menu_tips blockquote p { - margin: 0; - padding: 6px 1px 4px; -} - -.openerp .oe_view_manager_menu_tips blockquote div { - text-align: right; - margin-right:10px; -} - -.openerp .oe_view_manager_menu_tips blockquote div button { - border: none; - background: none; - padding: 0 4px; - margin: 0; - display: inline; - text-decoration: underline; - color: inherit; -} - -.openerp .view-manager-main-sidebar { - width: 180px; - padding: 0; - margin: 0; -} - -.openerp .sidebar-main-div { - height: 100%; - border-left: 1px solid #D2CFCF; -} - -.openerp .sidebar-content { - padding: 0; - margin: 0; - width: 180px; - height: 100%; - font-size: 0.9em; -} - -.openerp .closed-sidebar .sidebar-content { - width: 22px; -} - -.openerp .closed-sidebar .sidebar-content { - display: none; -} - -.openerp .sidebar-main-div a { - color: #555; - text-decoration: none; -} - -.openerp .sidebar-main-div a:hover { - color: black; -} - -.openerp .oe-sidebar-attachments-toolbar { - margin: 4px 0 0 4px; -} -.openerp .oe-sidebar-attachments-items { - clear: both; - padding-top: 5px !important; -} -.openerp .oe-sidebar-attachments-items li { - position: relative; - padding: 0 0 3px 10px !important; -} -.openerp .oe-sidebar-attachments-items li:hover { - background: #ddd; -} -.openerp .oe-sidebar-attachments-link { - display: block; - margin-right: 15px; - overflow: hidden; -} -.openerp .oe-sidebar-attachment-delete { - position: absolute; - right: 2px; - top: 1px; - overflow: hidden; - width: 15px; - height: 15px; - padding: 1px; - border-radius: 7px; - -moz-border-radius: 7px; - -webkit-border-radius: 7px; -} -.openerp .oe-sidebar-attachment-delete:hover { - background-color: white; -} - -.openerp .view-manager-main-sidebar h2 { - margin:0; - font-size: 1.15em; - color: #8E8E8E; - text-shadow: white 0 1px 0; - padding-left: 10px; - padding-right: 21px; - height: 21px; - - background: #ffffff; /* Old browsers */ - background: -moz-linear-gradient(top, #ffffff 0%, #ebe9e9 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#ebe9e9)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#EBE9E9',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ - - border: 1px solid #D2CFCF; - border-right-width: 0; - border-left-width: 0; -} -.openerp .view-manager-main-sidebar h2 { - border-top-width: 0; -} - -.openerp .view-manager-main-sidebar ul { - list-style-type: none; - margin: 0; - padding: 0; - display: block; -} - -.openerp .view-manager-main-sidebar li { - display: block; - padding: 3px 3px 3px 10px; -} - -.openerp .toggle-sidebar { - cursor: pointer; - border: 1px solid #D2CFCF; - border-top-width: 0; - display: block; - background: url(/web/static/src/img/toggle-a-bg.png); - width: 21px; - height: 21px; - z-index: 10; -} -.openerp .open-sidebar .toggle-sidebar { - margin-left: 158px; - background-position: 21px 0; - position: absolute; -} -.openerp .closed-sidebar .toggle-sidebar { - border-left: none; -} -.openerp li.oe_sidebar_print { - padding-left: 20px; - background: 1px 3px url(/web/static/src/img/icons/gtk-print.png) no-repeat; -} - -.openerp .oe_sidebar_print ul { - padding-left:8px; -} - -.openerp.kitten-mode-activated .main_table { - background: url(http://placekitten.com/g/1500/800) repeat; -} -.openerp.kitten-mode-activated.clark-gable .main_table { - background: url(http://amigrave.com/ClarkGable.jpg); - background-size: 100%; -} - -.openerp.kitten-mode-activated .header { - background: url(http://placekitten.com/g/211/65) repeat; -} - -.openerp.kitten-mode-activated .menu { - background: #828282; - background: -moz-linear-gradient(top, #828282 0%, #4D4D4D 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#828282), color-stop(100%,#4D4D4D)); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#828282', endColorstr='#4D4D4D',GradientType=0 ); -} -.openerp.kitten-mode-activated .menu a { - background: none; -} -.openerp.kitten-mode-activated .menu span { - background: none; -} -.openerp.kitten-mode-activated .sidebar-content li a, -.openerp.kitten-mode-activated .oe-application .view-manager-main-content h2.oe_view_title, -.openerp.kitten-mode-activated .oe-application .view-manager-main-content a.searchview_group_string, -.openerp.kitten-mode-activated .oe-application .view-manager-main-content label { - color: white; -} -.openerp.kitten-mode-activated .menu, -.openerp.kitten-mode-activated .header_corner, -.openerp.kitten-mode-activated .header_title, -.openerp.kitten-mode-activated .oe-application, -.openerp.kitten-mode-activated .oe_footer, -.openerp.kitten-mode-activated .loading, -.openerp.kitten-mode-activated .ui-dialog { - opacity:0.8; - filter:alpha(opacity=80); -} -.openerp.kitten-mode-activated .header .company_logo { - background: url(http://placekitten.com/g/180/46); -} -.openerp.kitten-mode-activated .loading { - background: #828282; - border-color: #828282; -} - -.openerp .oe-m2o-drop-down-button { - margin-left: -24px; -} -.openerp .oe-m2o-drop-down-button img { - margin-bottom: -4px; - cursor: pointer; -} -.openerp .oe-m2o input { - border-right: none; - margin-right: 0px !important; - padding-bottom: 2px !important; -} -.openerp .oe-m2o-disabled-cm { - color: grey; -} -.openerp ul[role="listbox"] li a { - font-size:80%; -} -.parent_top { - vertical-align: text-top; -} - -.openerp .oe-dialog-warning p { - padding-left: 1em; - font-size: 1.2em; - font-weight: bold; -} - -.openerp .dhx_mini_calendar { - -moz-box-shadow: none; - -khtml-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} -.openerp .oe-treeview-table { - width: 100%; - background-color : #FFFFFF; - border-spacing: 0; - -} -.openerp .oe-treeview-table tr:hover{ - color: blue; - background-color : #D8D8D8; -} -.treeview-tr, .treeview-td { - cursor: pointer; - vertical-align: top; - text-align: left; - border-bottom: 1px solid #CFCCCC; -} -.openerp .oe-treeview-table .oe-number { - text-align: right !important; -} -.treeview-tr span, .treeview-td 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; -} - -.treeview-header { - vertical-align: top; - background-color : #D8D8D8; - white-space: nowrap; - text-align: left; - padding: 4px 5px; -} -ul.oe-arrow-list { - padding-left: 1.1em; - margin: 0; - white-space: nowrap; -} -ul.oe-arrow-list li { - display: inline-block; - margin-left: -1em; -} -ul.oe-arrow-list li span { - vertical-align: top; - display: inline-block; - border: 1em solid #DEDEDE; - line-height:0em; -} -ul.oe-arrow-list .oe-arrow-list-before { - border-left-color: rgba(0,0,0,0); - border-right-width:0; -} -ul.oe-arrow-list .oe-arrow-list-after { - border-color: rgba(0,0,0,0); - border-left-color: #DEDEDE; - border-right-width:0; -} -ul.oe-arrow-list li.oe-arrow-list-selected span { - border-color: #B5B9FF; -} -ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-before { - border-left-color: rgba(0,0,0,0); -} -ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { - border-color: rgba(0,0,0,0); - border-left-color: #B5B9FF; -} -.openerp ul.oe-arrow-list li:first-child span:first-child{ - -webkit-border-top-left-radius: 3px; - -moz-border-radius-topleft: 3px; - border-top-left-radius: 3px; - -webkit-border-bottom-left-radius: 3px; - -moz-border-radius-bottomleft: 3px; - border-bottom-left-radius: 3px; -} -.openerp ul.oe-arrow-list li:last-child span:last-child{ - -webkit-border-top-right-radius: 3px; - -moz-border-radius-topright: 3px; - border-top-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - -moz-border-radius-bottomright: 3px; - border-bottom-right-radius: 3px; -} -.openerp .oe_view_editor { - width:100%; - border-collapse : collapse; - margin-left: -12px; - - width: 100%; - background-color : white; - border-spacing: 0; -} -.openerp .oe_view_editor td{ - text-align: center; - white-space: nowrap; - border: 1px solid #D8D8D8; - - cursor: pointer; - font-size: 90%; -} -.openerp .oe_view_editor_field td{ - border: 0px !important; -} - -.openerp .oe_view_editor tr:hover { - background-color: #ecebf2; -} - - -/* Dialog traceback cases */ -.openerp .oe_error_detail{ - display: block; -} -.openerp .oe_error_send{ - display:block; -} -.openerp .oe_fielddiv{ - display:inline-block; - width:100%; -} -.openerp .oe_fielddiv input[type=text],textarea{ - width:100%; -} -/* for Alignment center */ -.openerp .oe_centeralign{ - text-align:center; -} - -.openerp .oe_applications_tiles { - color: #4C4C4C; - text-shadow: #EEE 0 1px 0; - margin: 0 20px; -} - -.openerp select.oe_search-view-filters-management { - font-style: oblique; - color: #999999; -} - -.openerp .oe_search-view-filters-management option, -.openerp .oe_search-view-filters-management optgroup { - font-style: normal; - color: black; -} - - -/* Internet Explorer Fix */ -a img { - border: none; -} -- cgit v1.2.3 From dd2b3227a8c2e8d39fad5139ff575eea6d02d660 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 25 Jun 2012 16:48:45 +0200 Subject: Graph dropdown toggle improvement bzr revid: mit@openerp.com-20120625144845-idyfjd3px6pct5jj --- addons/web/static/src/css/base.css | 7 ++++++- addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 8 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 0d4912c2840..986539e5555 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"); @@ -315,6 +315,11 @@ list-style: none; zoom: 1; } +.openerp .oe_notebook.ui-corner-all { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; +} .openerp .oe_notebook:before, .openerp .oe_notebook:after { display: table; content: ""; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 35e1d08e17f..389490bcd0a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -275,6 +275,8 @@ $colour4: #8a89ba padding: 0 16px list-style: none zoom: 1 + .oe_notebook.ui-corner-all + @include radius(0) .oe_notebook:before, .oe_notebook:after display: table content: "" -- cgit v1.2.3 From 52a7476bb17d044f52a815d7202ae9027ec3cd94 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 25 Jun 2012 21:52:25 +0200 Subject: [ADD] Added oe_highlight_on_dirty bzr revid: fme@openerp.com-20120625195225-ehts5hyuscmpxeyy --- addons/web/static/src/css/base.css | 36 ++++++++++++++++++------------------ addons/web/static/src/css/base.sass | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 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 351a3366651..c461a54f5b1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -261,6 +261,24 @@ -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } +.openerp .oe_form_dirty .oe_highlight_on_dirty { + color: white; + background: #dc5f59; + background-color: #dc5f59; + background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); + background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); + background-image: -moz-linear-gradient(top, #dc5f59, #b33630); + background-image: -ms-linear-gradient(top, #dc5f59, #b33630); + background-image: -o-linear-gradient(top, #dc5f59, #b33630); + background-image: linear-gradient(to bottom, #dc5f59, #b33630); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + font-weight: bold; +} +.openerp .oe_form_dirty .oe_highlight_on_dirty:hover { + background: #ed6f6a; +} .openerp .oe_title { width: 55%; } @@ -1508,24 +1526,6 @@ background-color: #ff6666 !important; border: 1px solid #dd0000 !important; } -.openerp .oe_form_button_save_dirty { - color: white; - background: #dc5f59; - background-color: #dc5f59; - background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); - background-image: -moz-linear-gradient(top, #dc5f59, #b33630); - background-image: -ms-linear-gradient(top, #dc5f59, #b33630); - background-image: -o-linear-gradient(top, #dc5f59, #b33630); - background-image: linear-gradient(to bottom, #dc5f59, #b33630); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; - font-weight: bold; -} -.openerp .oe_form_button_save_dirty:hover { - background: #ed6f6a; -} .openerp .oe_form_editable .oe_highlight { color: #404040; background: none; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2ce5cf5a8d5..bcea93cc9ee 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -232,6 +232,14 @@ $colour4: #8a89ba @include vertical-gradient(#DF6B66, #BF3A33) //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + .oe_form_dirty .oe_highlight_on_dirty + color: white + background: #dc5f59 + @include vertical-gradient(#dc5f59, #b33630) + @include box-shadow(none) + font-weight: bold + &:hover + background: #ED6F6A .oe_title width: 55% .oe_title:after @@ -1205,14 +1213,6 @@ $colour4: #8a89ba input, select, textarea background-color: #F66 !important border: 1px solid #D00 !important - .oe_form_button_save_dirty - color: white - background: #dc5f59 - @include vertical-gradient(#dc5f59, #b33630) - @include box-shadow(none) - font-weight: bold - &:hover - background: #ED6F6A .oe_form_editable .oe_highlight color: #404040 -- cgit v1.2.3 From 92f9305050c411d743ea5ea144fb35528517f6bb Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 25 Jun 2012 22:27:10 +0200 Subject: [IMP] Improved oe_highlight_on_dirty bzr revid: fme@openerp.com-20120625202710-97ggelivandevbwj --- addons/web/static/src/css/base.css | 6 ++++-- addons/web/static/src/css/base.sass | 18 ++++++++++-------- 2 files changed, 14 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 c461a54f5b1..a59f16faea9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -264,6 +264,9 @@ .openerp .oe_form_dirty .oe_highlight_on_dirty { color: white; background: #dc5f59; + font-weight: bold; +} +.openerp .oe_form_dirty button.oe_highlight_on_dirty { background-color: #dc5f59; background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); @@ -274,9 +277,8 @@ -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; - font-weight: bold; } -.openerp .oe_form_dirty .oe_highlight_on_dirty:hover { +.openerp .oe_form_dirty button.oe_highlight_on_dirty:hover { background: #ed6f6a; } .openerp .oe_title { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index bcea93cc9ee..57c4f343713 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -232,14 +232,16 @@ $colour4: #8a89ba @include vertical-gradient(#DF6B66, #BF3A33) //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) - .oe_form_dirty .oe_highlight_on_dirty - color: white - background: #dc5f59 - @include vertical-gradient(#dc5f59, #b33630) - @include box-shadow(none) - font-weight: bold - &:hover - background: #ED6F6A + .oe_form_dirty + .oe_highlight_on_dirty + color: white + background: #dc5f59 + font-weight: bold + button.oe_highlight_on_dirty + @include vertical-gradient(#dc5f59, #b33630) + @include box-shadow(none) + &:hover + background: #ED6F6A .oe_title width: 55% .oe_title:after -- cgit v1.2.3 From 2f3fb70afe39c5b3018b1064dee14d6ed02bf3e1 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 26 Jun 2012 11:03:33 +0200 Subject: [IMP] Improved default style for inputs bzr revid: fme@openerp.com-20120626090333-ewm2hovhy7lg19v0 --- addons/web/static/src/css/base.css | 3 ++- addons/web/static/src/css/base.sass | 3 ++- 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 a59f16faea9..42aee384348 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -91,11 +91,12 @@ list-style-type: none; } .openerp input, .openerp textarea, .openerp select { - padding: 4px; + padding: 1px 4px; border: 1px solid #cccccc; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; + background: white; } .openerp img { vertical-align: middle; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 57c4f343713..be6f6b104a9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -135,9 +135,10 @@ $colour4: #8a89ba li list-style-type: none input, textarea, select - padding: 4px + padding: 1px 4px border: 1px solid #ccc @include radius(3px) + background: white img vertical-align: middle h4 -- cgit v1.2.3 From ed7b1d1b568e871a4e5591df3e5f301900909788 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jun 2012 11:41:06 +0200 Subject: [ADD] Added oe_link css class bzr revid: fme@openerp.com-20120627094106-sg0nk89obcjtlzpl --- addons/web/static/src/css/base.css | 32 ++++++++++++++++++++++++++++++++ addons/web/static/src/css/base.sass | 19 +++++++++++++++++++ 2 files changed, 51 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 72d89921cfd..20d7e46dd11 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -309,6 +309,38 @@ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); border: none; } +.openerp .oe_button.oe_link { + border: none; + padding: 0; + margin: 0; + background: none; + -moz-border-radius: none; + -webkit-border-radius: none; + border-radius: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp .oe_button.oe_link img { + display: none; +} +.openerp .oe_button.oe_link span { + border: none; + padding: 0; + margin: 0; + background: none; + -moz-border-radius: none; + -webkit-border-radius: none; + border-radius: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + color: #8a89ba; + font-weight: bold; +} +.openerp .oe_button.oe_link span:hover { + text-decoration: underline; +} .openerp.oe_tooltip { font-size: 12px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index cae493ea2e5..f42b527a500 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -27,6 +27,14 @@ $colour4: #8a89ba font-weight: normal font-style: normal +@mixin reset() + border: none + padding: 0 + margin: 0 + background: none + @include radius(none) + @include box-shadow(none) + @mixin vertical-gradient($startColor: #555, $endColor: #333) background-color: $startColor background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */ @@ -261,6 +269,17 @@ $colour4: #8a89ba @include radius(3px) @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) border: none + .oe_button.oe_link + @include reset() + img + display: none + span + @include reset() + color: #8A89BA + font-weight: bold + &:hover + text-decoration: underline + //.oe_edit_only  // }}} // Tooltips {{{ -- cgit v1.2.3 From ce7fb5bb37b969528d8cc24d5493163b492361a3 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jun 2012 16:12:49 +0200 Subject: [CHG] Ashes to ashes, dashes to underscores. bzr revid: fme@openerp.com-20120627141249-o10e2htxqtio72l7 --- addons/web/static/src/css/base.css | 54 +++++++++++++++---------------- addons/web/static/src/css/base.sass | 16 ++++----- addons/web/static/src/css/data_export.css | 2 +- addons/web/static/src/css/data_import.css | 12 +++---- 4 files changed, 42 insertions(+), 42 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 20d7e46dd11..d06c157696b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -20,7 +20,7 @@ font-style: normal; } -.openerp.openerp-web-client-container { +.openerp.openerp_webclient_container { height: 100%; position: relative; } @@ -1184,7 +1184,7 @@ .openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row:first-child td { padding-top: 8px; } -.openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { +.openerp .oe_popup_form > .oe_formview > .oe_form_pager { display: none !important; } .openerp .oe_searchview { @@ -1963,7 +1963,7 @@ width: 45px; height: 30px; } -.openerp .oe_hidden_input_file input.oe-binary-file { +.openerp .oe_hidden_input_file input.oe_form_binary_file { z-index: 0; line-height: 0; font-size: 12px; @@ -2004,7 +2004,7 @@ .openerp .oe_form_field_many2one td:first-child { position: relative; } -.openerp .oe_form_field_many2one span.oe-m2o-drop-down-button { +.openerp .oe_form_field_many2one span.oe_m2o_drop_down_button { position: absolute; top: 3px; right: 2px; @@ -2012,7 +2012,7 @@ .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } -.openerp .oe_form_field_one2many .oe-listview .oe-edit-row-save { +.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save { background-image: url(/web/static/src/img/iconset-b-remove.png); } .openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top { @@ -2033,28 +2033,28 @@ height: auto; line-height: 16px; } -.openerp .oe_form .oe_form_field_many2many > .oe-listview .oe_list_pager_single_page { +.openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { display: none; } -.openerp .oe-listview-content { +.openerp .oe_list_content { width: 100%; } -.openerp .oe-listview-content td:first-child:after, .openerp .oe-listview-content th:first-child:after { +.openerp .oe_list_content td:first-child:after, .openerp .oe_list_content th:first-child:after { border-width: 0; } -.openerp .oe-listview-content > thead { +.openerp .oe_list_content > thead { border-bottom: 2px solid #cacaca; background: #eeeeee; vertical-align: top; } -.openerp .oe-listview-content > thead th { +.openerp .oe_list_content > thead th { position: relative; } -.openerp .oe-listview-content td, .openerp .oe-listview-content th { +.openerp .oe_list_content td, .openerp .oe_list_content th { padding: 3px 6px; line-height: 18px; } -.openerp .oe-listview-content th:after { +.openerp .oe_list_content th:after { position: absolute; right: 6px; content: ""; @@ -2064,12 +2064,12 @@ border-color: black transparent; visibility: hidden; } -.openerp .oe-listview-content th.sortup:after { +.openerp .oe_list_content th.sortup:after { visibility: visible; filter: alpha(opacity=60); opacity: 0.6; } -.openerp .oe-listview-content th.sortdown:after { +.openerp .oe_list_content th.sortdown:after { border-bottom: none; border-left: 4px solid transparent; border-right: 4px solid transparent; @@ -2081,20 +2081,20 @@ filter: alpha(opacity=60); opacity: 0.6; } -.openerp .oe-listview-content > tbody { +.openerp .oe_list_content > tbody { cursor: pointer; background: white; } -.openerp .oe-listview-content > tbody > tr { +.openerp .oe_list_content > tbody > tr { border-top: 1px solid #dddddd; } -.openerp .oe-listview-content > tbody > tr > td.oe-field-cell { +.openerp .oe_list_content > tbody > tr > td.oe_list_field_cell { padding: 3px 6px; } -.openerp .oe-listview-content > tbody > tr > td, .openerp .oe-listview-content > tbody > tr > th { +.openerp .oe_list_content > tbody > tr > td, .openerp .oe_list_content > tbody > tr > th { line-height: 18px; } -.openerp .oe-listview-content > tbody > tr > td > button, .openerp .oe-listview-content > tbody > tr > th > button { +.openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button { border: none; background: transparent; padding: 0; @@ -2102,16 +2102,16 @@ -webkit-box-shadow: none; box-shadow: none; } -.openerp .oe-listview-content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe-listview-content > tbody > tr th.oe_list_checkbox:first-child { +.openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child { width: 17px; } -.openerp .oe-listview-content > tbody > tr > td.oe_list_checkbox:first-child:after, .openerp .oe-listview-content > tbody > tr th.oe_list_checkbox:first-child:after { +.openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child:after, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child:after { border-width: 0; } -.openerp .oe-listview-content > tbody > tr > td.oe_number { +.openerp .oe_list_content > tbody > tr > td.oe_number { text-align: right !important; } -.openerp .oe-listview-content > tbody > tr:nth-child(odd) { +.openerp .oe_list_content > tbody > tr:nth-child(odd) { background-color: #f0f0fa; background-color: #f0f0fa; background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); @@ -2121,13 +2121,13 @@ background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); } -.openerp .oe-listview-content > tfoot { +.openerp .oe_list_content > tfoot { border-top: 2px solid #cacaca; border-bottom: 1px solid #cacaca; background: #eeeeee; font-weight: bold; } -.openerp .oe-listview-content > tbody tr:hover td, .openerp .oe-listview-content tbody tr:hover th { +.openerp .oe_list_content > tbody tr:hover td, .openerp .oe_list_content tbody tr:hover th { background-color: #eeeeee; background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede)); background-image: -webkit-linear-gradient(top, #eeeeee, #dedede); @@ -2136,11 +2136,11 @@ background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede); } -.openerp .oe-listview-content .numeric { +.openerp .oe_list_content .numeric { text-align: right; width: 82px; } -.openerp .oe-listview-content .numeric input { +.openerp .oe_list_content .numeric input { text-align: right; } .openerp .oe_trad_field.touched { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f42b527a500..a0b29b1fc81 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -98,7 +98,7 @@ $colour4: #8a89ba // }}} -.openerp.openerp-web-client-container +.openerp.openerp_webclient_container height: 100% position: relative @@ -927,7 +927,7 @@ $colour4: #8a89ba padding-top: 8px // }}} // Viewmanager popup {{{ - .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager + .oe_popup_form > .oe_formview > .oe_form_pager display: none !important // }}} // SearchView {{{ @@ -1539,7 +1539,7 @@ $colour4: #8a89ba display: inline-block width: 45px height: 30px - input.oe-binary-file + input.oe_form_binary_file z-index: 0 line-height: 0 font-size: 12px @@ -1577,7 +1577,7 @@ $colour4: #8a89ba .oe_form_field_many2one td:first-child position: relative - span.oe-m2o-drop-down-button + span.oe_m2o_drop_down_button position: absolute top: 3px right: 2px @@ -1588,7 +1588,7 @@ $colour4: #8a89ba display: none .oe_form_field_one2many // TODO: oe_form_field_one2many_list? - .oe-listview .oe-edit-row-save + .oe_list .oe_list_edit_row_save background-image: url(/web/static/src/img/iconset-b-remove.png) &> .oe_view_manager @@ -1608,12 +1608,12 @@ $colour4: #8a89ba line-height: 16px // }}} // FormView.many2many {{{ - .oe_form .oe_form_field_many2many > .oe-listview + .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page display: none // }}} // ListView {{{ - .oe-listview-content + .oe_list_content width: 100% td:first-child, th:first-child &:after @@ -1652,7 +1652,7 @@ $colour4: #8a89ba background: white > tr border-top: 1px solid #ddd - > td.oe-field-cell + > td.oe_list_field_cell padding: 3px 6px > td, > th line-height: 18px diff --git a/addons/web/static/src/css/data_export.css b/addons/web/static/src/css/data_export.css index 149fcea81e6..3fa24265b45 100644 --- a/addons/web/static/src/css/data_export.css +++ b/addons/web/static/src/css/data_export.css @@ -1,4 +1,4 @@ -.openerp .oe-export { +.openerp .oe_export { width: 100%; } .openerp .oe_export_row tr{ diff --git a/addons/web/static/src/css/data_import.css b/addons/web/static/src/css/data_import.css index a63a52802f0..47cd52aa081 100644 --- a/addons/web/static/src/css/data_import.css +++ b/addons/web/static/src/css/data_import.css @@ -12,22 +12,22 @@ border-bottom: 1px solid #E3E3E3; } -.openerp .oe-import-no-result .oe-import-result { +.openerp .oe_import_no_result .oe_import_result { display: none; } -.openerp .oe-import fieldset { +.openerp .oe_import fieldset { cursor: pointer; } -.openerp .oe-import fieldset legend:before { +.openerp .oe_import fieldset legend:before { content: '\25BC '; } -.openerp .oe-import fieldset.oe-closed legend:before { +.openerp .oe_import fieldset.oe_closed legend:before { content: '\25B6 '; } -.openerp .oe-import fieldset.oe-closed table { +.openerp .oe_import fieldset.oe_closed table { display: none; } -.openerp .oe-import .separator.horizontal { +.openerp .oe_import .separator.horizontal { font-weight: bold; border-bottom-width: 1px; margin: 6px 4px 6px 1px; -- cgit v1.2.3 From 94f6eec2ab99bd2cfac9e0a39ac583d902422636 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 27 Jun 2012 16:32:28 +0200 Subject: [BREAK] editable list view * Introduce overlay form on row edition * Broken save * Broken cancel * (probably) broken o2m * Broken create bzr revid: xmo@openerp.com-20120627143228-qku9ku3zo6k59r0f --- addons/web/static/src/css/base.css | 9 +++++++++ addons/web/static/src/css/base.sass | 8 ++++++++ 2 files changed, 17 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 a59f16faea9..41d48432559 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1999,6 +1999,15 @@ .openerp .oe_form .oe_form_field_many2many > .oe-listview .oe_list_pager_single_page { display: none; } +.openerp .oe-listview { + position: relative; +} +.openerp .oe-listview .oe_form .oe_form_field { + width: auto; + position: absolute; + margin: 0 !important; + padding: 0; +} .openerp .oe-listview-content { width: 100%; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 57c4f343713..7135b474aa3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1588,6 +1588,14 @@ $colour4: #8a89ba display: none // }}} // ListView {{{ + .oe-listview + position: relative + .oe_form .oe_form_field + width: auto + position: absolute + margin: 0 !important // dammit + padding: 0 + .oe-listview-content width: 100% td:first-child, th:first-child -- cgit v1.2.3 From c5c08808f73152557577a47dd9c3eef19871f116 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 28 Jun 2012 09:41:23 +0200 Subject: [IMP] Improved topbar dropdown css bzr revid: fme@openerp.com-20120628074123-et65mt93rq9tc9ri --- 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 d06c157696b..543e701b5d9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -779,6 +779,7 @@ border-top: 4px solid white; } .openerp .oe_topbar .oe_dropdown_menu { + top: 32px; background: #333333; background: rgba(37, 37, 37, 0.9); border-color: #999999; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a0b29b1fc81..018b4088ee0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -612,6 +612,7 @@ $colour4: #8a89ba .oe_dropdown_arrow:after border-top: 4px solid white .oe_dropdown_menu + top: 32px background: #333 background: rgba(37,37,37,0.9) border-color: #999 -- cgit v1.2.3 From 693ec72528d0bda2b254f5ca64e656755690a6b2 Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Thu, 28 Jun 2012 17:16:09 +0530 Subject: added a bounce effect when On non editable page view, if click on the content of a field, bounce the Edit button bzr revid: pan@tinyerp.com-20120628114609-xmj17x8t2pymftcf --- addons/web/static/src/css/base.css | 3 +++ 1 file changed, 3 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 d06c157696b..2f4111882c4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2216,3 +2216,6 @@ .kitten-mode-activated > * { opacity: 0.7; } +.openerp .bounce { + float:left; +} -- cgit v1.2.3 From 89b2b1e3072f950c1e93ba9dc217819326904557 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 28 Jun 2012 16:32:52 +0200 Subject: [CHG] Applied new rules to oe_highlight. Added action.target to oe_view_manager class oe_highlight depend on target of the action current: readonly: red, editmode: dont apply inline : always red new: always red and save is always red (so no dirty anymore but keep the class just in case) bzr revid: fme@openerp.com-20120628143252-r9jxckyet9v1qn1l --- addons/web/static/src/css/base.css | 16 ++++++++-------- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 10 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 543e701b5d9..2bcb8d1ac3d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1162,10 +1162,10 @@ .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_diagram:after { content: "f"; } -.openerp .oe_view_manager_global { +.openerp .oe_view_manager_current, .openerp .oe_view_manager_inline { height: 100%; } -.openerp .oe_view_manager_global > .oe_view_manager_header { +.openerp .oe_view_manager_current > .oe_view_manager_header, .openerp .oe_view_manager_inline > .oe_view_manager_header { border-top: 1px solid #cacaca; border-bottom: 1px solid #cacaca; background-color: #fcfcfc; @@ -1179,10 +1179,10 @@ -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); } -.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row td { +.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row td, .openerp .oe_view_manager_inline > .oe_view_manager_header .oe_header_row td { padding: 8px; } -.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row:first-child td { +.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row:first-child td, .openerp .oe_view_manager_inline > .oe_view_manager_header .oe_header_row:first-child td { padding-top: 8px; } .openerp .oe_popup_form > .oe_formview > .oe_form_pager { @@ -1566,11 +1566,11 @@ background-color: #ff6666 !important; border: 1px solid #dd0000 !important; } -.openerp .oe_form_editable .oe_highlight { +.openerp .oe_view_manager_current .oe_form_editable .oe_highlight { color: #404040; background: none; } -.openerp .oe_form_editable button.oe_highlight { +.openerp .oe_view_manager_current .oe_form_editable button.oe_highlight { background-color: #efefef; background-image: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8)); background-image: -webkit-linear-gradient(top, #efefef, #d8d8d8); @@ -1582,7 +1582,7 @@ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; } -.openerp .oe_form_editable button.oe_highlight:active { +.openerp .oe_view_manager_current .oe_form_editable button.oe_highlight:active { background-color: #e3e3e3; background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)); background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6); @@ -1594,7 +1594,7 @@ -webkit-box-shadow: none; box-shadow: none; } -.openerp .oe_form_editable button.oe_highlight:hover { +.openerp .oe_view_manager_current .oe_form_editable button.oe_highlight:hover { background-color: #f6f6f6; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 018b4088ee0..116ca3c2ca2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -913,7 +913,7 @@ $colour4: #8a89ba content: "f" // }}} // ViewManager application {{{ - .oe_view_manager_global + .oe_view_manager_current, .oe_view_manager_inline height: 100% > .oe_view_manager_header border-top: 1px solid #cacaca @@ -1241,7 +1241,7 @@ $colour4: #8a89ba input, select, textarea background-color: #F66 !important border: 1px solid #D00 !important - .oe_form_editable + .oe_view_manager_current .oe_form_editable .oe_highlight color: #404040 background: none -- cgit v1.2.3 From 3f6307bc0d39e17887c900a7e79a531ef3458a41 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 28 Jun 2012 16:57:19 +0200 Subject: [FIX] unfuck editable o2m icon in last cell bzr revid: xmo@openerp.com-20120628145719-vnbhicr1bxw9bwye --- addons/web/static/src/css/base.css | 8 +++++++- addons/web/static/src/css/base.sass | 6 +++++- 2 files changed, 12 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 2bcb8d1ac3d..8df712d88d1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2014,7 +2014,10 @@ display: none; } .openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save { - background-image: url(/web/static/src/img/iconset-b-remove.png); + background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat; +} +.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save:before { + visibility: hidden; } .openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top { display: none; @@ -2144,6 +2147,9 @@ .openerp .oe_list_content .numeric input { text-align: right; } +.openerp .oe_list_content .oe_list_edit_row_save:before { + content: "S"; +} .openerp .oe_trad_field.touched { border: 1px solid green !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 116ca3c2ca2..2846ce7235d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1590,7 +1590,9 @@ $colour4: #8a89ba .oe_form_field_one2many // TODO: oe_form_field_one2many_list? .oe_list .oe_list_edit_row_save - background-image: url(/web/static/src/img/iconset-b-remove.png) + background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat + &:before + visibility: hidden &> .oe_view_manager .oe_header_row_top @@ -1685,6 +1687,8 @@ $colour4: #8a89ba width: 82px input text-align: right + .oe_list_edit_row_save:before + content: "S" // }}} // Translation {{{ .oe_trad_field.touched -- cgit v1.2.3 From e748c3d4cf18eb3e8defde43f46ee3eeeff0404c Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Fri, 29 Jun 2012 12:52:48 +0530 Subject: improoved code for [added a bounce effect when On non editable page view, if click on the content of a field, bounce the Edit button] bzr revid: pan@tinyerp.com-20120629072248-kb0vfjjo707l8vaj --- addons/web/static/src/css/base.css | 5 +---- 1 file changed, 1 insertion(+), 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 2f4111882c4..f738fe757ac 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2215,7 +2215,4 @@ } .kitten-mode-activated > * { opacity: 0.7; -} -.openerp .bounce { - float:left; -} +} \ No newline at end of file -- cgit v1.2.3 From b864de994b689d07270d1fec24c72106c116cf43 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 29 Jun 2012 18:06:06 +0200 Subject: Many small improvements to Kanban view bzr revid: mit@openerp.com-20120629160606-8dyxa381pm3xcde6 --- addons/web/static/src/css/base.css | 6 ++---- addons/web/static/src/css/base.sass | 5 ++--- 2 files changed, 4 insertions(+), 7 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 986539e5555..db152e391ad 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -950,10 +950,8 @@ border-right: 4px solid transparent; border-top: 4px solid #4c4c4c; } -.openerp .oe_application { - width: 100%; -} .openerp .oe_application a { + width: 100%; color: #8a89ba; } .openerp .oe_application a:hover { @@ -1158,7 +1156,7 @@ .openerp .oe_searchview input, .openerp .oe_searchview textarea { padding: 3px; height: 14px; - font-size: 11px; + font-size: 12px; line-height: 18px; } .openerp .oe_searchview.oe_focused { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 389490bcd0a..85d22c20809 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -363,7 +363,6 @@ $colour4: #8a89ba border-right: 4px solid transparent border-top: 4px solid#404040 @include opacity(0.5) - .oe_sidebar white-space: nowrap .oe_dropdown_menu @@ -755,8 +754,8 @@ $colour4: #8a89ba // }}} // ActionManager {{{ .oe_application - width: 100% a + width: 100% color: $colour4 &:hover text-decoration: underline @@ -917,7 +916,7 @@ $colour4: #8a89ba input, textarea padding: 3px height: 14px - font-size: 11px + font-size: 12px line-height: 18px &.oe_focused border-color: $facets-border-selected -- cgit v1.2.3 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 5fa4fb68a53496e66002941b6487b0675404a02c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 2 Jul 2012 17:53:47 +0200 Subject: [IMP?] jQuery UI dialog: Could we use single div solution ? Let's Minh decide... bzr revid: fme@openerp.com-20120702155347-1hq7v03k4reamgpn --- addons/web/static/src/css/base.css | 11 +++++++++++ addons/web/static/src/css/base.sass | 8 ++++++++ 2 files changed, 19 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..cf84870047d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -186,6 +186,17 @@ .openerp .ui-menu .ui-menu-item a.ui-state-active { background: #f0f0fa; } +.openerp.ui-dialog { + border: 13px solid rgba(0, 0, 0, 0.3); + -moz-border-radius: 16px; + -webkit-border-radius: 16px; + border-radius: 16px; + -moz-background-clip: padding-box; + -webkit-background-clip: padding; + background-clip: padding-box; + box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.6); + -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2); +} .openerp .oe_i { font-family: "mnmliconsRegular" !important; font-size: 21px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2846ce7235d..93a1b2cf289 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -200,6 +200,14 @@ $colour4: #8a89ba width: auto a.ui-state-active background: #f0f0fa + &.ui-dialog + border: 13px solid rgba(0, 0, 0, 0.3) + @include radius(16px) + -moz-background-clip: padding-box + -webkit-background-clip: padding + background-clip: padding-box + box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.6) + -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2) // }}} // Generic classes {{{ .oe_i -- cgit v1.2.3 From dc902a89fb78caf41aebc403eaed5a2723fed56c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 2 Jul 2012 23:34:48 +0200 Subject: [FIX] inline mode hide view manager, fix nosheet margins bzr revid: al@openerp.com-20120702213448-2gphmpsen8imtgvx --- addons/web/static/src/css/base.css | 24 +++++++++++++++++------- addons/web/static/src/css/base.sass | 17 +++++++++++++---- 2 files changed, 30 insertions(+), 11 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 cf84870047d..68fdbc8a215 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1173,10 +1173,10 @@ .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_diagram:after { content: "f"; } -.openerp .oe_view_manager_current, .openerp .oe_view_manager_inline { +.openerp .oe_view_manager_current { height: 100%; } -.openerp .oe_view_manager_current > .oe_view_manager_header, .openerp .oe_view_manager_inline > .oe_view_manager_header { +.openerp .oe_view_manager_current > .oe_view_manager_header { border-top: 1px solid #cacaca; border-bottom: 1px solid #cacaca; background-color: #fcfcfc; @@ -1190,12 +1190,18 @@ -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); } -.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row td, .openerp .oe_view_manager_inline > .oe_view_manager_header .oe_header_row td { +.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row td { padding: 8px; } -.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row:first-child td, .openerp .oe_view_manager_inline > .oe_view_manager_header .oe_header_row:first-child td { +.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row:first-child td { padding-top: 8px; } +.openerp .oe_view_manager_inline { + height: 100%; +} +.openerp .oe_view_manager_inline > .oe_view_manager_header { + display: none; +} .openerp .oe_popup_form > .oe_formview > .oe_form_pager { display: none !important; } @@ -1623,9 +1629,13 @@ .openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty { display: none !important; } -.openerp .oe_form_nosheet > *:not(header) { - margin-left: 10px !important; - margin-right: 10px !important; +.openerp .oe_form_nosheet { + margin-left: 10px; + margin-right: 10px; +} +.openerp .oe_form_nosheet > header { + margin-left: -10px; + margin-right: -10px; } .openerp .oe_form header { position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 93a1b2cf289..395b9dd694b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -921,7 +921,7 @@ $colour4: #8a89ba content: "f" // }}} // ViewManager application {{{ - .oe_view_manager_current, .oe_view_manager_inline + .oe_view_manager_current height: 100% > .oe_view_manager_header border-top: 1px solid #cacaca @@ -935,6 +935,12 @@ $colour4: #8a89ba td padding-top: 8px // }}} + // ViewManager inline {{{ + .oe_view_manager_inline + height: 100% + > .oe_view_manager_header + display: none + // }}} // Viewmanager popup {{{ .oe_popup_form > .oe_formview > .oe_form_pager display: none !important @@ -1267,9 +1273,12 @@ $colour4: #8a89ba .oe_form_readonly .oe_edit_only, .oe_form_field:empty display: none !important - .oe_form_nosheet > *:not(header) - margin-left: 10px !important - margin-right: 10px !important + .oe_form_nosheet + margin-left: 10px + margin-right: 10px + .oe_form_nosheet > header + margin-left: -10px + margin-right: -10px // }}} // FormView.custom tags and classes {{{ .oe_form -- cgit v1.2.3 From 72ba5b724686c38113aa649ed01a5e8071d96dbf Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 3 Jul 2012 08:07:35 +0200 Subject: [IMP] improved CSS for oe_title bzr revid: fp@tinyerp.com-20120703060735-l2x8pkgxr6cv6j7k --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 3 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 68fdbc8a215..d6212b64739 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; @@ -294,7 +294,7 @@ background: #ed6f6a; } .openerp .oe_title { - width: 55%; + width: 60%; } .openerp .oe_title:after { content: "."; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 395b9dd694b..3010de3f675 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -260,7 +260,7 @@ $colour4: #8a89ba &:hover background: #ED6F6A .oe_title - width: 55% + width: 60% .oe_title:after content: "." display: block -- cgit v1.2.3 From ae6c6eb8ec1a00071045581f45be754783160b72 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 3 Jul 2012 12:27:50 +0200 Subject: [ADD] save button instead of selector during edition bzr revid: xmo@openerp.com-20120703102750-1vmoljtbrnnl3lzo --- addons/web/static/src/css/base.css | 14 ++++++++++++++ addons/web/static/src/css/base.sass | 9 +++++++-- 2 files changed, 21 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 41d48432559..6061113642a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2115,6 +2115,20 @@ .openerp .oe-listview-content .numeric input { text-align: right; } +.openerp .oe-listview-content tr.oe_edition th.oe-record-selector { + padding: 0 6px; + font-size: 1px; + letter-spacing: -1px; + color: transparent; +} +.openerp .oe-listview-content tr.oe_edition th.oe-record-selector:before { + font: 21px "mnmliconsRegular"; + content: "S"; + color: #404040; +} +.openerp .oe-listview-content tr.oe_edition th.oe-record-selector input { + display: none; +} .openerp .oe_trad_field.touched { border: 1px solid green !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 7135b474aa3..a55d1155859 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -83,9 +83,8 @@ $colour4: #8a89ba letter-spacing: -1px color: transparent &:before - font-family: "mnmliconsRegular" + font: 21px "mnmliconsRegular" content: $icon-name - font-size: 20px color: $color // }}} @@ -1667,6 +1666,12 @@ $colour4: #8a89ba width: 82px input text-align: right + + tr.oe_edition th.oe-record-selector + padding: 0 6px + @include text-to-icon("S") + input + display: none // }}} // Translation {{{ .oe_trad_field.touched -- 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 d26b36480b6908a0bbb2016bf914e91cea648249 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Wed, 4 Jul 2012 11:21:06 +0530 Subject: [IMP]Improve code for Bounce effect in listview bzr revid: ggh@tinyerp.com-20120704055106-r3yuhcvadpel9mhy --- addons/web/static/src/css/base.css | 4 ++++ 1 file 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 f738fe757ac..00ecab65951 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2215,4 +2215,8 @@ } .kitten-mode-activated > * { opacity: 0.7; +} +.openerp .oe_bounce_button_left { + float: left; + margin-right: 4px; } \ No newline at end of file -- cgit v1.2.3 From 9d908a38faa05716bb45c379ce63d6fe028982e6 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 5 Jul 2012 13:58:47 +0200 Subject: various improvements to design bzr revid: mit@openerp.com-20120705115847-5oncw7ynqxs5m9ig --- addons/web/static/src/css/base.css | 25 +++++++++++++++++++------ addons/web/static/src/css/base.sass | 21 +++++++++++++++++---- 2 files changed, 36 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 39dc2fa86f8..443563a096b 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"); @@ -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; @@ -352,6 +352,19 @@ .openerp .oe_button.oe_link span:hover { text-decoration: underline; } +.openerp .oe_star_on, .openerp .oe_star_off { + color: #cccccc; + text-shadow: 0 0 2px black; + vertical-align: top; + position: relative; + top: -5px; +} +.openerp .oe_star_on:hover, .openerp .oe_star_off:hover { + text-decoration: none; +} +.openerp .oe_star_on { + color: gold; +} .openerp.oe_tooltip { font-size: 12px; } @@ -446,12 +459,12 @@ .openerp .oe_dropdown_menu { display: none; position: absolute; - top: 28px; + top: 32px; z-index: 1; border: 1px solid #afafb6; background: white; - padding: 8px; - min-width: 120px; + padding: 6px 0; + min-width: 140px; text-align: left; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -481,7 +494,7 @@ .openerp .oe_dropdown_menu > li > a { white-space: nowrap; display: block; - padding: 3px 6px; + padding: 4px 15px; color: #4c4c4c; text-decoration: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0612d8dd3a0..61b7d267551 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -287,6 +287,18 @@ $colour4: #8a89ba font-weight: bold &:hover text-decoration: underline + .oe_star_on, .oe_star_off + color: #cccccc + text-shadow: 0 0 2px black + vertical-align: top + position: relative + top: -5px + + .oe_star_on:hover, .oe_star_off:hover + text-decoration: none + + .oe_star_on + color: gold //.oe_edit_only  // }}} @@ -363,12 +375,12 @@ $colour4: #8a89ba .oe_dropdown_menu display: none position: absolute - top: 28px + top: 32px z-index: 1 border: 1px solid #afafb6 background: white - padding: 8px - min-width: 120px + padding: 6px 0 + min-width: 140px text-align: left @include radius(3px) @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) @@ -383,7 +395,7 @@ $colour4: #8a89ba > a white-space: nowrap display: block - padding: 3px 6px + padding: 4px 15px color: #4c4c4c text-decoration: none &:hover @@ -637,6 +649,7 @@ $colour4: #8a89ba &:hover @include vertical-gradient(#292929, #191919) @include box-shadow(none) + // }}} // Webclient.leftbar {{{ .oe_leftbar -- cgit v1.2.3 From 8eac49ea96e4140ec319affb55c75e96e19e4978 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 5 Jul 2012 15:20:03 +0200 Subject: [IMP] white background bzr revid: fp@tinyerp.com-20120705132003-palqn02yh8gq6535 --- addons/web/static/src/css/base.css | 5 ++--- addons/web/static/src/css/base.sass | 1 - 2 files changed, 2 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 443563a096b..416d92672c6 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"); @@ -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; @@ -2126,7 +2126,6 @@ } .openerp .oe_list_content > tbody { cursor: pointer; - background: white; } .openerp .oe_list_content > tbody > tr { border-top: 1px solid #dddddd; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 61b7d267551..586bdd7eece 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1683,7 +1683,6 @@ $colour4: #8a89ba @include opacity(0.6) > tbody cursor: pointer - background: white > tr border-top: 1px solid #ddd > td.oe_list_field_cell -- cgit v1.2.3 From edf61ae586625906a15c6708d4561cb6c51590e8 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 5 Jul 2012 15:41:53 +0200 Subject: [IMP] original width of minh mockup bzr revid: fp@tinyerp.com-20120705134153-mxz87km72zos9idd --- 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 416d92672c6..ac767243e75 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1743,7 +1743,7 @@ } .openerp .oe_application .oe_form_sheet_width { min-width: 650px; - max-width: 960px; + max-width: 860px; margin: 0 auto; } .openerp .oe_application .oe_form_sheet { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 586bdd7eece..cdb14123666 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1362,7 +1362,7 @@ $colour4: #8a89ba border-bottom: 1px solid #ddd .oe_form_sheet_width min-width: 650px - max-width: 960px + max-width: 860px margin: 0 auto .oe_form_sheet background: white -- cgit v1.2.3 From f323d4209d818b944e894024fa97d192f011ba9e Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 6 Jul 2012 09:30:30 +0200 Subject: [IMP] width of sheet in a variable bzr revid: fp@tinyerp.com-20120706073030-dejwb1d37cmjm738 --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 5 +++-- 2 files changed, 4 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 ac767243e75..863dbb80044 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1674,7 +1674,7 @@ } .openerp .oe_form footer { min-width: 650px; - max-width: 960px; + max-width: 860px; margin: 0 auto; } .openerp ul.oe_form_steps { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index cdb14123666..be1e8b6c08e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -6,6 +6,7 @@ $facets-border: #afafb6 $facets-border-selected: #a6a6fe $hover-background: #f0f0fa $colour4: #8a89ba +$sheet-max-width: 860px // }}} // Mixins {{{ @font-face @@ -1307,7 +1308,7 @@ $colour4: #8a89ba float: right footer min-width: 650px - max-width: 960px + max-width: $sheet-max-width margin: 0 auto ul.oe_form_steps height: 30px @@ -1362,7 +1363,7 @@ $colour4: #8a89ba border-bottom: 1px solid #ddd .oe_form_sheet_width min-width: 650px - max-width: 860px + max-width: $sheet-max-width margin: 0 auto .oe_form_sheet background: white -- cgit v1.2.3 From 0267ed32bbb7ed75246e48e2ab28af0912e0387f Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 6 Jul 2012 18:43:57 +0200 Subject: Many improvements bzr revid: mit@openerp.com-20120706164357-c6p6z3ytoqbhmjjn --- addons/web/static/src/css/base.css | 108 ++++++++++++++++++++++++++++++++---- addons/web/static/src/css/base.sass | 103 +++++++++++++++++++++++++++------- 2 files changed, 180 insertions(+), 31 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 443563a096b..7bc210298db 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -91,7 +91,7 @@ list-style-type: none; } .openerp input, .openerp textarea, .openerp select { - padding: 1px 4px; + padding: 2px 4px; border: 1px solid #cccccc; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -187,15 +187,97 @@ background: #f0f0fa; } .openerp.ui-dialog { - border: 13px solid rgba(0, 0, 0, 0.3); - -moz-border-radius: 16px; - -webkit-border-radius: 16px; - border-radius: 16px; + 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; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; + -moz-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6); + -webkit-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6); + box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6); + -webkit-background-clip: padding-box; -moz-background-clip: padding-box; - -webkit-background-clip: padding; background-clip: padding-box; - box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.6); - -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2); +} +.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane { + padding: 16px; +} +.openerp.ui-dialog .ui-dialog-titlebar { + border-bottom: 1px solid #cacaca; + -moz-border-radius: 2px 2px 0 0; + -webkit-border-radius: 2px 2px 0 0; + border-radius: 2px 2px 0 0; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); +} +.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title { + margin: 0; + padding: 0; +} +.openerp.ui-dialog .ui-widget-header { + border: none; +} +.openerp.ui-dialog .ui-dialog-content { + background: white; +} +.openerp.ui-dialog .ui-dialog-buttonpane { + border-top: 1px solid #e0e0e0; + background: #f5f7f9; + padding: 8px; + margin: 0; + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp.ui-dialog .ui-dialog-buttonpane button { + margin-left: 8px; +} +.openerp.ui-dialog .ui-dialog-titlebar-close { + padding: 0; +} +.openerp.ui-dialog .ui-dialog-titlebar-close .ui-icon-closethick { + display: none; +} +.openerp.ui-dialog .ui-dialog-titlebar-close:before { + content: "×"; + font-size: 18px; + font-weight: bold; + line-height: 16px; + color: black; + text-shadow: 0 1px 0 white; + padding: 0; + cursor: pointer; + background: transparent; + border: 0; +} +.openerp.ui-dialog .ui-dialog-titlebar-close:before:hover { + color: black; + text-decoration: none; +} +.openerp .modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1040; + background-color: black; + filter: alpha(opacity=30); + opacity: 0.3; } .openerp .oe_i { font-family: "mnmliconsRegular" !important; @@ -352,17 +434,17 @@ .openerp .oe_button.oe_link span:hover { text-decoration: underline; } -.openerp .oe_star_on, .openerp .oe_star_off { +.openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off { color: #cccccc; text-shadow: 0 0 2px black; vertical-align: top; position: relative; top: -5px; } -.openerp .oe_star_on:hover, .openerp .oe_star_off:hover { +.openerp .oe_webclient .oe_star_on:hover, .openerp .oe_webclient .oe_star_off:hover { text-decoration: none; } -.openerp .oe_star_on { +.openerp .oe_webclient .oe_star_on { color: gold; } .openerp.oe_tooltip { @@ -453,6 +535,10 @@ position: relative; cursor: pointer; } +.openerp .oe_dropdown_toggle { + color: #888888; + font-weight: normal; +} .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { display: block; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 61b7d267551..d5d271fe07d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -143,7 +143,7 @@ $colour4: #8a89ba li list-style-type: none input, textarea, select - padding: 1px 4px + padding: 2px 4px border: 1px solid #ccc @include radius(3px) background: white @@ -200,14 +200,75 @@ $colour4: #8a89ba width: auto a.ui-state-active background: #f0f0fa + + // Modal box &.ui-dialog - border: 13px solid rgba(0, 0, 0, 0.3) - @include radius(16px) - -moz-background-clip: padding-box - -webkit-background-clip: padding - background-clip: padding-box - box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.6) - -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2) + 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 + border-color: #888 #555 #444 + //overflow: hidden + @include radius(8px) + @include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6)) + @include background-clip() + .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane + padding: 16px + .ui-dialog-titlebar + border-bottom: 1px solid #cacaca + @include radius(2px 2px 0 0) + @include vertical-gradient(#FCFCFC, #DEDEDE) + .ui-dialog-title + margin: 0 + padding: 0 + .ui-widget-header + border: none + .ui-dialog-content + background: white + .ui-dialog-buttonpane + border-top: 1px solid #e0e0e0 + background: #f5f7f9 + padding: 8px + margin: 0 + @include radius(0 0 2px 2px) + button + margin-left: 8px + .ui-dialog-titlebar-close + padding: 0 + .ui-icon-closethick + display: none + &:before + content: "×" + font-size: 18px + font-weight: bold + line-height: 16px + color: black + text-shadow: 0 1px 0 white + padding: 0 + cursor: pointer + background: transparent + border: 0 + &:hover + color: black + text-decoration: none + + .modal-backdrop + position: fixed + top: 0 + right: 0 + bottom: 0 + left: 0 + z-index: 1040 + background-color: black + @include opacity(.3) + // }}} // Generic classes {{{ .oe_i @@ -287,18 +348,17 @@ $colour4: #8a89ba font-weight: bold &:hover text-decoration: underline - .oe_star_on, .oe_star_off - color: #cccccc - text-shadow: 0 0 2px black - vertical-align: top - position: relative - top: -5px - - .oe_star_on:hover, .oe_star_off:hover - text-decoration: none - - .oe_star_on - color: gold + .oe_webclient + .oe_star_on, .oe_star_off + color: #cccccc + text-shadow: 0 0 2px black + vertical-align: top + position: relative + top: -5px + .oe_star_on:hover, .oe_star_off:hover + text-decoration: none + .oe_star_on + color: gold //.oe_edit_only  // }}} @@ -370,6 +430,9 @@ $colour4: #8a89ba .oe_dropdown, .oe_dropdown_hover, .oe_dropdown_toggle position: relative cursor: pointer + .oe_dropdown_toggle + color: #888 + font-weight: normal .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened display: block .oe_dropdown_menu -- 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 fe368d23c872c3db942ec2bdb6cc8a17423df6ae Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 10 Jul 2012 09:31:45 +0200 Subject: [IMP] padding between groups in forms bzr revid: fp@tinyerp.com-20120710073145-l0rmppe2d7mpterz --- addons/web/static/src/css/base.css | 5 ++++- addons/web/static/src/css/base.sass | 5 ++++- 2 files changed, 8 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 1425162d833..848886dde0c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1857,12 +1857,15 @@ min-width: 120px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { - padding-left: 8px; + padding-left: 4px; } .openerp .oe_form .oe_form_group { width: 100%; margin: 4px 0 4px 0; } +.openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td { + padding-left: 12px; +} .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; white-space: nowrap; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 82ed305a275..e789d116e95 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1449,10 +1449,13 @@ $sheet-max-width: 860px display: block min-width: 120px td.oe_form_group_cell + .oe_form_group_cell - padding-left: 8px + padding-left: 4px .oe_form_group width: 100% margin: 4px 0 4px 0 + .oe_group_right + > tbody > tr > td + padding-left: 12px // }}} // FormView.label {{{ .oe_form -- cgit v1.2.3 From 597835db3c790a8ac4c8fb68650a712172ca3631 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 10 Jul 2012 09:49:46 +0200 Subject: [IMP] form layout bzr revid: fp@tinyerp.com-20120710074946-llxeomd8o5e83y9i --- addons/web/static/src/css/base.css | 7 +++++-- addons/web/static/src/css/base.sass | 6 ++++-- 2 files changed, 9 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 848886dde0c..a87b6814ec6 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1733,6 +1733,9 @@ .openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty { display: none !important; } +.openerp .oe_form_readonly .oe_form .oe_form_field_date { + width: auto; +} .openerp .oe_form_nosheet { margin-left: 10px; margin-right: 10px; @@ -1863,7 +1866,7 @@ width: 100%; margin: 4px 0 4px 0; } -.openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td { +.openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td:first-child { padding-left: 12px; } .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { @@ -1965,7 +1968,7 @@ width: 180px; } .openerp .oe_form .oe_form_field_date { - width: 7em; + width: 7.5em; } .openerp .oe_form .oe_form_field_datetime { width: 11em; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e789d116e95..da1acbe2a5a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1351,6 +1351,8 @@ $sheet-max-width: 860px .oe_form_readonly .oe_edit_only, .oe_form_field:empty display: none !important + .oe_form .oe_form_field_date + width: auto .oe_form_nosheet margin-left: 10px margin-right: 10px @@ -1454,7 +1456,7 @@ $sheet-max-width: 860px width: 100% margin: 4px 0 4px 0 .oe_group_right - > tbody > tr > td + > tbody > tr > td:first-child padding-left: 12px // }}} // FormView.label {{{ @@ -1538,7 +1540,7 @@ $sheet-max-width: 860px .oe_form_field_float width: 180px .oe_form_field_date - width: 7em + width: 7.5em .oe_form_field_datetime width: 11em input[type="text"], input[type="password"], input[type="file"], select -- cgit v1.2.3 From 6917d464c9d185818d1eae3cb35a6706b57f7d86 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 10 Jul 2012 09:50:54 +0200 Subject: [IMP] form layout bzr revid: fp@tinyerp.com-20120710075054-ftlm3g69yrsgni1u --- 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 a87b6814ec6..faab67f4703 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1867,7 +1867,7 @@ margin: 4px 0 4px 0; } .openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td:first-child { - padding-left: 12px; + padding-left: 18px; } .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index da1acbe2a5a..e0d5847c7d8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1457,7 +1457,7 @@ $sheet-max-width: 860px margin: 4px 0 4px 0 .oe_group_right > tbody > tr > td:first-child - padding-left: 12px + padding-left: 18px // }}} // FormView.label {{{ .oe_form -- cgit v1.2.3 From 2e02a7ab0bbf567b82b112f998ca02d0bdb87c20 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 10 Jul 2012 09:57:53 +0200 Subject: [IMP] form css bzr revid: fp@tinyerp.com-20120710075753-l922o72cghj9f0f3 --- 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 faab67f4703..36d26d10741 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1860,7 +1860,7 @@ min-width: 120px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { - padding-left: 4px; + padding-left: 6px; } .openerp .oe_form .oe_form_group { width: 100%; @@ -1872,7 +1872,7 @@ .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; white-space: nowrap; - padding-right: 8px; + padding-right: 6px; } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e0d5847c7d8..2ba3b79c411 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1451,7 +1451,7 @@ $sheet-max-width: 860px display: block min-width: 120px td.oe_form_group_cell + .oe_form_group_cell - padding-left: 4px + padding-left: 6px .oe_form_group width: 100% margin: 4px 0 4px 0 @@ -1464,7 +1464,7 @@ $sheet-max-width: 860px .oe_form_label_help[for], .oe_form_label[for] font-weight: bold white-space: nowrap - padding-right: 8px + padding-right: 6px span font-size: 80% color: darkGreen -- 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 46da3547cabfeb8e8ab3c501f2049c2046a9bcb3 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 10 Jul 2012 16:32:28 +0200 Subject: [IMP] move saving a row from per-row buttons to a single global button replacing [Create] bzr revid: xmo@openerp.com-20120710143228-mqfuaxw894x9khkc --- addons/web/static/src/css/base.css | 23 +++++++++-------------- addons/web/static/src/css/base.sass | 15 +++++++++------ 2 files changed, 18 insertions(+), 20 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 6061113642a..8a2020cba47 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1999,6 +1999,15 @@ .openerp .oe_form .oe_form_field_many2many > .oe-listview .oe_list_pager_single_page { display: none; } +.openerp .oe_list_buttons .oe_list_save { + display: none; +} +.openerp .oe_list_buttons.oe_editing .oe_list_add, .openerp .oe_list_buttons.oe_editing .oe_alternative { + display: none; +} +.openerp .oe_list_buttons.oe_editing .oe_list_save { + display: inline-block; +} .openerp .oe-listview { position: relative; } @@ -2115,20 +2124,6 @@ .openerp .oe-listview-content .numeric input { text-align: right; } -.openerp .oe-listview-content tr.oe_edition th.oe-record-selector { - padding: 0 6px; - font-size: 1px; - letter-spacing: -1px; - color: transparent; -} -.openerp .oe-listview-content tr.oe_edition th.oe-record-selector:before { - font: 21px "mnmliconsRegular"; - content: "S"; - color: #404040; -} -.openerp .oe-listview-content tr.oe_edition th.oe-record-selector input { - display: none; -} .openerp .oe_trad_field.touched { border: 1px solid green !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a55d1155859..9377c11e2c2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1587,6 +1587,15 @@ $colour4: #8a89ba display: none // }}} // ListView {{{ + .oe_list_buttons + .oe_list_save + display: none + &.oe_editing + .oe_list_add, .oe_alternative + display: none + .oe_list_save + display: inline-block + .oe-listview position: relative .oe_form .oe_form_field @@ -1666,12 +1675,6 @@ $colour4: #8a89ba width: 82px input text-align: right - - tr.oe_edition th.oe-record-selector - padding: 0 6px - @include text-to-icon("S") - input - display: none // }}} // Translation {{{ .oe_trad_field.touched -- cgit v1.2.3 From 16559cd6aed2867a4d45621e2ccff0644957c06c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 11 Jul 2012 16:20:48 +0200 Subject: [ADD] discard 'link-ish' to editable list view bzr revid: xmo@openerp.com-20120711142048-covvchmiscjlhji0 --- addons/web/static/src/css/base.css | 7 +++++-- addons/web/static/src/css/base.sass | 6 ++++-- 2 files changed, 9 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 7ea01bf3bee..6e5c6117023 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2179,15 +2179,18 @@ .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { display: none; } -.openerp .oe_list_buttons .oe_list_save { +.openerp .oe_list_buttons .oe_list_save, .openerp .oe_list_buttons .oe_list_discard { display: none; } -.openerp .oe_list_buttons.oe_editing .oe_list_add, .openerp .oe_list_buttons.oe_editing .oe_alternative { +.openerp .oe_list_buttons.oe_editing .oe_list_add, .openerp .oe_list_buttons.oe_editing .oe_list_button_import { display: none; } .openerp .oe_list_buttons.oe_editing .oe_list_save { display: inline-block; } +.openerp .oe_list_buttons.oe_editing .oe_list_discard { + display: inline; +} .openerp .oe_list { position: relative; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0472aa34710..83153cc11d5 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1723,13 +1723,15 @@ $sheet-max-width: 860px // }}} // ListView {{{ .oe_list_buttons - .oe_list_save + .oe_list_save, .oe_list_discard display: none &.oe_editing - .oe_list_add, .oe_alternative + .oe_list_add, .oe_list_button_import display: none .oe_list_save display: inline-block + .oe_list_discard + display: inline .oe_list position: relative -- cgit v1.2.3 From 35b5732bba91544b99c63a2ef57c769758cd4f0c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 11 Jul 2012 16:43:27 +0200 Subject: [IMP] keep 'save row' button hidden in o2m list bzr revid: xmo@openerp.com-20120711144327-gyhad79cmd730tb4 --- 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 6e5c6117023..2d27b380386 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2176,6 +2176,9 @@ height: auto; line-height: 16px; } +.openerp .oe_form_field_one2many .oe_list_buttons.oe_editing .oe_list_save { + visibility: hidden; +} .openerp .oe_form .oe_form_field_many2many > .oe_list .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 83153cc11d5..52b28b7da4f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1715,6 +1715,9 @@ $sheet-max-width: 860px li height: auto line-height: 16px + .oe_list_buttons.oe_editing .oe_list_save + // keep "save row" button hidden in o2m + visibility: hidden // }}} // FormView.many2many {{{ .oe_form .oe_form_field_many2many > .oe_list -- cgit v1.2.3 From fe36f9b221765ef809969f041a427cd1851438d5 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 12 Jul 2012 12:39:12 +0530 Subject: [IMP]css apply for placeholder. bzr revid: vme@tinyerp.com-20120712070912-wf8wmq2wd0xv2wwo --- addons/web/static/src/css/base.css | 10 +++++++++- addons/web/static/src/css/base.sass | 8 ++++++++ 2 files changed, 17 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 1a7e30b5a84..d73441c938f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -34,7 +34,15 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ +} +.openerp :-moz-placeholder { + color: #afafaf !important; + font-style: italic !important; +} +.openerp ::-webkit-input-placeholder { + color: #afafaf !important; + font-style: italic !important; } .openerp a { text-decoration: none; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 559125aa3c3..1d0507d12fd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -112,6 +112,14 @@ $sheet-max-width: 860px font-size: 13px background: white // }}} + //Placeholder style{{{ + \:-moz-placeholder + color: #AFAFAF !important + font-style: italic !important + \::-webkit-input-placeholder + color: #AFAFAF !important + font-style: italic !important + //}}} // Tag reset {{{ a text-decoration: none -- 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 From 37388344d6c989f89ebb4676b5b8bf65d5df7f58 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 13 Jul 2012 10:42:28 +0530 Subject: [IMP]change color of placeholder. bzr revid: vme@tinyerp.com-20120713051228-ujbygcchu78y0rm5 --- 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 d73441c938f..63915b85b03 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -37,11 +37,11 @@ */ } .openerp :-moz-placeholder { - color: #afafaf !important; + color: #AFAFB6 !important; font-style: italic !important; } .openerp ::-webkit-input-placeholder { - color: #afafaf !important; + color: #AFAFB6 !important; font-style: italic !important; } .openerp a { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1d0507d12fd..0c868bd399b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -114,10 +114,10 @@ $sheet-max-width: 860px // }}} //Placeholder style{{{ \:-moz-placeholder - color: #AFAFAF !important + color: #AFAFB6 !important font-style: italic !important \::-webkit-input-placeholder - color: #AFAFAF !important + color: #AFAFB6 !important font-style: italic !important //}}} // Tag reset {{{ -- 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.css | 7 +++++-- addons/web/static/src/css/base.sass | 4 +++- 2 files changed, 8 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 75af0a44202..05c0a9b68b8 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; @@ -240,6 +240,9 @@ .openerp.ui-dialog .ui-dialog-buttonpane button { margin-left: 8px; } +.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { + float: left; +} .openerp.ui-dialog .ui-dialog-titlebar-close { padding: 0; } @@ -1785,7 +1788,7 @@ display: inline-block; float: right; } -.openerp .oe_form footer { +.openerp .oe_form div.oe_chatter { min-width: 650px; max-width: 860px; margin: 0 auto; 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 3db53edefc82bb146f3281ecb9751e239fb2df49 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Fri, 13 Jul 2012 18:33:25 +0530 Subject: [IMP] Improved code to create bounce effect by CSS. bzr revid: jra@tinyerp.com-20120713130325-q0c6km66nkv2qi7p --- addons/web/static/src/css/base.css | 23 +++++++++++++++++++++-- 1 file changed, 21 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 0d79e783370..293d182e6b7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2367,7 +2367,26 @@ div.ui-widget-overlay { filter: alpha(opacity=30); opacity: 0.3; } -.openerp .oe_bounce_button_left { + +.oe_bounce_left { float: left; - margin-right: 4px; +} + +.openerp .oe_bounce { + -moz-animation:bounce .40s linear; + -webkit-animation:bounce .40s linear; +} + +@-moz-keyframes bounce { + 0%{ -moz-transform:scale(0); opacity:0;} + 50%{ -moz-transform:scale(1.3); opacity:0.4; } + 75%{ -moz-transform:scale(0.9); opacity:0.7;} + 100%{ -moz-transform:scale(1); opacity:1;} +} + +@-webkit-keyframes bounce { + 0%{ -webkit-transform:scale(0); opacity:0;} + 50%{ -webkit-transform:scale(1.3); opacity:0.4;} + 75%{ -webkit-transform:scale(0.9); opacity:0.7;} + 100%{ -webkit-transform:scale(1); opacity:1;} } \ No newline at end of file -- 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.css | 15 ++++++++------- addons/web/static/src/css/base.sass | 9 +++++---- 2 files changed, 13 insertions(+), 11 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 05c0a9b68b8..3f410ff3fa2 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"); @@ -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; @@ -1840,18 +1840,18 @@ .openerp .oe_form .oe_subtotal_footer td.oe_form_group_cell_label { border-right: none; } -.openerp .oe_form .oe_subtotal_footer .oe_form_field { - width: auto !important; -} .openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator { border-top: 1px solid #cacaca; - font-sie: 120%; font-weight: bold; + font-size: 18px; } .openerp .oe_form .oe_subtotal_footer label.oe_subtotal_footer_separator { font-weight: bold !important; padding: 2px 8px 2px 0px !important; } +.openerp .oe_form .oe_subtotal_footer label.oe_form_label_help { + font-weight: normal; +} .openerp .oe_application .oe_form_sheetbg { background: url(/web/static/src/img/form_sheetbg.png); padding: 8px 0; @@ -1993,7 +1993,7 @@ width: 180px; } .openerp .oe_form .oe_form_field_float { - width: 180px; + width: 112px; } .openerp .oe_form .oe_form_field_date { width: 7.5em; @@ -2250,6 +2250,7 @@ } .openerp .oe_list_content > tbody > tr > td.oe_number { text-align: right !important; + width: 100px; } .openerp .oe_list_content > tbody > tr:nth-child(odd) { background-color: #f0f0fa; 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.css | 10 ++++++---- addons/web/static/src/css/base.sass | 9 ++++++--- 2 files changed, 12 insertions(+), 7 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 3f410ff3fa2..466faec219a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1763,10 +1763,6 @@ .openerp .oe_form_readonly .oe_form .oe_form_field_date { width: auto; } -.openerp .oe_form_nosheet { - margin-left: 10px; - margin-right: 10px; -} .openerp .oe_form_nosheet > header { margin-left: -10px; margin-right: -10px; @@ -2150,6 +2146,12 @@ .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } +.openerp .oe_form_field_one2many .oe_list_content > thead { + border-bottom: 1px; +} +.openerp .oe_form_field_one2many .oe_list_content > tbody tr:nth-child(odd) { + background: transparent; +} .openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save { background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat; } 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.css | 29 ++++++++++++++++------------- addons/web/static/src/css/base.sass | 24 +++++++++++++++--------- 2 files changed, 31 insertions(+), 22 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 bea27cd252f..a9308b3c64b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -205,7 +205,7 @@ .openerp.ui-dialog .ui-dialog-content { padding: 0px; } -.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-buttonpane { +.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane { padding: 16px; } .openerp.ui-dialog .ui-dialog-titlebar { @@ -268,6 +268,9 @@ color: black; text-decoration: none; } +.openerp.ui-dialog.oe_act_window .ui-dialog-content { + padding: 0px; +} .openerp .modal-backdrop { position: fixed; top: 0; @@ -1983,18 +1986,6 @@ .openerp .oe_form .oe_form_field input { margin: 0px; } -.openerp .oe_form .oe_form_field_integer { - width: 7em; -} -.openerp .oe_form .oe_form_field_float { - width: 8em; -} -.openerp .oe_form .oe_form_field_date { - width: 7.5em; -} -.openerp .oe_form .oe_form_field_datetime { - width: 11em; -} .openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select { height: 22px; padding-top: 2px; @@ -2087,6 +2078,18 @@ position: relative; overflow: hidden; } +.openerp .oe_form_editable .oe_form .oe_form_field_integer { + width: 7em !important; +} +.openerp .oe_form_editable .oe_form .oe_form_field_float { + width: 8em !important; +} +.openerp .oe_form_editable .oe_form .oe_form_field_date { + width: 7.5em !important; +} +.openerp .oe_form_editable .oe_form .oe_form_field_datetime { + width: 11em !important; +} .openerp .oe_hidden_input_file { overflow: hidden; position: relative; 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.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 a9308b3c64b..72521bb96b8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1847,6 +1847,7 @@ border-right: none; } .openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator { + width: 110px; border-top: 1px solid #cacaca; font-weight: bold; font-size: 18px; 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 a1adf041142b5055a4e210695074a09383fa6e3c Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 14 Jul 2012 02:20:56 +0200 Subject: imp bzr revid: fp@openerp.com-20120714002056-q6xtj18jpj4fmy0w --- addons/web/static/src/css/base.css | 2 +- 1 file changed, 1 insertion(+), 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 72521bb96b8..0879b07bdbf 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1847,7 +1847,7 @@ border-right: none; } .openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator { - width: 110px; + 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.css | 41 ++++++++++++++++++++----------------- addons/web/static/src/css/base.sass | 12 ++++++----- 2 files changed, 29 insertions(+), 24 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 0879b07bdbf..637f99a14b3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1165,63 +1165,63 @@ .openerp .oe_view_manager .oe_view_manager_view_kanban { height: inherit; } -.openerp .oe_view_manager .oe_view_manager_header { +.openerp .oe_view_manager table.oe_view_manager_header { width: 100%; + table-layout: fixed; } -.openerp .oe_view_manager .oe_view_manager_header .oe_header_row { +.openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; text-shadow: 0 1px 1px white; } -.openerp .oe_view_manager .oe_view_manager_header .oe_header_row:last-child td { +.openerp .oe_view_manager table.oe_view_manager_header .oe_header_row:last-child td { padding-top: 0; } -.openerp .oe_view_manager .oe_view_manager_header .oe_view_manager_sidebar { +.openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_sidebar { margin: 0px auto; - width: 400px; text-align: center; } -.openerp .oe_view_manager .oe_view_manager_header td { +.openerp .oe_view_manager table.oe_view_manager_header td { line-height: 26px; } -.openerp .oe_view_manager .oe_view_manager_header h2 { +.openerp .oe_view_manager table.oe_view_manager_header h2 { font-size: 18px; margin: 0; float: left; } -.openerp .oe_view_manager .oe_view_manager_header h2 a { +.openerp .oe_view_manager table.oe_view_manager_header h2 a { color: #8a89ba; } -.openerp .oe_view_manager .oe_view_manager_header .oe_button_group { +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group { display: inline-block; border: 1px solid #ababab; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; } -.openerp .oe_view_manager .oe_view_manager_header .oe_button_group li { +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group li { float: left; border-right: 1px solid #ababab; } -.openerp .oe_view_manager .oe_view_manager_header .oe_button_group li:last-child { +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group li:last-child { border: none; } -.openerp .oe_view_manager .oe_view_manager_header .oe_button_group a { +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group a { color: #4c4c4c; } -.openerp .oe_view_manager .oe_view_manager_header .oe_button_group a:hover { +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group a:hover { text-decoration: none; } -.openerp .oe_view_manager .oe_view_manager_header .oe_button_group .active { +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group .active { background: #999999; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; } -.openerp .oe_view_manager .oe_view_manager_header .oe_button_group .active a { +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group .active a { color: white; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } -.openerp .oe_view_manager .oe_view_manager_header .oe_view_manager_buttons { +.openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_buttons { white-space: nowrap; } .openerp .oe_view_manager .oe_view_manager_pager { @@ -1348,7 +1348,7 @@ float: right; padding: 1px 0; line-height: 18px; - width: 480px; + width: 400px; border: 1px solid #ababab; background: white; -moz-border-radius: 13px; @@ -2089,7 +2089,7 @@ width: 7.5em !important; } .openerp .oe_form_editable .oe_form .oe_form_field_datetime { - width: 11em !important; + width: 11.5em !important; } .openerp .oe_hidden_input_file { overflow: hidden; @@ -2235,6 +2235,9 @@ .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell { padding: 3px 6px; } +.openerp .oe_list_content > tbody > tr > td.oe_list_field_cell progress { + width: 100%; +} .openerp .oe_list_content > tbody > tr > td, .openerp .oe_list_content > tbody > tr > th { line-height: 18px; } @@ -2254,7 +2257,7 @@ } .openerp .oe_list_content > tbody > tr > td.oe_number { text-align: right !important; - width: 100px; + max-width: 100px; } .openerp .oe_list_content > tbody > tr:nth-child(odd) { background-color: #f0f0fa; 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.css | 19 ++++++++----------- addons/web/static/src/css/base.sass | 22 ++++++++++------------ 2 files changed, 18 insertions(+), 23 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 637f99a14b3..53d54dccec5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -453,27 +453,24 @@ .openerp .oe_webclient .oe_star_on { color: gold; } -.openerp .oe_tags .text-wrap { - width: 100% !important; -} -.openerp .oe_tags .text-wrap textarea { - width: 100% !important; -} -.openerp .oe_tags .oe_tag { +.openerp .oe_tag { border-radius: 2px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; - position: relative; - float: left; border: 1px solid #9daccc; background: #e2e6f0; - color: black; + color: black !important; padding: 0px 3px 0px 3px; margin: 0 2px 2px 0; height: 16px; - font: 11px "lucida grande", tahoma, verdana, arial, sans-serif; +} +.openerp .oe_tags .text-wrap { + width: 100% !important; +} +.openerp .oe_tags .text-wrap textarea { + width: 100% !important; } .openerp .oe_tags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em { font-style: italic; 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.css | 18 +++++++++--------- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 10 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 53d54dccec5..9e585bac5cf 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2145,33 +2145,33 @@ .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } -.openerp .oe_form_field_one2many .oe_list_content > thead { +.openerp .oe_form_field_one2many .oe_list_content > thead, .openerp .oe_form_field_many2many .oe_list_content > thead { border-bottom: 1px; } -.openerp .oe_form_field_one2many .oe_list_content > tbody tr:nth-child(odd) { +.openerp .oe_form_field_one2many .oe_list_content > tbody tr:nth-child(odd), .openerp .oe_form_field_many2many .oe_list_content > tbody tr:nth-child(odd) { background: transparent; } -.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save { +.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save, .openerp .oe_form_field_many2many .oe_list .oe_list_edit_row_save { background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat; } -.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save:before { +.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save:before, .openerp .oe_form_field_many2many .oe_list .oe_list_edit_row_save:before { visibility: hidden; } -.openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top { +.openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top, .openerp .oe_form_field_many2many > .oe_view_manager .oe_header_row_top { display: none; } -.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td { +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td { padding: 0px 8px; line-height: 16px; } -.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_i { +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_i, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td .oe_i { font-size: 13px; } -.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group { +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group { height: auto; line-height: 16px; } -.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group li { +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group li, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group li { height: auto; line-height: 16px; } 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.css | 12 ++++++------ addons/web/static/src/css/base.sass | 11 +++++------ 2 files changed, 11 insertions(+), 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 9e585bac5cf..95164341e9b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1767,12 +1767,12 @@ width: auto; } .openerp .oe_form_nosheet { - margin-left: 10px; - margin-right: 10px; + margin: 20px; } .openerp .oe_form_nosheet > header { - margin-left: -10px; - margin-right: -10px; + margin-top: -20px; + margin-left: -20px; + margin-right: -20px; } .openerp .oe_form header { position: relative; @@ -1897,8 +1897,8 @@ width: 100%; margin: 4px 0 4px 0; } -.openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td:first-child { - padding-left: 18px; +.openerp .oe_form .oe_form_group .oe_group_right { + margin-left: 18px; } .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; 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 66d1d0e33493b55a7fac8340e0ce009dde363381 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Mon, 16 Jul 2012 12:35:23 +0530 Subject: [IMP] Improved code. bzr revid: jra@tinyerp.com-20120716070523-iim1n7ghl1a0tg6o --- addons/web/static/src/css/base.css | 23 ----------------------- 1 file changed, 23 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 293d182e6b7..66104b446ea 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2366,27 +2366,4 @@ div.ui-widget-overlay { background: black; filter: alpha(opacity=30); opacity: 0.3; -} - -.oe_bounce_left { - float: left; -} - -.openerp .oe_bounce { - -moz-animation:bounce .40s linear; - -webkit-animation:bounce .40s linear; -} - -@-moz-keyframes bounce { - 0%{ -moz-transform:scale(0); opacity:0;} - 50%{ -moz-transform:scale(1.3); opacity:0.4; } - 75%{ -moz-transform:scale(0.9); opacity:0.7;} - 100%{ -moz-transform:scale(1); opacity:1;} -} - -@-webkit-keyframes bounce { - 0%{ -webkit-transform:scale(0); opacity:0;} - 50%{ -webkit-transform:scale(1.3); opacity:0.4;} - 75%{ -webkit-transform:scale(0.9); opacity:0.7;} - 100%{ -webkit-transform:scale(1); opacity:1;} } \ No newline at end of file -- cgit v1.2.3 From 5bba0c8e6b899c29ff2102b94ebf6abf290e1402 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Mon, 16 Jul 2012 12:56:44 +0530 Subject: [ADD] Add css and sass file for bounce animation effect. bzr revid: jra@tinyerp.com-20120716072644-ls2q54fr5o8fjyd7 --- addons/web/static/src/css/base.css | 19 +++++++++++++++++++ addons/web/static/src/css/base.sass | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 52 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 66104b446ea..3e260601581 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2366,4 +2366,23 @@ div.ui-widget-overlay { background: black; filter: alpha(opacity=30); opacity: 0.3; +} + +.openerp .oe_bounce { + -moz-animation:bounce .40s linear; + -webkit-animation:bounce .40s linear; +} + +@-moz-keyframes bounce { + 0%{ -moz-transform:scale(0); opacity:0;} + 50%{ -moz-transform:scale(1.3); opacity:0.4; } + 75%{ -moz-transform:scale(0.9); opacity:0.7;} + 100%{ -moz-transform:scale(1); opacity:1;} +} + +@-webkit-keyframes bounce { + 0%{ -webkit-transform:scale(0); opacity:0;} + 50%{ -webkit-transform:scale(1.3); opacity:0.4;} + 75%{ -webkit-transform:scale(0.9); opacity:0.7;} + 100%{ -webkit-transform:scale(1); opacity:1;} } \ No newline at end of file diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 559125aa3c3..1410a1ce872 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1865,5 +1865,38 @@ $sheet-max-width: 860px div.ui-widget-overlay background: black @include opacity(0.3) + +.openerp .oe_bounce + -moz-animation: bounce .40s linear + -webkit-animation: bounce .40s linear + +@-moz-keyframes bounce + 0% + -moz-transform: scale(0) + opacity: 0 + 50% + -moz-transform: scale(1.3) + opacity: 0.4 + 75% + -moz-transform: scale(0.9) + opacity: 0.7 + 100% + -moz-transform: scale(1) + opacity: 1 + + +@-webkit-keyframes bounce + 0% + -webkit-transform: scale(0) + opacity: 0 + 50% + -webkit-transform: scale(1.3) + opacity: 0.4 + 75% + -webkit-transform: scale(0.9) + opacity: 0.7 + 100% + -webkit-transform: scale(1) + opacity: 1 // 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 75c2845fb5414a65a7366273eda3c1234d5d43b9 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 16 Jul 2012 13:04:30 +0200 Subject: [ADD] default_get support on new row creation bzr revid: xmo@openerp.com-20120716110430-9uv352m46d3mn1bx --- addons/web/static/src/css/base.css | 13 +++++++++++++ addons/web/static/src/css/base.sass | 13 +++++++++++++ 2 files changed, 26 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 2d27b380386..97d2fcf57a7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2382,6 +2382,19 @@ .kitten-mode-activated > * { opacity: 0.7; } +.kitten-mode-activated .oe_footer a { + background-image: url(http://www.risacher.com/la-rache/zfiles/la-rache.png); + font-size: 1px; + letter-spacing: -1px; + color: transparent; + display: inline-block; + height: 15px; + width: 80px; + vertical-align: top; +} +.kitten-mode-activated .oe_footer a span { + display: none; +} div.ui-widget-overlay { background: black; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 52b28b7da4f..c5197743acd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1879,6 +1879,19 @@ $sheet-max-width: 860px background-attachment: fixed >* opacity: 0.70 + + .oe_footer a + background-image: url(http://www.risacher.com/la-rache/zfiles/la-rache.png) + font-size: 1px + letter-spacing: -1px + color: transparent + display: inline-block + height: 15px + width: 80px + vertical-align: top + + span + display: none // }}} div.ui-widget-overlay -- 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.css | 6 +++--- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 5 insertions(+), 5 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 95164341e9b..f97bd83cdd0 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; @@ -1897,8 +1897,8 @@ width: 100%; margin: 4px 0 4px 0; } -.openerp .oe_form .oe_form_group .oe_group_right { - margin-left: 18px; +.openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_right { + padding-left: 20px; } .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; 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.css | 11 ++++------- addons/web/static/src/css/base.sass | 7 +++---- 2 files changed, 7 insertions(+), 11 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 f97bd83cdd0..ad47af8e723 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2184,6 +2184,10 @@ .openerp .oe_list_content td:first-child:after, .openerp .oe_list_content th:first-child:after { border-width: 0; } +.openerp .oe_list_content td.oe_number { + text-align: right !important; + max-width: 100px; +} .openerp .oe_list_content > thead { border-bottom: 2px solid #cacaca; background: #eeeeee; @@ -2235,9 +2239,6 @@ .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell progress { width: 100%; } -.openerp .oe_list_content > tbody > tr > td, .openerp .oe_list_content > tbody > tr > th { - line-height: 18px; -} .openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button { border: none; background: transparent; @@ -2252,10 +2253,6 @@ .openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child:after, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child:after { border-width: 0; } -.openerp .oe_list_content > tbody > tr > td.oe_number { - text-align: right !important; - max-width: 100px; -} .openerp .oe_list_content > tbody > tr:nth-child(odd) { background-color: #f0f0fa; background-color: #f0f0fa; 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.css | 13 ++++++++++--- addons/web/static/src/css/base.sass | 12 +++++++++--- 2 files changed, 19 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 ad47af8e723..3208189ad87 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -396,10 +396,11 @@ margin: 4px; } .openerp .oe_avatar { - margin: 0 16px 0 0; + margin: 0 6px 15px 0; } .openerp .oe_avatar > img { - height: 50px; + height: 90px; + max-width: 100px; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -408,6 +409,9 @@ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); border: none; } +.openerp .oe_avatar + div { + margin-left: 115px; +} .openerp .oe_button.oe_link { border: none; padding: 0; @@ -1881,6 +1885,9 @@ .openerp .oe_application .oe_form_sheet .oe_notebook_page { padding: 0 16px; } +.openerp .oe_form .oe_form_button { + margin: 2px; +} .openerp .oe_form td.oe_form_group_cell_label { border-right: 1px solid #dddddd; padding: 2px 0px 2px 0px; @@ -1888,7 +1895,7 @@ .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; display: block; - min-width: 110px; + min-width: 120px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding-left: 6px; 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.css | 8 +++++--- addons/web/static/src/css/base.sass | 7 ++++--- 2 files changed, 9 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 3208189ad87..2c0c6ec0366 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -311,6 +311,7 @@ } .openerp .oe_fade { color: #888888; + font-weight: normal; } .openerp .oe_bold { font-weight: bold; @@ -379,7 +380,8 @@ background: #ed6f6a; } .openerp .oe_title { - width: 60%; + width: 50%; + float: left; } .openerp .oe_title:after { content: "."; @@ -389,7 +391,7 @@ visibility: hidden; } .openerp .oe_button_box { - width: 38%; + width: 270px; text-align: right; } .openerp .oe_button_box button { @@ -410,7 +412,7 @@ border: none; } .openerp .oe_avatar + div { - margin-left: 115px; + margin-left: 5px; } .openerp .oe_button.oe_link { border: none; 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.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 2c0c6ec0366..c48ab0e3012 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1904,7 +1904,7 @@ } .openerp .oe_form .oe_form_group { width: 100%; - margin: 4px 0 4px 0; + margin: 6px 0 6px 0; } .openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_right { padding-left: 20px; 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.css | 26 +++++++++++--------------- addons/web/static/src/css/base.sass | 19 +++++++------------ 2 files changed, 18 insertions(+), 27 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 c48ab0e3012..0a3d24d41f4 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"); @@ -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; @@ -234,14 +234,13 @@ .openerp.ui-dialog .ui-dialog-buttonpane { border-top: 1px solid #e0e0e0; background: #f5f7f9; - padding: 8px; margin: 0; -moz-border-radius: 0 0 2px 2px; -webkit-border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px; } .openerp.ui-dialog .ui-dialog-buttonpane button { - margin-left: 8px; + margin: 0; } .openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: left; @@ -1855,9 +1854,12 @@ font-weight: bold; font-size: 18px; } +.openerp .oe_form .oe_subtotal_footer label:after { + content: ":"; +} .openerp .oe_form .oe_subtotal_footer label.oe_subtotal_footer_separator { font-weight: bold !important; - padding: 2px 8px 2px 0px !important; + padding: 2px 11px 2px 0px !important; } .openerp .oe_form .oe_subtotal_footer label.oe_form_label_help { font-weight: normal; @@ -2061,15 +2063,6 @@ .openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button { display: none; } -.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; @@ -2148,9 +2141,12 @@ } .openerp .oe_form_field_many2one span.oe_m2o_drop_down_button { position: absolute; - top: 1px; + top: 2px; right: 0px; } +.openerp .oe_form_field_many2one .oe_m2o_cm_button { + line-height: 14px; +} .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 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 From f19e5ff9bcc8cbee1d8e389c5a59d5e75591730a Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 18 Jul 2012 15:37:12 +0200 Subject: [IMP] don't collapse newlines in list cells bzr revid: xmo@openerp.com-20120718133712-0pbdahv62rf0nslc --- 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 97d2fcf57a7..f92d5cbf1c2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2256,6 +2256,7 @@ } .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell { padding: 3px 6px; + white-space: pre-line; } .openerp .oe_list_content > tbody > tr > td, .openerp .oe_list_content > tbody > tr > th { line-height: 18px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c5197743acd..2ad33c8ca62 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1784,6 +1784,7 @@ $sheet-max-width: 860px border-top: 1px solid #ddd > td.oe_list_field_cell padding: 3px 6px + white-space: pre-line > td, > th line-height: 18px > button -- cgit v1.2.3 From e72f791b1321fb6d4496488ccf062ff92f710010 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 18 Jul 2012 16:27:08 +0200 Subject: improved style of kanban vignette dropdown menu bzr revid: mit@openerp.com-20120718142708-5okzuclspou6khot --- 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 0a3d24d41f4..8ee9bad823c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -599,6 +599,7 @@ float: none; display: block; position: relative; + padding: 2px 12px; } .openerp .oe_dropdown_menu > li:hover { background-color: #f0f0fa; @@ -615,7 +616,6 @@ .openerp .oe_dropdown_menu > li > a { white-space: nowrap; display: block; - padding: 4px 15px; color: #4c4c4c; text-decoration: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fb67945a02d..fe1e8cfe8d2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -483,10 +483,10 @@ $sheet-max-width: 860px float: none display: block position: relative + padding: 2px 12px > a white-space: nowrap display: block - padding: 4px 15px color: #4c4c4c text-decoration: none &:hover -- cgit v1.2.3 From 8632675b82ed1b4cc50a3a48b02fb40dd316d3d6 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 18 Jul 2012 16:35:39 +0200 Subject: re alignment of dropdown menu bzr revid: mit@openerp.com-20120718143539-0b1abwzq24f66s50 --- 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 8ee9bad823c..e96bb2666f5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -584,7 +584,7 @@ z-index: 1; border: 1px solid #afafb6; background: white; - padding: 6px 0; + padding: 4px 0; min-width: 140px; text-align: left; -moz-border-radius: 3px; @@ -599,7 +599,7 @@ float: none; display: block; position: relative; - padding: 2px 12px; + padding: 2px 8px; } .openerp .oe_dropdown_menu > li:hover { background-color: #f0f0fa; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fe1e8cfe8d2..d860fc69189 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -470,7 +470,7 @@ $sheet-max-width: 860px z-index: 1 border: 1px solid #afafb6 background: white - padding: 6px 0 + padding: 4px 0 min-width: 140px text-align: left @include radius(3px) @@ -483,7 +483,7 @@ $sheet-max-width: 860px float: none display: block position: relative - padding: 2px 12px + padding: 2px 8px > a white-space: nowrap display: block -- cgit v1.2.3 From cf6af909fb8f36f0a4ced1a3b61379d9d4899e34 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 19 Jul 2012 17:28:04 +0200 Subject: fixed visual glitch in topbar dropdown menu bzr revid: mit@openerp.com-20120719152804-zcxvuaicpzfubdv1 --- addons/web/static/src/css/base.css | 3 ++- addons/web/static/src/css/base.sass | 7 ++++--- 2 files changed, 6 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 e96bb2666f5..12f0de62b8c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -945,11 +945,12 @@ } .openerp .oe_topbar .oe_dropdown_menu li { float: none; + padding: 3px 12px; } .openerp .oe_topbar .oe_dropdown_menu li a { color: #eeeeee; } -.openerp .oe_topbar .oe_dropdown_menu li a:hover { +.openerp .oe_topbar .oe_dropdown_menu li:hover { background-color: #292929; background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); background-image: -webkit-linear-gradient(top, #292929, #191919); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d860fc69189..58fd8734fa7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -735,11 +735,12 @@ $sheet-max-width: 860px @include background-clip() li float: none + padding: 3px 12px a color: #eee - &:hover - @include vertical-gradient(#292929, #191919) - @include box-shadow(none) + &:hover + @include vertical-gradient(#292929, #191919) + @include box-shadow(none) // }}} // Webclient.leftbar {{{ -- cgit v1.2.3 From 3c1dd6c0c2a985eebbbfb99b18a98f1151cdfd6d Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 19 Jul 2012 17:58:37 +0200 Subject: fixed cursor too close to search icon in searchview bzr revid: mit@openerp.com-20120719155837-g64bmhzesl7ode8t --- 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 12f0de62b8c..7c8085046fc 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1438,7 +1438,7 @@ outline: none; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_input { - padding: 0 3px; + padding: 0 0 0 6px; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet { position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 58fd8734fa7..b3ff70b72bd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1127,7 +1127,7 @@ $sheet-max-width: 860px &:focus outline: none .oe_searchview_input - padding: 0 3px + padding: 0 0 0 6px .oe_searchview_facet position: relative cursor: pointer -- cgit v1.2.3 From bff386ea36d2d24c21b16d4ed17db0c6d039bd3d Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 19 Jul 2012 18:04:56 +0200 Subject: fixed alignment of 'add to dashboard' button in searchview bzr revid: mit@openerp.com-20120719160456-vp9hip9f67d1ij84 --- addons/web/static/src/css/base.css | 6 +++--- addons/web/static/src/css/base.sass | 14 +++++++------- 2 files changed, 10 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 7c8085046fc..eda3a996d23 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1601,14 +1601,14 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section li:hover { background-color: #f0f0fa; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section form { +.openerp .oe_searchview .oe_searchview_drawer form { margin-left: 12px; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section form p { +.openerp .oe_searchview .oe_searchview_drawer form p { margin: 4px 0; line-height: 18px; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section form button { +.openerp .oe_searchview .oe_searchview_drawer form button { margin: 0 0 8px 0; } .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b3ff70b72bd..dbd3d30f453 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1249,13 +1249,13 @@ $sheet-max-width: 860px // 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 0 + form + margin-left: 12px + p + margin: 4px 0 + line-height: 18px + button + margin: 0 0 8px 0 .oe_searchview_custom padding: 0 8px 8px 8px form -- cgit v1.2.3 From 6b719b708f18a18543368b18031643f98b00910b Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 24 Jul 2012 14:46:07 +0200 Subject: [IMP] trigger a new search when clicking on the searchview's spyglass Required reifying the purely decorative spyglass (created via :before) into an actual button and moving that button to the right place (after removing all decorations set by default on buttons e.g. shadows &al). apr request. bzr revid: xmo@openerp.com-20120724124607-bc1nsywtth7cn11i --- addons/web/static/src/css/base.css | 53 +++++++++++++++++-------------------- addons/web/static/src/css/base.sass | 23 ++++++++-------- 2 files changed, 36 insertions(+), 40 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 2e26de30d5f..2be11ff020d 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"); @@ -1408,20 +1408,31 @@ filter: alpha(opacity=50); opacity: 0.5; } -.openerp .oe_searchview .oe_searchview_facets { - min-height: 22px; +.openerp .oe_searchview .oe_searchview_search { + font-size: 1px; + letter-spacing: -1px; + color: transparent; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; + position: absolute; + left: 3px; + top: 1px; + padding: 0; + border: none; + background: transparent; } -.openerp .oe_searchview .oe_searchview_facets:before { - color: #cccccc; - font-family: "mnmliconsRegular"; +.openerp .oe_searchview .oe_searchview_search:before { + font: 21px "mnmliconsRegular"; content: "r"; - font-size: 130%; - display: inline; - position: relative; - left: 6px; - top: 2px; color: #a3a3a3; - padding-right: 4px; +} +.openerp .oe_searchview .oe_searchview_facets { + min-height: 22px; + margin-left: 15px; } .openerp .oe_searchview .oe_searchview_facets * { vertical-align: top; @@ -2180,7 +2191,7 @@ height: auto; line-height: 16px; } -.openerp .oe_form_field_one2many .oe_list_buttons.oe_editing .oe_list_save { +.openerp .oe_form_field_one2many .oe_list_buttons.oe_editing .oe_list_save, .openerp .oe_form_field_many2many .oe_list_buttons.oe_editing .oe_list_save { visibility: hidden; } .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { @@ -2266,9 +2277,6 @@ padding: 3px 6px; white-space: pre-line; } -.openerp .oe_list_content > tbody > tr > td.oe_list_field_cell progress { - width: 100%; -} .openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button { border: none; background: transparent; @@ -2441,19 +2449,6 @@ .kitten-mode-activated > * { opacity: 0.7; } -.kitten-mode-activated .oe_footer a { - background-image: url(http://www.risacher.com/la-rache/zfiles/la-rache.png); - font-size: 1px; - letter-spacing: -1px; - color: transparent; - display: inline-block; - height: 15px; - width: 80px; - vertical-align: top; -} -.kitten-mode-activated .oe_footer a span { - display: none; -} div.ui-widget-overlay { background: black; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c4314923867..aef356d3ab6 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1101,19 +1101,20 @@ $sheet-max-width: 860px border-right: 5px solid transparent @include opacity() + .oe_searchview_search + @include text-to-icon("r", #a3a3a3) + @include box-shadow(none) + @include radius(0) + position: absolute + left: 3px + top: 1px + padding: 0 + border: none + background: transparent + .oe_searchview_facets min-height: 22px - &:before - color: #ccc - font-family: "mnmliconsRegular" - content: "r" - font-size: 130% - display: inline - position: relative - left: 6px - top: 2px - color: #a3a3a3 - padding-right: 4px + margin-left: 15px * vertical-align: top display: inline-block -- cgit v1.2.3 From fceb94cb8ac1af2fdb6f88e6b86632552075baf1 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 24 Jul 2012 15:46:52 +0200 Subject: Changed style of About dialog box to match login page style bzr revid: mit@openerp.com-20120724134652-t783h7glntytr3kv --- addons/web/static/src/css/base.css | 41 ++++++++++++++++++++++++++++++++++++- addons/web/static/src/css/base.sass | 25 +++++++++++++++++++++- 2 files changed, 64 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 eda3a996d23..3b2fb526144 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -267,6 +267,45 @@ color: black; text-decoration: none; } +.openerp.ui-dialog .oe_about { + background-color: white; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp.ui-dialog .oe_about a { + color: #8a89ba; +} +.openerp.ui-dialog .oe_about a:hover { + text-decoration: underline; +} +.openerp.ui-dialog .oe_about .oe_logo { + margin-left: -6px; +} +.openerp.ui-dialog .oe_about .oe_bottom { + position: absolute; + top: 50%; + left: 0; + right: 0; + bottom: 0; + text-shadow: 0 1px 1px #999999; + background-color: #b41616; + background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606)); + background-image: -webkit-linear-gradient(top, #b41616, #600606); + background-image: -moz-linear-gradient(top, #b41616, #600606); + background-image: -ms-linear-gradient(top, #b41616, #600606); + background-image: -o-linear-gradient(top, #b41616, #600606); + background-image: linear-gradient(to bottom, #b41616, #600606); + color: #eeeeee; + padding: 0 16px; + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp.ui-dialog .oe_about .oe_bottom a { + color: #eeeeee; +} .openerp.ui-dialog.oe_act_window .ui-dialog-content { padding: 0px; } @@ -711,7 +750,7 @@ z-index: 1050; } .openerp .oe_login { - background: url("/web/static/src/img/pattern.png") repeat; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); text-align: center; font-size: 14px; height: 100%; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index dbd3d30f453..de0ab08391b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -256,6 +256,29 @@ $sheet-max-width: 860px &:hover color: black text-decoration: none + .oe_about + background-color: white + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=) + @include radius(0 0 2px 2px) + a + color: #8A89BA + &:hover + text-decoration: underline + .oe_logo + margin-left: -6px + .oe_bottom + position: absolute + top: 50% + left: 0 + right: 0 + bottom: 0 + text-shadow: 0 1px 1px #999999 + @include vertical-gradient(#b41616, #600606) + color: #eee + padding: 0 16px + @include radius(0 0 2px 2px) + a + color: #eee &.ui-dialog.oe_act_window .ui-dialog-content @@ -567,7 +590,7 @@ $sheet-max-width: 860px // }}} // Login {{{ .oe_login - background: url("/web/static/src/img/pattern.png") repeat + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=) text-align: center font-size: 14px height: 100% -- cgit v1.2.3 From 66a7dc6359a1a1cb630abfa8a0f292451e0aceef Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 26 Jul 2012 14:32:59 +0200 Subject: [IMP] customized pager of list view bzr revid: nicolas.vanhoren@openerp.com-20120726123259-ffeg8342bcbgal8o --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 5 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 e929ec6c16b..1e59897cd86 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1322,6 +1322,9 @@ .openerp .oe_view_manager .oe_view_manager_pager { line-height: 26px; } +.openerp .oe_view_manager .oe_view_manager_pager .oe_list_pager_single_page .oe_pager_group { + display: none; +} .openerp .oe_view_manager .oe_pager_value { float: left; margin-right: 8px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c9e00c65a8a..3bb52497454 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1016,6 +1016,8 @@ $sheet-max-width: 860px // ViewManager.pager {{{ .oe_view_manager_pager line-height: 26px + .oe_list_pager_single_page .oe_pager_group + display: none .oe_pager_value float: left margin-right: 8px -- cgit v1.2.3 From 5f2fe0169be2b0cb5bde166aa3db750dcc74bcb9 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 26 Jul 2012 18:11:06 +0200 Subject: Rationalization of tag css classes bzr revid: mit@openerp.com-20120726161106-5a9uu0wjuwausmgh --- addons/web/static/src/css/base.css | 50 +++++++++++++++++----------------- addons/web/static/src/css/base.sass | 53 ++++++++++++++++++++----------------- 2 files changed, 52 insertions(+), 51 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 e929ec6c16b..9b6cd67b51c 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"); @@ -551,17 +551,19 @@ -webkit-animation: bounce 0.4s linear; } .openerp .oe_tag { - border-radius: 2px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - border: 1px solid #9daccc; - background: #e2e6f0; - color: black !important; - padding: 0px 3px 0px 3px; + border: 1px solid #afafb6; + font-size: 11px; + padding: 2px 4px; margin: 0 2px 2px 0; - height: 16px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background: #f0f0fa; + color: #4c4c4c; +} +.openerp .oe_tag_dark { + background: #8786b7; + color: #eeeeee; } .openerp .oe_tags .text-wrap { width: 100% !important; @@ -1183,16 +1185,9 @@ } .openerp .oe_secondary_submenu .oe_menu_counter { float: right; - background: #8a89ba; - color: #eeeeee; - font-size: 10px; - border: 1px solid lightgray; - padding: 2px 4px; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); margin: 0px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; + padding: 1px 4px; } .openerp .oe_secondary_submenu .oe_active { background: #8a89ba; @@ -1532,25 +1527,27 @@ display: inline-block; line-height: 17px; } -.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet { +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet { height: 18px; margin: 1px 0; font-size: 11px; } -.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input:focus, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus { +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus { outline: none; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_input { padding: 0 0 0 6px; + font-size: 12px; + height: 16px; + margin-top: 3px; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input:focus { + outline: none; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet { position: relative; cursor: pointer; - border: 1px solid #afafb6; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background: #8786b7; + padding: 0; -webkit-font-smoothing: auto; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus { @@ -1579,6 +1576,7 @@ .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value { border-left: 1px solid #afafb6; text-shadow: 0 1px 1px white; + color: #4c4c4c; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value:last-child { padding-right: 16px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c9e00c65a8a..dd4f9baee66 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2,8 +2,10 @@ // Variables {{{ $section-title-color: #8786b7 -$facets-border: #afafb6 -$facets-border-selected: #a6a6fe +$tag-bg-light: #f0f0fa +$tag-bg-dark: #8786b7 +$tag-border: #afafb6 +$tag-border-selected: #a6a6fe $hover-background: #f0f0fa $colour4: #8a89ba $sheet-max-width: 860px @@ -427,15 +429,17 @@ $sheet-max-width: 860px // }}} // 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 + border: 1px solid $tag-border + font-size: 11px + padding: 2px 4px margin: 0 2px 2px 0 - height: 16px - // font: 11px "lucida grande", tahoma, verdana, arial, sans-serif + @include radius(3px) + background: $tag-bg-light + color: #4C4C4C + .oe_tag_dark + background: $tag-bg-dark + color: #eee + .oe_tags .text-wrap width: 100% !important @@ -906,14 +910,9 @@ $sheet-max-width: 860px @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2)) .oe_menu_counter float: right - background: #8a89ba - color: #eee - font-size: 10px - border: 1px solid lightgray - padding: 2px 4px text-shadow: 0 1px 1px rgba(0,0,0,0.2) margin: 0px - @include radius(4px) + padding: 1px 4px .oe_active background: $colour4 border-top: 1px solid lightGray @@ -1125,8 +1124,8 @@ $sheet-max-width: 860px font-size: 12px line-height: 18px &.oe_focused - border-color: $facets-border-selected - @include box-shadow(0 1px 2px $facets-border-selected inset) + border-color: $tag-border-selected + @include box-shadow(0 1px 2px $tag-border-selected inset) .oe_searchview_clear cursor: pointer position: absolute @@ -1177,7 +1176,7 @@ $sheet-max-width: 860px vertical-align: top display: inline-block line-height: 17px - .oe_searchview_input, .oe_searchview_facet + .oe_searchview_facet height: 18px margin: 1px 0 font-size: 11px @@ -1185,17 +1184,20 @@ $sheet-max-width: 860px outline: none .oe_searchview_input padding: 0 0 0 6px + font-size: 12px + height: 16px + margin-top: 3px + &:focus + outline: none .oe_searchview_facet position: relative cursor: pointer - border: 1px solid $facets-border - @include radius(3px) - background: #8786b7 + padding: 0 -webkit-font-smoothing: auto // spacing for opera, FF &:focus - border-color: $facets-border-selected - @include box-shadow(0 0 3px 1px $facets-border-selected) + border-color: $tag-border-selected + @include box-shadow(0 0 3px 1px $tag-border-selected) .oe_facet_values background: #f0f0fa @include radius(0 3px 3px 0) @@ -1208,8 +1210,9 @@ $sheet-max-width: 860px .oe_facet_category.oe_i font-size: 16px .oe_facet_value - border-left: 1px solid $facets-border + border-left: 1px solid $tag-border text-shadow: 0 1px 1px white + color: #4C4C4C &:last-child padding-right: 16px .oe_facet_remove -- cgit v1.2.3 From 8e5a0fa9b07396dffbe90acbad8e98f6b1148f69 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 30 Jul 2012 14:48:15 +0530 Subject: [IMP]removed view editor from web to web addons. bzr revid: vme@tinyerp.com-20120730091815-scj8dt3j1tr1jpvx --- addons/web/static/src/css/base.css | 21 --------------------- addons/web/static/src/css/base.sass | 19 ------------------- 2 files changed, 40 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 1e59897cd86..ac04fb4d1e1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2474,27 +2474,6 @@ .openerp .oe_trad_field.touched { border: 1px solid green !important; } -.openerp .oe_view_editor { - width: 100%; - border-collapse: collapse; - margin-left: -12px; - width: 100%; - background-color: white; - border-spacing: 0; -} -.openerp .oe_view_editor td { - text-align: center; - white-space: nowrap; - border: 1px solid #d8d8d8; - cursor: pointer; - font-size: 90%; -} -.openerp .oe_view_editor_field td { - border: 0px !important; -} -.openerp .oe_view_editor tr:hover { - background-color: #ecebf2; -} .openerp .oe_layout_debugging .oe_form_group { outline: 2px dashed green; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3bb52497454..2698787c5a3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1929,25 +1929,6 @@ $sheet-max-width: 860px .oe_trad_field.touched border: 1px solid green !important // }}} - // View Editor {{{ - .oe_view_editor - width: 100% - border-collapse: collapse - margin-left: -12px - width: 100% - background-color: white - border-spacing: 0 - td - text-align: center - white-space: nowrap - border: 1px solid #D8D8D8 - cursor: pointer - font-size: 90% - .oe_view_editor_field td - border: 0px !important - .oe_view_editor tr:hover - background-color: #ecebf2 - // }}} // Debugging stuff {{{ .oe_layout_debugging .oe_form_group -- cgit v1.2.3 From 84488630075d41930a8d2a715eebb62e69471b2f Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 30 Jul 2012 17:47:50 +0200 Subject: Restyling of jquery-ui buttons in dialog box + various style fixes bzr revid: mit@openerp.com-20120730154750-x40vpq9y9f492zvn --- addons/web/static/src/css/base.css | 27 ++++++++++++++++++--------- addons/web/static/src/css/base.sass | 22 +++++++++++++++------- 2 files changed, 33 insertions(+), 16 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 9b6cd67b51c..703683d4d96 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -148,7 +148,7 @@ .openerp h4 { margin: 4px 0; } -.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'] { +.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; color: #404040; @@ -173,7 +173,7 @@ -webkit-font-smoothing: antialiased; outline: none; } -.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover { +.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover { background-color: #f6f6f6; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); @@ -182,9 +182,11 @@ background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3); background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); cursor: pointer; + background-position: 0; } -.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus { +.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus { border: 1px solid #80bfff; + background-position: 0; background-color: #f6f6f6; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); @@ -196,7 +198,7 @@ -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; } -.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active { +.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active { background-color: #e3e3e3; background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)); background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6); @@ -230,11 +232,6 @@ .openerp .ui-menu .ui-menu-item a.ui-state-active { background: #f0f0fa; } -.openerp div.ui-widget-overlay { - background: black; - filter: alpha(opacity=30); - opacity: 0.3; -} .openerp.ui-dialog { display: none; padding: 6px; @@ -294,6 +291,9 @@ .openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: left; } +.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { + margin-right: 4px; +} .openerp.ui-dialog .ui-dialog-titlebar-close { padding: 0; } @@ -329,6 +329,9 @@ .openerp.ui-dialog .oe_about a:hover { text-decoration: underline; } +.openerp.ui-dialog .oe_about a:focus { + outline: none; +} .openerp.ui-dialog .oe_about .oe_logo { margin-left: -6px; } @@ -2539,3 +2542,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 dd4f9baee66..2a2d816241f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -184,7 +184,7 @@ $sheet-max-width: 860px margin: 4px 0 // }}} // Button style {{{ - a.button:link, a.button:visited, button, input[type='submit'] + a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button display: inline-block border: 1px solid #ababab color: #404040 @@ -199,16 +199,18 @@ $sheet-max-width: 860px -webkit-font-smoothing: antialiased outline: none - a.button:hover, button:hover, input[type='submit']:hover + a.button:hover, button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover @include vertical-gradient(#f6f6f6, #e3e3e3) cursor: pointer + background-position: 0 - a.button:focus, button:focus, input[type='submit']:focus + a.button:focus, button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus border: 1px solid #80bfff + background-position: 0 @include vertical-gradient(#f6f6f6, #e3e3e3) @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset)) - a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active + a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active @include vertical-gradient(#e3e3e3, #f6f6f6) @include box-shadow(none) @@ -231,9 +233,7 @@ $sheet-max-width: 860px width: auto a.ui-state-active background: #f0f0fa - div.ui-widget-overlay - background: black - @include opacity(0.3) + // Modal box &.ui-dialog display: none @@ -270,6 +270,8 @@ $sheet-max-width: 860px margin: 0 .ui-dialog-buttonset float: left + .ui-button + margin-right: 4px .ui-dialog-titlebar-close padding: 0 .ui-icon-closethick @@ -296,6 +298,8 @@ $sheet-max-width: 860px color: #8A89BA &:hover text-decoration: underline + &:focus + outline: none .oe_logo margin-left: -6px .oe_bottom @@ -1993,6 +1997,10 @@ $sheet-max-width: 860px // }}} +// The jQuery-ui overlay is outside the .openerp div, please don't add indentation !!! +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 3364a85ba5904ed4bdd8fe9c61574e794c0ce9a7 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 1 Aug 2012 16:28:05 +0200 Subject: fixed padding in kanban tags and searchview tags bzr revid: mit@openerp.com-20120801142805-5drbpx6t3ks7p86s --- 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 703683d4d96..a15d8ca4b22 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1592,6 +1592,7 @@ line-height: 8px; width: 12px; height: 12px; + padding-top: 1px; text-align: center; font-weight: bold; cursor: pointer; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2a2d816241f..8723d9d6f2e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1227,6 +1227,7 @@ $sheet-max-width: 860px line-height: 8px width: 12px height: 12px + padding-top: 1px text-align: center font-weight: bold cursor: pointer -- cgit v1.2.3 From 38552a9c49eec29136c620ae99ebbc363fd45031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 3 Aug 2012 10:01:30 +0200 Subject: [IMP] base.css: added image_small and image_medium css. bzr revid: tde@openerp.com-20120803080130-qhs1wokpmjx3ejqa --- addons/web/static/src/css/base.css | 8 ++++++++ addons/web/static/src/css/base.sass | 8 ++++++++ 2 files changed, 16 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 ac04fb4d1e1..02c9db98eb5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2243,6 +2243,14 @@ .openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls { display: block; } +.openerp .oe_form .oe_form_field_image_small img { + max-width: 50px; + max-height: 50px; +} +.openerp .oe_form .oe_form_field_image_medium img { + max-width: 180px; + max-height: 180px; +} .openerp .oe_form_field_many2one td:first-child { position: relative; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2698787c5a3..58d24152b0e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1737,6 +1737,14 @@ $sheet-max-width: 860px @include box-sizing(border) &:hover .oe_form_field_image_controls display: block + .oe_form_field_image_small + img + max-width: 50px + max-height: 50px + .oe_form_field_image_medium + img + max-width: 180px + max-height: 180px // }}} // FormView.many2one {{{ .oe_form_field_many2one -- cgit v1.2.3 From ad585bf761e99e8037d2ff50ddc303ad0d4a8086 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 3 Aug 2012 17:37:58 +0200 Subject: Restyling of 'edit avatar' button bzr revid: mit@openerp.com-20120803153758-03jg3xuwyrh2e198 --- addons/web/static/src/css/base.css | 29 +++++++++++-------------- addons/web/static/src/css/base.sass | 43 ++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 41 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 1aa6f8aa54a..41ba0ce4cc3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -224,6 +224,9 @@ font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; font-size: 13px; } +.openerp .ui-widget-content a { + color: #8a89ba; +} .openerp .ui-menu .ui-menu-item { margin: 0 8px 0 0; padding: 0 0 0 12px; @@ -487,9 +490,6 @@ .openerp .oe_button_box button { margin: 4px; } -.openerp .oe_avatar { - margin: 0 6px 15px 0; -} .openerp .oe_avatar > img { height: 90px; max-width: 100px; @@ -2199,20 +2199,14 @@ .openerp .oe_form_editable .oe_form .oe_form_field_datetime { width: 11.5em !important; } -.openerp .oe_hidden_input_file { - overflow: hidden; - position: relative; - display: inline-block; - width: 45px; - height: 30px; -} .openerp .oe_hidden_input_file input.oe_form_binary_file { z-index: 0; line-height: 0; font-size: 12px; position: absolute; top: 1px; - right: 10px; + left: 0; + right: 0; opacity: 0; filter: alpha(opacity=0); -ms-filter: "alpha(opacity=0)"; @@ -2228,15 +2222,16 @@ } .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; + padding: 4px; + width: 100%; display: none; - width: 99%; text-align: center; - background: url(/web/static/src/img/form_sheetbg.png); - border-bottom: 1px dotted black; + color: #eeeeee; + background: rgba(37, 37, 37, 0.9); + -moz-border-radius: 3px 3px 0 0; + -webkit-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0eb4472164f..a2b4231b130 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -7,7 +7,7 @@ $tag-bg-dark: #8786b7 $tag-border: #afafb6 $tag-border-selected: #a6a6fe $hover-background: #f0f0fa -$colour4: #8a89ba +$link-color: #8a89ba $sheet-max-width: 860px // }}} // Mixins {{{ @@ -226,6 +226,8 @@ $sheet-max-width: 860px .ui-widget font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif font-size: 13px + .ui-widget-content a + color: $link-color .ui-menu .ui-menu-item margin: 0 8px 0 0 @@ -295,7 +297,7 @@ $sheet-max-width: 860px background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=) @include radius(0 0 2px 2px) a - color: #8A89BA + color: $link-color &:hover text-decoration: underline &:focus @@ -397,7 +399,6 @@ $sheet-max-width: 860px button margin: 4px .oe_avatar - margin: 0 6px 15px 0 > img height: 90px max-width: 100px @@ -412,7 +413,7 @@ $sheet-max-width: 860px display: none span @include reset() - color: #8A89BA + color: $link-color font-weight: bold &:hover text-decoration: underline @@ -886,7 +887,7 @@ $sheet-max-width: 860px .oe_secondary_menu_section font-weight: bold margin-left: 8px - color: $colour4 + color: $link-color .oe_secondary_submenu padding: 2px 0 8px 0 margin: 0 @@ -904,7 +905,7 @@ $sheet-max-width: 860px top: 1px right: 1px font-size: 10px - background: $colour4 + background: $link-color color: white padding: 2px 4px margin: 1px 6px 0 0 @@ -918,7 +919,7 @@ $sheet-max-width: 860px margin: 0px padding: 1px 4px .oe_active - background: $colour4 + background: $link-color border-top: 1px solid lightGray border-bottom: 1px solid lightGray text-shadow: 0 1px 1px rgba(0,0,0,0.2) @@ -927,12 +928,12 @@ $sheet-max-width: 860px color: white .oe_menu_label background: #eee - color: $colour4 + color: $link-color text-shadow: 0 1px 1px white @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2)) .oe_menu_counter background: #eee - color: #8a89ba + color: $link-color .oe_menu_toggler:before width: 0 height: 0 @@ -959,7 +960,7 @@ $sheet-max-width: 860px .oe_application width: 100% a - color: $colour4 + color: $link-color &:hover text-decoration: underline > div @@ -993,7 +994,7 @@ $sheet-max-width: 860px margin: 0 float: left a - color: $colour4 + color: $link-color .oe_button_group display: inline-block border: 1px solid #ababab @@ -1706,19 +1707,14 @@ $sheet-max-width: 860px * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image */ .oe_hidden_input_file - overflow: hidden - position: relative - display: inline-block - width: 45px - height: 30px input.oe_form_binary_file z-index: 0 line-height: 0 font-size: 12px position: absolute - // Should be adjusted for all browsers top: 1px - right: 10px + left: 0 + right: 0 opacity: 0 filter: alpha(opacity = 0) -ms-filter: "alpha(opacity=0)" @@ -1733,15 +1729,14 @@ $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 + padding: 4px + width: 100% display: none - width: 99% text-align: center - background: url(/web/static/src/img/form_sheetbg.png) - border-bottom: 1px dotted black + color: #eee + background: rgba(37,37,37,0.9) + @include radius(3px 3px 0 0) @include box-sizing(border) &:hover .oe_form_field_image_controls display: block -- cgit v1.2.3 From deeb7a7049b9484dadb53c04a0875c2d31bc7d15 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 4 Aug 2012 17:10:59 +0200 Subject: [IMP] better menutips, optional create arrow bzr revid: fp@openerp.com-20120804151059-f2tot2d2di2k72xu --- addons/web/static/src/css/base.css | 22 ++++++++++++++-------- addons/web/static/src/css/base.sass | 21 ++++++++++++--------- 2 files changed, 26 insertions(+), 17 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 ac04fb4d1e1..e0a10073a53 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1808,15 +1808,21 @@ margin: 0 0 0 4px; padding: 0; } -.openerp .oe_view_nocontent > img { - float: left; - margin: 1.5em; -} -.openerp .oe_view_nocontent > div { - overflow: hidden; - padding: 35px 0px 0px 0px; - max-width: 700px; +.openerp .oe_view_nocontent { + padding-left: 15px; + margin-top: 0; + color: #777777; font-size: 125%; + max-width: 700px; +} +.openerp .oe_view_nocontent .oe_view_nocontent_create { + background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 0 0; + padding-top: 35px; + min-height: 35px; + color: #4c4c4c; +} +.openerp .oe_view_nocontent > p { + padding-left: 95px; } .openerp .oe_formview { background: white; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2698787c5a3..210c4cb16b6 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1400,15 +1400,18 @@ $sheet-max-width: 860px // }}} // Views Common {{{ .oe_view_nocontent - > img - float: left - margin: 1.5em - > div - // don't encroach on my arrow - overflow: hidden - padding: 35px 0px 0px 0px - max-width: 700px - font-size: 125% + padding-left: 15px + margin-top: 0 + color: #777777 + font-size: 125% + max-width: 700px + .oe_view_nocontent_create + background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 0 0 + padding-top: 35px + min-height: 35px + color: #4c4c4c + > p + padding-left: 95px // }}} // FormView.base and dynamic tags {{{ .oe_formview -- cgit v1.2.3 From 80236895ae851d9c274541c1fca196977310b30c Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 4 Aug 2012 20:46:47 +0200 Subject: [IMP] empty personal dashboard bzr revid: fp@openerp.com-20120804184647-ahn839hnzlljgit3 --- addons/web/static/src/css/base.css | 6 ++++++ addons/web/static/src/css/base.sass | 6 ++++++ 2 files changed, 12 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 e0a10073a53..aba1c62e9f3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1824,6 +1824,12 @@ .openerp .oe_view_nocontent > p { padding-left: 95px; } +.openerp .oe_view_nocontent .oe_empty_custom_dashboard { + background: transparent url(/web/static/src/img/graph_background.png) no-repeat 0 0; + padding: 100px 0 0 137px; + min-height: 327px; + margin-left: -15px; +} .openerp .oe_formview { background: white; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 210c4cb16b6..2334be68a32 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1412,6 +1412,12 @@ $sheet-max-width: 860px color: #4c4c4c > p padding-left: 95px + .oe_empty_custom_dashboard + background: transparent url(/web/static/src/img/graph_background.png) no-repeat 0 0 + padding: 100px 0 0 137px + min-height: 327px + margin-left: -15px + // }}} // FormView.base and dynamic tags {{{ .oe_formview -- cgit v1.2.3 From bc0f0d9ca4be496a657287d248c96e31c34c69cf Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 4 Aug 2012 20:50:31 +0200 Subject: [IMP] empty personal dashboard bzr revid: fp@openerp.com-20120804185031-23l5cpdby6sep13h --- 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 aba1c62e9f3..40813fb9859 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1816,9 +1816,9 @@ max-width: 700px; } .openerp .oe_view_nocontent .oe_view_nocontent_create { - background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 0 0; + background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 7px 0; padding-top: 35px; - min-height: 35px; + min-height: 28px; color: #4c4c4c; } .openerp .oe_view_nocontent > p { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2334be68a32..3d4264a4074 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1406,9 +1406,9 @@ $sheet-max-width: 860px font-size: 125% max-width: 700px .oe_view_nocontent_create - background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 0 0 + background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 7px 0 padding-top: 35px - min-height: 35px + min-height: 28px color: #4c4c4c > p padding-left: 95px -- cgit v1.2.3 From fec7a28f45b17b714433cf0c88e1cff242051017 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 4 Aug 2012 21:01:26 +0200 Subject: imp_layout bzr revid: fp@openerp.com-20120804190126-h100ygpd8mm9w0no --- addons/web/static/src/css/base.css | 4 +++- addons/web/static/src/css/base.sass | 4 +++- 2 files changed, 6 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 40813fb9859..570b390a7dd 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1809,7 +1809,7 @@ padding: 0; } .openerp .oe_view_nocontent { - padding-left: 15px; + padding: 15px; margin-top: 0; color: #777777; font-size: 125%; @@ -1817,6 +1817,7 @@ } .openerp .oe_view_nocontent .oe_view_nocontent_create { background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 7px 0; + margin-top: 0; padding-top: 35px; min-height: 28px; color: #4c4c4c; @@ -1826,6 +1827,7 @@ } .openerp .oe_view_nocontent .oe_empty_custom_dashboard { background: transparent url(/web/static/src/img/graph_background.png) no-repeat 0 0; + margin-top: -15px; padding: 100px 0 0 137px; min-height: 327px; margin-left: -15px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3d4264a4074..a50cb725fad 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1400,13 +1400,14 @@ $sheet-max-width: 860px // }}} // Views Common {{{ .oe_view_nocontent - padding-left: 15px + padding: 15px margin-top: 0 color: #777777 font-size: 125% max-width: 700px .oe_view_nocontent_create background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 7px 0 + margin-top: 0 padding-top: 35px min-height: 28px color: #4c4c4c @@ -1414,6 +1415,7 @@ $sheet-max-width: 860px padding-left: 95px .oe_empty_custom_dashboard background: transparent url(/web/static/src/img/graph_background.png) no-repeat 0 0 + margin-top: -15px padding: 100px 0 0 137px min-height: 327px margin-left: -15px -- cgit v1.2.3 From 6b6989e29226cbe4310111c87379918fd6bee708 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 5 Aug 2012 12:12:58 +0200 Subject: [IMP] layout of config wizards, simple CSS bzr revid: fp@openerp.com-20120805101258-6d1cchw0ffi3ovvn --- addons/web/static/src/css/base.css | 11 +++++++++-- addons/web/static/src/css/base.sass | 10 ++++++++-- 2 files changed, 17 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 570b390a7dd..921fa5e72cf 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1922,6 +1922,13 @@ max-width: 860px; margin: 0 auto; } +.openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { + margin: 20px 0 10px 0; +} +.openerp .oe_form div.oe_form_configuration p { + color: #aaaaaa; + max-width: 650px; +} .openerp ul.oe_form_steps { height: 30px; padding: 0; @@ -2015,7 +2022,7 @@ } .openerp .oe_form td.oe_form_group_cell_label { border-right: 1px solid #dddddd; - padding: 2px 0px 2px 0px; + padding: 4px 0px 4px 0px; } .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; @@ -2027,7 +2034,7 @@ } .openerp .oe_form .oe_form_group { width: 100%; - margin: 6px 0 6px 0; + margin: 9px 0 9px 0; } .openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_right { padding-left: 20px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a50cb725fad..b67e9002e00 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1473,6 +1473,12 @@ $sheet-max-width: 860px min-width: 650px max-width: $sheet-max-width margin: 0 auto + div.oe_form_configuration + div.oe_horizontal_separator + margin: 20px 0 10px 0 + p + color: #aaa + max-width: 650px ul.oe_form_steps height: 30px padding: 0 @@ -1548,7 +1554,7 @@ $sheet-max-width: 860px margin: 2px td.oe_form_group_cell_label border-right: 1px solid #ddd - padding: 2px 0px 2px 0px + padding: 4px 0px 4px 0px label line-height: 18px display: block @@ -1557,7 +1563,7 @@ $sheet-max-width: 860px padding-left: 6px .oe_form_group width: 100% - margin: 6px 0 6px 0 + margin: 9px 0 9px 0 .oe_form_group_cell.oe_group_right padding-left: 20px // }}} -- cgit v1.2.3 From 145995c4bdf0b2bef228e4155ae9dbd7c71a7a4d Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 5 Aug 2012 12:21:46 +0200 Subject: [IMP] simple CSS for config wizards bzr revid: fp@openerp.com-20120805102146-uere3qqezb1frcm1 --- addons/web/static/src/css/base.css | 7 +++++-- addons/web/static/src/css/base.sass | 6 ++++-- 2 files changed, 9 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 921fa5e72cf..09eeaf9ce76 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1923,12 +1923,15 @@ margin: 0 auto; } .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { - margin: 20px 0 10px 0; + margin: 25px 0 10px 0; } .openerp .oe_form div.oe_form_configuration p { color: #aaaaaa; max-width: 650px; } +.openerp .oe_form div.oe_form_configuration label { + min-width: 150px; +} .openerp ul.oe_form_steps { height: 30px; padding: 0; @@ -2059,7 +2062,7 @@ font-weight: bold; font-size: 20px; margin: 8px 0px 8px 0px; - color: #aaaabb; + color: #53637e; } .openerp .oe_horizontal_separator:empty { height: 5px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b67e9002e00..dbf210730f6 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1475,10 +1475,12 @@ $sheet-max-width: 860px margin: 0 auto div.oe_form_configuration div.oe_horizontal_separator - margin: 20px 0 10px 0 + margin: 25px 0 10px 0 p color: #aaa max-width: 650px + label + min-width: 150px ul.oe_form_steps height: 30px padding: 0 @@ -1588,7 +1590,7 @@ $sheet-max-width: 860px font-weight: bold font-size: 20px margin: 8px 0px 8px 0px - color: #aab + color: #53637e .oe_horizontal_separator:empty height: 5px .oe_vertical_separator -- cgit v1.2.3 From 0cecacd43e14c920da4c4d961c87223ab8330b96 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 6 Aug 2012 16:00:44 +0200 Subject: [IMP] Improved m2o tooltip bzr revid: fme@openerp.com-20120806140044-mgo3git8zi9xrqbh --- addons/web/static/src/css/base.css | 13 +++++++++++++ addons/web/static/src/css/base.sass | 10 ++++++++++ 2 files changed, 23 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 8f35c81de2d..029b3ef4f10 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -602,6 +602,19 @@ .openerp.oe_tooltip .oe_tooltip_technical_title { font-weight: bold; } +.openerp.oe_tooltip .oe_tooltip_close { + margin: -5px 0 0 2px; + cursor: default; + float: right; + color: white; +} +.openerp.oe_tooltip .oe_tooltip_close:hover { + color: #999999; + cursor: pointer; +} +.openerp.oe_tooltip .oe_tooltip_message { + max-width: 310px; +} .openerp .oe_notebook { margin: 8px 0; padding: 0 16px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 688c306169b..449d76b882b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -469,6 +469,16 @@ $sheet-max-width: 860px list-style: circle .oe_tooltip_technical_title font-weight: bold + .oe_tooltip_close + margin: -5px 0 0 2px + cursor: default + float: right + color: white + &:hover + color: #999 + cursor: pointer + .oe_tooltip_message + max-width: 310px // }}} // Notebook {{{ .oe_notebook -- cgit v1.2.3 From d159b218c71781d5c8ed4ed0d8b202578d4c718c Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Mon, 6 Aug 2012 16:47:22 +0200 Subject: [IMP] Improved visual aspect of the stagesbar. bzr revid: vta@openerp.com-20120806144722-9cich1qg6t8ad3iq --- addons/web/static/src/css/base.css | 2 +- 1 file changed, 1 insertion(+), 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 8f35c81de2d..a7a749be187 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1952,7 +1952,7 @@ } .openerp ul.oe_form_steps li { border-right: none; - padding: 0; + padding: 0px; margin: 0; float: left; vertical-align: top; -- cgit v1.2.3 From acc5adf758c561efa20f89395d392646040f57b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 6 Aug 2012 17:54:18 +0200 Subject: [IMP] Renamed css oe_form_field_image_small and _medium to oe_image_small and _medium. bzr revid: tde@openerp.com-20120806155418-33zkumr6t4ez8k6e --- addons/web/static/src/css/base.css | 16 ++++++++-------- addons/web/static/src/css/base.sass | 14 ++++++-------- 2 files changed, 14 insertions(+), 16 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 22e3fa28357..77393168d7e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -509,6 +509,14 @@ .openerp .oe_avatar + div { margin-left: 5px; } +.openerp .oe_image_small > img { + max-width: 50px; + max-height: 50px; +} +.openerp .oe_image_medium > img { + max-width: 180px; + max-height: 180px; +} .openerp .oe_button.oe_link { border: none; padding: 0; @@ -2275,14 +2283,6 @@ .openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls { display: block; } -.openerp .oe_form .oe_form_field_image_small img { - max-width: 50px; - max-height: 50px; -} -.openerp .oe_form .oe_form_field_image_medium img { - max-width: 180px; - max-height: 180px; -} .openerp .oe_form_field_many2one td:first-child { position: relative; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 482dd490988..a2dde29f094 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -408,6 +408,12 @@ $sheet-max-width: 860px border: none .oe_avatar + div margin-left: 5px + .oe_image_small > img + max-width: 50px + max-height: 50px + .oe_image_medium > img + max-width: 180px + max-height: 180px .oe_button.oe_link @include reset() img @@ -1764,14 +1770,6 @@ $sheet-max-width: 860px @include box-sizing(border) &:hover .oe_form_field_image_controls display: block - .oe_form_field_image_small - img - max-width: 50px - max-height: 50px - .oe_form_field_image_medium - img - max-width: 180px - max-height: 180px // }}} // FormView.many2one {{{ .oe_form_field_many2one -- cgit v1.2.3 From 1277086229efee81388d9236e847ab1c7d0345d3 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 7 Aug 2012 11:31:07 +0200 Subject: [FIX] remove margins from oe_form_nosheet in editable list view Avoids list view moving around when edition starts (and form view is shown so fields can be used) bzr revid: xmo@openerp.com-20120807093107-2cqww3fmstd62to0 --- addons/web/static/src/css/base.css | 5 +++++ addons/web/static/src/css/base.sass | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 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 8f35c81de2d..7944570d16c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2340,6 +2340,11 @@ .openerp .oe_list { position: relative; } +.openerp .oe_list .oe_form .oe_form_nosheet { + margin: 0; + padding: 0; + border: none; +} .openerp .oe_list .oe_form .oe_form_field { width: auto; position: absolute; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 688c306169b..29d5ac1e87b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1831,11 +1831,16 @@ $sheet-max-width: 860px .oe_list position: relative - .oe_form .oe_form_field - width: auto - position: absolute - margin: 0 !important // dammit - padding: 0 + .oe_form + .oe_form_nosheet + margin: 0 // FIXME: either class or border should not be by default + padding: 0 + border: none + .oe_form_field + width: auto + position: absolute + margin: 0 !important // dammit + padding: 0 .oe_list_content width: 100% -- cgit v1.2.3 From b9467c69b4bd09cde67344b9e4a9ecee3bcce275 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 8 Aug 2012 08:51:18 +0200 Subject: [IMP] small CSS improvements bzr revid: fp@tinyerp.com-20120808065118-8sw6l6gmak1e48ld --- addons/web/static/src/css/base.css | 8 ++++---- addons/web/static/src/css/base.sass | 6 +++--- 2 files changed, 7 insertions(+), 7 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 09081426fca..434ee9377ab 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -78,7 +78,7 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -2150,7 +2150,7 @@ width: 100%; display: inline-block; padding: 2px 2px 2px 0px; - line-height: 18px; + line-height: 1em; } .openerp .oe_form .oe_form_field input { margin: 0px; @@ -2239,10 +2239,10 @@ overflow: hidden; } .openerp .oe_form_editable .oe_form .oe_form_field_integer { - width: 7em !important; + width: 6em !important; } .openerp .oe_form_editable .oe_form .oe_form_field_float { - width: 8em !important; + width: 7em !important; } .openerp .oe_form_editable .oe_form .oe_form_field_date { width: 7.5em !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0ef8f83f330..fd0f4e6b4aa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1661,7 +1661,7 @@ $sheet-max-width: 860px width: 100% display: inline-block padding: 2px 2px 2px 0px - line-height: 18px + line-height: 1em input margin: 0px input[type="text"], input[type="password"], input[type="file"], select @@ -1728,9 +1728,9 @@ $sheet-max-width: 860px .oe_form_editable .oe_form .oe_form_field_integer - width: 7em !important + width: 6em !important .oe_form_field_float - width: 8em !important + width: 7em !important .oe_form_field_date width: 7.5em !important .oe_form_field_datetime -- cgit v1.2.3 From 175c167471962d0c8acb7b509ac00aacd9a69fc8 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 8 Aug 2012 09:38:21 +0200 Subject: [FIX] fixing bugs in bounce effects + cleaner effect bzr revid: fp@tinyerp.com-20120808073821-gxp4r9u12160lshy --- addons/web/static/src/css/base.sass | 3 --- 1 file changed, 3 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fd0f4e6b4aa..949befdef77 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -435,9 +435,6 @@ $sheet-max-width: 860px text-decoration: none .oe_star_on color: gold - .oe_bounce - -moz-animation: bounce .40s linear - -webkit-animation: bounce .40s linear // }}} // Tags (for many2many tags, among others) {{{ .oe_tag -- cgit v1.2.3 From f92a925ec80508fe7a80584fe0a19db48b7fad5f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 7 Aug 2012 15:43:43 +0200 Subject: [CHG] resequence on arbitrary field with @widget=handle bzr revid: xmo@openerp.com-20120807134343-ch16bcp5s7goqxsl --- addons/web/static/src/css/base.css | 13 +++++++++++++ addons/web/static/src/css/base.sass | 5 +++++ 2 files changed, 18 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 434ee9377ab..295f2689a6d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2477,6 +2477,19 @@ .openerp .oe_list_content .numeric input { text-align: right; } +.openerp .oe_list_content .oe_list_field_handle { + width: 1em; +} +.openerp .oe_list_content .oe_list_field_handle .oe_list_handle { + font-size: 1px; + letter-spacing: -1px; + color: transparent; +} +.openerp .oe_list_content .oe_list_field_handle .oe_list_handle:before { + font: 21px "mnmliconsRegular"; + content: "ö"; + color: #404040; +} .openerp .tree_header { background-color: #f0f0f0; border-bottom: 1px solid #cacaca; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 949befdef77..8005449b226 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1926,6 +1926,11 @@ $sheet-max-width: 860px width: 82px input text-align: right + .oe_list_field_handle + width: 1em + .oe_list_handle + @include text-to-icon("ö") + // }}} // Tree view {{{ .tree_header -- cgit v1.2.3 From 73264632e7c90f8404fc4d34ef2842e466ea2586 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 7 Aug 2012 16:13:51 +0200 Subject: [IMP] set an NS-resize cursor on handle bzr revid: xmo@openerp.com-20120807141351-6d9vtnjpwjsx7wmj --- 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 295f2689a6d..346b6f25f54 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2479,6 +2479,7 @@ } .openerp .oe_list_content .oe_list_field_handle { width: 1em; + cursor: ns-resize; } .openerp .oe_list_content .oe_list_field_handle .oe_list_handle { font-size: 1px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8005449b226..67bb855eb39 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1928,6 +1928,7 @@ $sheet-max-width: 860px text-align: right .oe_list_field_handle width: 1em + cursor: ns-resize .oe_list_handle @include text-to-icon("ö") -- cgit v1.2.3 From d3441f111bab4c2c4dd4b26c70a849434e23ae97 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Tue, 7 Aug 2012 17:39:26 +0200 Subject: [FIX] Full CSS stagesbar. bzr revid: vta@openerp.com-20120807153926-xvklvq5419mup6hq --- addons/web/static/src/css/base.css | 77 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 73 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 a7a749be187..86f52d40cec 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1945,6 +1945,8 @@ padding: 0; margin: 0; text-shadow: 0 1px 1px white; + /*background: #dfdfdf;*/ + overflow: hidden; } .openerp ul.oe_form_steps img { vertical-align: top; @@ -1960,22 +1962,89 @@ padding: 0 0 0 12px; } .openerp ul.oe_form_steps li:first-child { + padding-left: 12px; border-left: 1px solid #cacaca; } .openerp ul.oe_form_steps li:last-child { margin-right: 12px; - padding-right: 12px; + /*padding-right: 12px;*/ border-right: 1px solid #cacaca; } -.openerp ul.oe_form_steps li a { +.openerp ul.oe_form_steps li { color: #4c4c4c; + text-decoration: none; + padding: 0 0 0 30px; + position: relative; + display: block; + float: left; + height: 30px; + background-color: #8a89ba; + color: white; +} +.openerp ul.oe_form_steps li span { + display:block; + margin-left: 10px; } .openerp ul.oe_form_steps li a:hover { color: black; } -.openerp ul.oe_form_steps .oe_form_steps_active { +.openerp ul.oe_form_steps li:after { + content: " "; + display: :block; + width: 0; + height: 0; + border-top: 50px solid transparent; + border-bottom: 50px solid transparent; + border-left: 30px solid #8a89ba; + position: absolute; + top: 50%; + margin-top: -50px; + left: 100%; + z-index: 2; +} +.openerp ul.oe_form_steps li:before { + content: " "; + display: :block; + width: 0; + height: 0; + border-top: 50px solid transparent; + border-bottom: 50px solid transparent; + border-left: 30px solid #eeeeee; + position: absolute; + top: 50%; + margin-top: -50px; + margin-left: 2px; + left: 100%; + z-index: 1; +} +.openerp ul.oe_form_steps li:hover { + background: #807fb4; +} +.openerp ul.oe_form_steps li:hover:after { + border-left-color: #807fb4; +} +.openerp ul.oe_form_steps li.oe_form_steps_active { font-weight: bold; - color: #b33630; + /*color: #b33630;*/ + text-shadow: 0 1px 1px #999999; + /*background-color: #dc5f59;*/ + background-color: #b33630; + color: white; +} +.openerp ul.oe_form_steps li.oe_form_steps_active:after { + content: " "; + display: :block; + width: 0; + height: 0; + border-top: 50px solid transparent; + border-bottom: 50px solid transparent; + /*border-left: 30px solid #dc5f59;*/ + border-left: 30px solid #b33630; + position: absolute; + top: 50%; + margin-top: -50px; + left: 100%; + z-index: 2; } .openerp .oe_form .oe_subtotal_footer { width: 1% !important; -- cgit v1.2.3 From 2447e00d220107d03a57841f18532a70774ca3b6 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 8 Aug 2012 09:56:29 +0200 Subject: [IMP] styling of handle column headers bzr revid: xmo@openerp.com-20120808075629-3xfkuxht8m9a1c02 --- addons/web/static/src/css/base.css | 11 ++++++++--- addons/web/static/src/css/base.sass | 6 +++++- 2 files changed, 13 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 346b6f25f54..d24657de195 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2477,16 +2477,21 @@ .openerp .oe_list_content .numeric input { text-align: right; } -.openerp .oe_list_content .oe_list_field_handle { +.openerp .oe_list_content th.oe_list_header_handle { + font-size: 1px; + overflow: hidden; + text-indent: -9001px; +} +.openerp .oe_list_content td.oe_list_field_handle { width: 1em; cursor: ns-resize; } -.openerp .oe_list_content .oe_list_field_handle .oe_list_handle { +.openerp .oe_list_content td.oe_list_field_handle .oe_list_handle { font-size: 1px; letter-spacing: -1px; color: transparent; } -.openerp .oe_list_content .oe_list_field_handle .oe_list_handle:before { +.openerp .oe_list_content td.oe_list_field_handle .oe_list_handle:before { font: 21px "mnmliconsRegular"; content: "ö"; color: #404040; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 67bb855eb39..4963369ecbb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1926,7 +1926,11 @@ $sheet-max-width: 860px width: 82px input text-align: right - .oe_list_field_handle + th.oe_list_header_handle + font-size: 1px + overflow: hidden + text-indent: -9001px + td.oe_list_field_handle width: 1em cursor: ns-resize .oe_list_handle -- cgit v1.2.3 From 52a01828c6b0fd9b7e51ed32ac6bb4fec69669d2 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Wed, 8 Aug 2012 14:16:54 +0200 Subject: [FIX] Fixed styling of the stagesbar. bzr revid: vta@openerp.com-20120808121654-79zztekljxzawpna --- addons/web/static/src/css/base.css | 172 +++++++++++++++++++++++-------------- 1 file changed, 106 insertions(+), 66 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 86f52d40cec..6eeb5e333c5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1940,112 +1940,152 @@ .openerp .oe_form div.oe_form_configuration label { min-width: 150px; } -.openerp ul.oe_form_steps { + +.openerp ul.oe_form_steps_clickable { height: 30px; - padding: 0; margin: 0; - text-shadow: 0 1px 1px white; - /*background: #dfdfdf;*/ + padding: 0; + text-shadow: 0 1px 1px #cacaca; + box-shadow: 0 0 1px rgba(0,0,0,0.5); overflow: hidden; } -.openerp ul.oe_form_steps img { - vertical-align: top; - margin-left: 8px; -} -.openerp ul.oe_form_steps li { - border-right: none; - padding: 0px; - margin: 0; - float: left; - vertical-align: top; - height: 30px; - padding: 0 0 0 12px; -} -.openerp ul.oe_form_steps li:first-child { - padding-left: 12px; - border-left: 1px solid #cacaca; -} -.openerp ul.oe_form_steps li:last-child { - margin-right: 12px; - /*padding-right: 12px;*/ - border-right: 1px solid #cacaca; -} -.openerp ul.oe_form_steps li { - color: #4c4c4c; +.openerp ul.oe_form_steps_clickable li { text-decoration: none; - padding: 0 0 0 30px; + padding: 0 0 0 30px; position: relative; display: block; float: left; height: 30px; - background-color: #8a89ba; color: white; } -.openerp ul.oe_form_steps li span { - display:block; - margin-left: 10px; +.openerp ul.oe_form_steps_clickable li.oe_form_steps_active { + font-weight: bold; + text-shadow: 0 1px 1px #999999; + box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25); + background-color: #dc5f59; + background: -webkit-linear-gradient(top, #dc5f59, #b33630); + color: white; } -.openerp ul.oe_form_steps li a:hover { - color: black; +.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive { + display: block; + cursor: pointer; + box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25); + background-color: #adadcf; + background: -webkit-linear-gradient(top, #adadcf, #7c7ba7); } -.openerp ul.oe_form_steps li:after { +.openerp ul.oe_form_steps_clickable li div { + padding: 0 30px 0 0; +} +.openerp ul.oe_form_steps_clickable .oe_form_steps_inactive:hover { + background: -webkit-linear-gradient(top, #7c7ba7, #adadcf); +} +.openerp ul.oe_form_steps_clickable li:after { content: " "; - display: :block; + display: block; width: 0; height: 0; - border-top: 50px solid transparent; - border-bottom: 50px solid transparent; - border-left: 30px solid #8a89ba; + border-top: 21px solid transparent; + border-bottom: 21px solid transparent; + border-left: 5px solid #807fb4; position: absolute; top: 50%; - margin-top: -50px; + margin-top: -21px; left: 100%; z-index: 2; } -.openerp ul.oe_form_steps li:before { +.openerp ul.oe_form_steps_clickable li:hover:after { + border-left: 5px solid #8a89ba; +} +.openerp ul.oe_form_steps_clickable li:before { content: " "; - display: :block; + display: block; width: 0; height: 0; - border-top: 50px solid transparent; - border-bottom: 50px solid transparent; - border-left: 30px solid #eeeeee; + border-top: 21px solid transparent; + border-bottom: 21px solid transparent; + border-left: 5px solid white; position: absolute; top: 50%; - margin-top: -50px; + margin-top: -21px; margin-left: 2px; left: 100%; - z-index: 1; -} -.openerp ul.oe_form_steps li:hover { - background: #807fb4; -} -.openerp ul.oe_form_steps li:hover:after { - border-left-color: #807fb4; + z-index: 2; } -.openerp ul.oe_form_steps li.oe_form_steps_active { +.openerp ul.oe_form_steps_clickable li.oe_form_steps_active { font-weight: bold; - /*color: #b33630;*/ text-shadow: 0 1px 1px #999999; - /*background-color: #dc5f59;*/ - background-color: #b33630; + background: -webkit-linear-gradient(top, #dc5f59, #b33630); color: white; } -.openerp ul.oe_form_steps li.oe_form_steps_active:after { - content: " "; - display: :block; +.openerp ul.oe_form_steps_clickable li.oe_form_steps_active:after { + content: ""; + display: block; + width: 0; + height: 0; + border-top: 21px solid transparent; + border-bottom: 21px solid transparent; + border-left: 5px solid #b33630; + position: absolute; + top: 50%; + margin-top: -21px; + left: 100%; + z-index: 2; +} +.openerp ul.oe_form_steps_clickable li.oe_form_steps_active:before { + content: ""; + display: block; width: 0; height: 0; - border-top: 50px solid transparent; - border-bottom: 50px solid transparent; - /*border-left: 30px solid #dc5f59;*/ - border-left: 30px solid #b33630; + border-top: 21px solid transparent; + border-bottom: 21px solid transparent; + border-left: 5px solid white; position: absolute; top: 50%; - margin-top: -50px; + margin-top: -21px; + margin-left: 2px; left: 100%; z-index: 2; } + +.openerp ul.oe_form_steps { + height: 30px; + padding: 0; + margin: 0; + text-shadow: 0 1px 1px white; +} +.openerp ul.oe_form_steps img { + vertical-align: top; + margin-left: 8px; +} +.openerp ul.oe_form_steps li { + border-right: none; + padding: 0; + margin: 0; + float: left; + vertical-align: top; + height: 30px; + padding: 0 0 0 12px; +} +.openerp ul.oe_form_steps li:first-child { + border-left: 1px solid #cacaca; +} +.openerp ul.oe_form_steps li:last-child { + margin-right: 12px; + padding-right: 12px; + border-right: 1px solid #cacaca; +} +.openerp ul.oe_form_steps li a { + color: #4c4c4c; +} +.openerp ul.oe_form_steps li a:hover { + color: black; +} +.openerp ul.oe_form_steps .oe_form_steps_active { + font-weight: bold; + color: #b33630; +} + + .openerp .oe_form .oe_subtotal_footer { width: 1% !important; } -- cgit v1.2.3 From f6df4372acbcebbffe08f4e378b047e51390bef8 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Wed, 8 Aug 2012 16:01:44 +0200 Subject: [FIX] fixed base.sass bzr revid: vta@openerp.com-20120808140144-bgwm6n2kl13a2lnz --- addons/web/static/src/css/base.css | 142 ++++++++++++++++-------------------- addons/web/static/src/css/base.sass | 87 ++++++++++++++++++++++ 2 files changed, 151 insertions(+), 78 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 85c59ccada7..dfd0a5abeac 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -78,7 +78,7 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -562,10 +562,6 @@ .openerp .oe_webclient .oe_star_on { color: gold; } -.openerp .oe_bounce { - -moz-animation: bounce 0.4s linear; - -webkit-animation: bounce 0.4s linear; -} .openerp .oe_tag { border-radius: 2px; -webkit-box-sizing: border-box; @@ -1961,48 +1957,62 @@ .openerp .oe_form div.oe_form_configuration label { min-width: 150px; } - +.openerp ul.oe_form_steps { + height: 30px; + padding: 0; + margin: 0; + text-shadow: 0 1px 1px white; +} +.openerp ul.oe_form_steps img { + vertical-align: top; + margin-left: 8px; +} +.openerp ul.oe_form_steps li { + border-right: none; + padding: 0; + margin: 0; + float: left; + vertical-align: top; + height: 30px; + padding: 0 0 0 12px; +} +.openerp ul.oe_form_steps li:first-child { + border-left: 1px solid #cacaca; +} +.openerp ul.oe_form_steps li:last-child { + margin-right: 12px; + padding-right: 12px; + border-right: 1px solid #cacaca; +} +.openerp ul.oe_form_steps li a { + color: #4c4c4c; +} +.openerp ul.oe_form_steps li a:hover { + color: black; +} +.openerp ul.oe_form_steps .oe_form_steps_active { + font-weight: bold; + color: #b33630; +} .openerp ul.oe_form_steps_clickable { height: 30px; margin: 0; padding: 0; text-shadow: 0 1px 1px #cacaca; - box-shadow: 0 0 1px rgba(0,0,0,0.5); + box-shadow: 0 0 1px rgba(0, 0, 0, 0.5); overflow: hidden; } .openerp ul.oe_form_steps_clickable li { - text-decoration: none; - padding: 0 0 0 30px; + border-right: none; + padding: 0 0 0 12px; position: relative; - display: block; float: left; + vertical-align: top; height: 30px; color: white; } -.openerp ul.oe_form_steps_clickable li.oe_form_steps_active { - font-weight: bold; - text-shadow: 0 1px 1px #999999; - box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25); - background-color: #dc5f59; - background: -webkit-linear-gradient(top, #dc5f59, #b33630); - color: white; -} -.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive { - display: block; - cursor: pointer; - box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25); - background-color: #adadcf; - background: -webkit-linear-gradient(top, #adadcf, #7c7ba7); -} -.openerp ul.oe_form_steps_clickable li div { - padding: 0 30px 0 0; -} -.openerp ul.oe_form_steps_clickable .oe_form_steps_inactive:hover { - background: -webkit-linear-gradient(top, #7c7ba7, #adadcf); -} .openerp ul.oe_form_steps_clickable li:after { content: " "; - display: block; width: 0; height: 0; border-top: 21px solid transparent; @@ -2015,11 +2025,10 @@ z-index: 2; } .openerp ul.oe_form_steps_clickable li:hover:after { - border-left: 5px solid #8a89ba; + border-left: 5px solid #807fb4; } .openerp ul.oe_form_steps_clickable li:before { content: " "; - display: block; width: 0; height: 0; border-top: 21px solid transparent; @@ -2035,17 +2044,34 @@ .openerp ul.oe_form_steps_clickable li.oe_form_steps_active { font-weight: bold; text-shadow: 0 1px 1px #999999; + box-shadow: inset 0 -1px 1px rgba(0, 0, 0, 0.25), inset 0 1px 1px rgba(255, 255, 255, 0.25); + background-color: #dc5f59; background: -webkit-linear-gradient(top, #dc5f59, #b33630); color: white; } +.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive { + cursor: pointer; + box-shadow: inset 0 -1px 1px rgba(0, 0, 0, 0.25), inset 0 1px 1px rgba(255, 255, 255, 0.25); + background-color: #adadcf; + background: -webkit-linear-gradient(top, #adadcf, #7c7ba7); +} +.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive div { + padding: 0 30px 0 0; +} +.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive:hover { + background: -webkit-linear-gradient(top, #7c7ba7, #adadcf); +} +.openerp ul.oe_form_steps_clickable li div { + padding: 0 30px 0 0; +} .openerp ul.oe_form_steps_clickable li.oe_form_steps_active:after { - content: ""; + content: " "; display: block; width: 0; height: 0; border-top: 21px solid transparent; border-bottom: 21px solid transparent; - border-left: 5px solid #b33630; + border-left: 5px solid #b33630; position: absolute; top: 50%; margin-top: -21px; @@ -2053,13 +2079,13 @@ z-index: 2; } .openerp ul.oe_form_steps_clickable li.oe_form_steps_active:before { - content: ""; + content: " "; display: block; width: 0; height: 0; border-top: 21px solid transparent; border-bottom: 21px solid transparent; - border-left: 5px solid white; + border-left: 5px solid white; position: absolute; top: 50%; margin-top: -21px; @@ -2067,46 +2093,6 @@ left: 100%; z-index: 2; } - -.openerp ul.oe_form_steps { - height: 30px; - padding: 0; - margin: 0; - text-shadow: 0 1px 1px white; -} -.openerp ul.oe_form_steps img { - vertical-align: top; - margin-left: 8px; -} -.openerp ul.oe_form_steps li { - border-right: none; - padding: 0; - margin: 0; - float: left; - vertical-align: top; - height: 30px; - padding: 0 0 0 12px; -} -.openerp ul.oe_form_steps li:first-child { - border-left: 1px solid #cacaca; -} -.openerp ul.oe_form_steps li:last-child { - margin-right: 12px; - padding-right: 12px; - border-right: 1px solid #cacaca; -} -.openerp ul.oe_form_steps li a { - color: #4c4c4c; -} -.openerp ul.oe_form_steps li a:hover { - color: black; -} -.openerp ul.oe_form_steps .oe_form_steps_active { - font-weight: bold; - color: #b33630; -} - - .openerp .oe_form .oe_subtotal_footer { width: 1% !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4963369ecbb..2570feec552 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1531,6 +1531,93 @@ $sheet-max-width: 860px .oe_form_steps_active font-weight: bold color: #b33630 + ul.oe_form_steps_clickable + height: 30px + margin: 0 + padding: 0 + text-shadow: 0 1px 1px #cacaca + box-shadow: 0 0 1px rgba(0,0,0,0.5) + overflow: hidden + li + border-right: none + padding: 0 0 0 12px + position: relative + float: left + vertical-align: top + height: 30px + color: white + &:after + content: " " + width: 0 + height: 0 + border-top: 21px solid transparent + border-bottom: 21px solid transparent + border-left: 5px solid #807fb4 + position: absolute + top: 50% + margin-top: -21px + left: 100% + z-index: 2 + &:hover:after + border-left: 5px solid #807fb4 + &:before + content: " " + width: 0 + height: 0 + border-top: 21px solid transparent + border-bottom: 21px solid transparent + border-left: 5px solid white + position: absolute + top: 50% + margin-top: -21px + margin-left: 2px + left: 100% + z-index: 2 + &.oe_form_steps_active + font-weight: bold + text-shadow: 0 1px 1px #999999 + box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25) + background-color: #dc5f59 + background: -webkit-linear-gradient(top, #dc5f59, #b33630) + color: white + &.oe_form_steps_inactive + cursor: pointer + box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25) + background-color: #adadcf + background: -webkit-linear-gradient(top, #adadcf, #7c7ba7) + div + padding: 0 30px 0 0 + &.oe_form_steps_inactive:hover + background: -webkit-linear-gradient(top, #7c7ba7, #adadcf) + div + padding: 0 30px 0 0 + &.oe_form_steps_active:after + content: " " + display: block + width: 0 + height: 0 + border-top: 21px solid transparent + border-bottom: 21px solid transparent + border-left: 5px solid #b33630 + position: absolute + top: 50% + margin-top: -21px + left: 100% + z-index: 2 + &.oe_form_steps_active:before + content: " " + display: block + width: 0 + height: 0 + border-top: 21px solid transparent + border-bottom: 21px solid transparent + border-left: 5px solid white + position: absolute + top: 50% + margin-top: -21px + margin-left: 2px + left: 100% + z-index: 2 .oe_form .oe_subtotal_footer width: 1% !important td.oe_form_group_cell -- cgit v1.2.3 From 3d48b3f877dd67d8dd0e26709f42c2ad2ab60635 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 8 Aug 2012 21:38:42 +0200 Subject: [IMP] misc CSS improvements, mainly editable lists bzr revid: fp@tinyerp.com-20120808193842-nxrk13vc8hv9wxlg --- addons/web/static/src/css/base.css | 62 +++++++++++++++++++++++++++++++------ addons/web/static/src/css/base.sass | 49 +++++++++++++++++++++++++++-- 2 files changed, 99 insertions(+), 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 dfd0a5abeac..5f4dd3b2157 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -78,7 +78,7 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -2401,10 +2401,18 @@ } .openerp .oe_form_field_many2one .oe_m2o_cm_button { line-height: 14px; + float: right; + padding-left: 2px; } .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } +.openerp .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page, .openerp .oe_form_field_many2many > .oe_view_manager .oe_list_pager_single_page { + display: none !important; +} +.openerp .oe_form_field_one2many .oe_form_field_one2many_list_row_add, .openerp .oe_form_field_many2many .oe_form_field_one2many_list_row_add { + font-weight: bold; +} .openerp .oe_form_field_one2many .oe_list_content > thead, .openerp .oe_form_field_many2many .oe_list_content > thead { border-bottom: 1px; } @@ -2438,6 +2446,49 @@ .openerp .oe_form_field_one2many .oe_list_buttons.oe_editing .oe_list_save, .openerp .oe_form_field_many2many .oe_list_buttons.oe_editing .oe_list_save { visibility: hidden; } +.openerp .oe_form_editable .oe_list_editable .oe_list_content td.oe_required { + background-color: #d2d2ff; +} +.openerp .oe_form_editable .oe_list_editable .oe_list_content td.oe_readonly { + background-color: #eeeeee; +} +.openerp .oe_list_editable .oe_list_content td.oe_list_field_cell { + padding: 4px 6px 3px 6px; +} +.openerp .oe_list.oe_list_editable td.oe_list_record_delete { + position: absolute; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_m2o_drop_down_button { + top: 5px; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_m2o_cm_button { + display: none; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input { + height: 27px; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { + border: 1px solid #aaaaff; + border-radius: 0px; + margin: 0px; + -webkit-border-radius: 0px; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { + height: 60px; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input { + text-align: right; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime > span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date > span { + width: 100%; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master { + width: 100% !important; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field .oe_form_field_float, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field .oe_form_view_integer, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date { + min-width: 0 !important; + max-width: none !important; +} .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { display: none; } @@ -2556,15 +2607,6 @@ background: #eeeeee; font-weight: bold; } -.openerp .oe_list_content > tbody tr:hover td, .openerp .oe_list_content tbody tr:hover th { - background-color: #eeeeee; - background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dedede); - background-image: -moz-linear-gradient(top, #eeeeee, #dedede); - background-image: -ms-linear-gradient(top, #eeeeee, #dedede); - background-image: -o-linear-gradient(top, #eeeeee, #dedede); - background-image: linear-gradient(to bottom, #eeeeee, #dedede); -} .openerp .oe_list_content .numeric { text-align: right; width: 82px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2570feec552..75382b1c2c0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1875,6 +1875,8 @@ $sheet-max-width: 860px right: 0px .oe_m2o_cm_button line-height: 14px + float: right + padding-left: 2px // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager @@ -1882,6 +1884,11 @@ $sheet-max-width: 860px display: none .oe_form_field_one2many,.oe_form_field_many2many // TODO: oe_form_field_one2many_list? + > .oe_view_manager + .oe_list_pager_single_page + display: none !important + .oe_form_field_one2many_list_row_add + font-weight: bold .oe_list_content > thead border-bottom: 1px @@ -1911,6 +1918,46 @@ $sheet-max-width: 860px .oe_list_buttons.oe_editing .oe_list_save // keep "save row" button hidden in o2m visibility: hidden + .oe_form_editable + .oe_list_editable + .oe_list_content + td.oe_required + background-color: #d2d2ff + td.oe_readonly + background-color: #eee + .oe_list_editable + .oe_list_content + td.oe_list_field_cell + padding: 4px 6px 3px 6px + .oe_list.oe_list_editable + td.oe_list_record_delete + position: absolute + .oe_list.oe_list_editable.oe_editing + .oe_m2o_drop_down_button + top: 5px + .oe_m2o_cm_button + display: none + .oe_form_field + input + height: 27px + input, textarea + border: 1px solid #aaf + border-radius: 0px + margin: 0px + -webkit-border-radius: 0px + textarea + height: 60px + &.oe_form_field_float,&.oe_form_view_integer + input + text-align: right + &.oe_form_field_datetime,&.oe_form_field_date + > span + width: 100% + input.oe_datepicker_master + width: 100% !important + .oe_form_field_float,.oe_form_view_integer,&.oe_form_field_datetime,&.oe_form_field_date + min-width: 0 !important + max-width: none !important // }}} // FormView.many2many {{{ .oe_form .oe_form_field_many2many > .oe_list @@ -2005,8 +2052,6 @@ $sheet-max-width: 860px background: #eee font-weight: bold - > tbody tr:hover td, tbody tr:hover th - @include vertical-gradient(#eee, #dedede) .numeric text-align: right -- cgit v1.2.3 From 2043809be494efb256a6a8d0147a49a614b099c8 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 9 Aug 2012 15:46:12 +0200 Subject: Restyling of the dashboard bzr revid: mit@openerp.com-20120809134612-lt4l62nzezlfbkgq --- 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 41ba0ce4cc3..1519478ee89 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1881,7 +1881,7 @@ width: auto; } .openerp .oe_form_nosheet { - margin: 20px; + margin: 8px; } .openerp .oe_form_nosheet > header { margin-top: -20px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a2b4231b130..ddee25c3105 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1450,7 +1450,7 @@ $sheet-max-width: 860px .oe_form .oe_form_field_date width: auto .oe_form_nosheet - margin: 20px + margin: 8px .oe_form_nosheet > header margin-top: -20px margin-left: -20px -- cgit v1.2.3 From 2911c24aefb62b6afbb610518bc4abcc9fe1c7d1 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 9 Aug 2012 18:52:08 +0200 Subject: fix view manager header padding when there is only 1 row (eg. In the wall) bzr revid: mit@openerp.com-20120809165208-z70qg2vyz3f6i8cp --- addons/web/static/src/css/base.css | 5 ++++- addons/web/static/src/css/base.sass | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 9 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 eab9c61acd2..103258d994f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -78,7 +78,7 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -1294,6 +1294,9 @@ .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row:last-child td { padding-top: 0; } +.openerp .oe_view_manager table.oe_view_manager_header .oe_header_row:first-child td { + padding-top: 8px; +} .openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_sidebar { margin: 0px auto; text-align: center; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e0e8a3534dc..3d56fa8034f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -144,10 +144,10 @@ $sheet-max-width: 860px // }}} //Placeholder style{{{ \:-moz-placeholder - color: $facets-border !important + color: $tag-border !important font-style: italic !important \::-webkit-input-placeholder - color: $facets-border !important + color: $tag-border !important font-style: italic !important //}}} // Tag reset {{{ @@ -160,7 +160,7 @@ $sheet-max-width: 860px font-weight: bold background-color: #f0f0f0 th - border-right: 1px dotted $facets-border + border-right: 1px dotted $tag-border &:last-child border-right: none th, td @@ -554,7 +554,7 @@ $sheet-max-width: 860px top: 26px left: 0 z-index: 1 - border: 1px solid $facets-border + border: 1px solid $tag-border background: white padding: 4px 0 min-width: 140px @@ -834,7 +834,7 @@ $sheet-max-width: 860px display: none width: 220px background: #f0eeee - border-right: 1px solid $facets-border + border-right: 1px solid $tag-border text-shadow: 0 1px 1px white padding-bottom: 16px a.oe_logo @@ -1005,6 +1005,9 @@ $sheet-max-width: 860px .oe_header_row:last-child td padding-top: 0 + .oe_header_row:first-child + td + padding-top: 8px .oe_view_manager_sidebar margin: 0px auto text-align: center @@ -1275,7 +1278,7 @@ $sheet-max-width: 860px background-color: white min-width: 100% display: none - border: 1px solid $facets-border + border: 1px solid $tag-border text-align: left @include radius(4px) @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) @@ -1660,7 +1663,7 @@ $sheet-max-width: 860px background: white min-height: 330px padding: 16px - border: 1px solid $facets-border + border: 1px solid $tag-border @include box-shadow(0 0 10px rgba(0,0,0,0.3)) .ui-tabs margin: 0 -16px @@ -2095,7 +2098,7 @@ $sheet-max-width: 860px border-bottom: 2px solid #cacaca .treeview-tr, .treeview-td cursor: pointer - border-right: 1px dotted $facets-border + border-right: 1px dotted $tag-border vertical-align: top text-align: left border-bottom: 1px solid #cfcccc -- cgit v1.2.3 From e5b954cad062fa7ecba6d32e016e322c7c813e75 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 10 Aug 2012 14:49:12 +0200 Subject: chatter padding bzr revid: mit@openerp.com-20120810124912-bg2emb6fabv0xrkx --- 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 103258d994f..68132f0fd1d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1951,6 +1951,7 @@ min-width: 650px; max-width: 860px; margin: 0 auto; + padding: 16px 0 48px; } .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { margin: 25px 0 10px 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3d56fa8034f..b420a237278 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1506,6 +1506,7 @@ $sheet-max-width: 860px min-width: 650px max-width: $sheet-max-width margin: 0 auto + padding: 16px 0 48px div.oe_form_configuration div.oe_horizontal_separator margin: 25px 0 10px 0 -- cgit v1.2.3 From dcc24957bd7dd2d7e2a1b3056b06b5f04e9af866 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 14 Aug 2012 12:39:11 +0200 Subject: [IMP] small css improvement bzr revid: fp@openerp.com-20120814103911-8l63u3bahy9w4xsj --- addons/web/static/src/css/base.css | 7 +++++-- addons/web/static/src/css/base.sass | 3 +++ 2 files changed, 8 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 eab9c61acd2..330885de21f 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"); @@ -78,7 +78,7 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -580,6 +580,9 @@ background: #8786b7; color: #eeeeee; } +.openerp .oe_tags.oe_inline { + min-width: 250px; +} .openerp .oe_tags .text-wrap { width: 100% !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e0e8a3534dc..a1726e7e1a9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,6 +1,7 @@ @charset "utf-8" // Variables {{{ +$facets-border: #afafb6 $section-title-color: #8786b7 $tag-bg-light: #f0f0fa $tag-bg-dark: #8786b7 @@ -457,6 +458,8 @@ $sheet-max-width: 860px color: #eee .oe_tags + &.oe_inline + min-width: 250px .text-wrap width: 100% !important textarea -- cgit v1.2.3 From 45660bff5c4421024bd31b21cfc4fa54761baffb Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 13 Aug 2012 20:29:46 +0200 Subject: Brand new status breadcrum! (TODO: update js for clickable buttons) bzr revid: mit@openerp.com-20120813182946-ep9231bf7bksyvev --- addons/web/static/src/css/base.css | 234 ++++++++++++++++++------------------ addons/web/static/src/css/base.sass | 193 +++++++++++++---------------- 2 files changed, 195 insertions(+), 232 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 68132f0fd1d..f602e6feea2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -76,6 +76,7 @@ color: #4c4c4c; font-size: 13px; background: white; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image */ @@ -159,7 +160,7 @@ .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; - color: #404040; + color: #4c4c4c; margin: 0; padding: 3px 12px; font-size: 13px; @@ -1941,7 +1942,6 @@ background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); padding: 0 8px; - line-height: 30px; } .openerp .oe_form header ul { display: inline-block; @@ -1963,141 +1963,135 @@ .openerp .oe_form div.oe_form_configuration label { min-width: 150px; } -.openerp ul.oe_form_steps { - height: 30px; - padding: 0; - margin: 0; - text-shadow: 0 1px 1px white; -} -.openerp ul.oe_form_steps img { - vertical-align: top; - margin-left: 8px; +.openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable { + display: inline-block; + padding-right: 18px; } -.openerp ul.oe_form_steps li { - border-right: none; - padding: 0; - margin: 0; - float: left; - vertical-align: top; - height: 30px; - padding: 0 0 0 12px; +.openerp ul.oe_form_steps li, .openerp ul.oe_form_steps_clickable li { + display: inline-block; + margin-right: -20px; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); } -.openerp ul.oe_form_steps li:first-child { +.openerp ul.oe_form_steps li:first-child .label, .openerp ul.oe_form_steps_clickable li:first-child .label { border-left: 1px solid #cacaca; + padding-left: 14px; } -.openerp ul.oe_form_steps li:last-child { - margin-right: 12px; - padding-right: 12px; +.openerp ul.oe_form_steps li:last-child, .openerp ul.oe_form_steps_clickable li:last-child { border-right: 1px solid #cacaca; } -.openerp ul.oe_form_steps li a { - color: #4c4c4c; +.openerp ul.oe_form_steps li:last-child .label, .openerp ul.oe_form_steps_clickable li:last-child .label { + padding-right: 14px; } -.openerp ul.oe_form_steps li a:hover { - color: black; -} -.openerp ul.oe_form_steps .oe_form_steps_active { - font-weight: bold; - color: #b33630; +.openerp ul.oe_form_steps li:last-child .arrow, .openerp ul.oe_form_steps_clickable li:last-child .arrow { + display: none; } -.openerp ul.oe_form_steps_clickable { - height: 30px; +.openerp ul.oe_form_steps li .label, .openerp ul.oe_form_steps_clickable li .label { + color: #4c4c4c; + text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede; + padding: 7px; + display: inline-block; + padding-left: 24px; margin: 0; - padding: 0; - text-shadow: 0 1px 1px #cacaca; - box-shadow: 0 0 1px rgba(0, 0, 0, 0.5); - overflow: hidden; -} -.openerp ul.oe_form_steps_clickable li { - border-right: none; - padding: 0 0 0 12px; position: relative; - float: left; - vertical-align: top; - height: 30px; - color: white; + z-index: 10; } -.openerp ul.oe_form_steps_clickable li:after { - content: " "; - width: 0; - height: 0; - border-top: 21px solid transparent; - border-bottom: 21px solid transparent; - border-left: 5px solid #807fb4; - position: absolute; - top: 50%; - margin-top: -21px; - left: 100%; - z-index: 2; -} -.openerp ul.oe_form_steps_clickable li:hover:after { - border-left: 5px solid #807fb4; -} -.openerp ul.oe_form_steps_clickable li:before { - content: " "; - width: 0; - height: 0; - border-top: 21px solid transparent; - border-bottom: 21px solid transparent; - border-left: 5px solid white; - position: absolute; - top: 50%; - margin-top: -21px; - margin-left: 2px; - left: 100%; - z-index: 2; +.openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow { + width: 17px; + display: inline-block; + vertical-align: top; + overflow: hidden; + margin-left: -5px; } -.openerp ul.oe_form_steps_clickable li.oe_form_steps_active { - font-weight: bold; - text-shadow: 0 1px 1px #999999; - box-shadow: inset 0 -1px 1px rgba(0, 0, 0, 0.25), inset 0 1px 1px rgba(255, 255, 255, 0.25); - background-color: #dc5f59; - background: -webkit-linear-gradient(top, #dc5f59, #b33630); +.openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span { + position: relative; + z-index: 11; + width: 24px; + height: 24px; + display: inline-block; + margin-left: -12px; + margin-top: 3px; + box-shadow: -1px 1px 2px rgba(255, 255, 255, 0.2), inset -1px 1px 1px rgba(0, 0, 0, 0.2); + background-color: #dedede; + background: -moz-linear-gradient(135deg, #dedede, #fcfcfc); + background: -o-linear-gradient(135deg, #fcfcfc, #dedede); + background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede)); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-transform: rotate(45deg); + -webkit-transform: rotate(45deg); + -o-transform: rotate(45deg); + -ms-transform: rotate(45deg); +} +.openerp ul.oe_form_steps li.oe_active, .openerp ul.oe_form_steps_clickable li.oe_active { + background-color: #729fcf; + background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); + background-image: -webkit-linear-gradient(top, #729fcf, #3465a4); + background-image: -moz-linear-gradient(top, #729fcf, #3465a4); + background-image: -ms-linear-gradient(top, #729fcf, #3465a4); + background-image: -o-linear-gradient(top, #729fcf, #3465a4); + background-image: linear-gradient(to bottom, #729fcf, #3465a4); +} +.openerp ul.oe_form_steps li.oe_active .arrow span, .openerp ul.oe_form_steps_clickable li.oe_active .arrow span { + background-color: #3465a4; + background: -moz-linear-gradient(135deg, #3465a4, #729fcf); + background: -o-linear-gradient(135deg, #729fcf, #3465a4); + background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4)); +} +.openerp ul.oe_form_steps li.oe_active .label, .openerp ul.oe_form_steps_clickable li.oe_active .label { color: white; + text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4; } -.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive { +.openerp ul.oe_form_steps_clickable li { cursor: pointer; - box-shadow: inset 0 -1px 1px rgba(0, 0, 0, 0.25), inset 0 1px 1px rgba(255, 255, 255, 0.25); - background-color: #adadcf; - background: -webkit-linear-gradient(top, #adadcf, #7c7ba7); -} -.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive div { - padding: 0 30px 0 0; -} -.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive:hover { - background: -webkit-linear-gradient(top, #7c7ba7, #adadcf); } -.openerp ul.oe_form_steps_clickable li div { - padding: 0 30px 0 0; -} -.openerp ul.oe_form_steps_clickable li.oe_form_steps_active:after { - content: " "; - display: block; - width: 0; - height: 0; - border-top: 21px solid transparent; - border-bottom: 21px solid transparent; - border-left: 5px solid #b33630; - position: absolute; - top: 50%; - margin-top: -21px; - left: 100%; - z-index: 2; +.openerp ul.oe_form_steps_clickable li:hover { + background-color: #e8e8e8; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); + background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); + background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); +} +.openerp ul.oe_form_steps_clickable li:hover .label { + text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede; +} +.openerp ul.oe_form_steps_clickable li:hover .arrow span { + background-color: #e8e8e8; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); + background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); + background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); +} +.openerp ul.oe_form_steps_clickable li .label { + color: #8a89ba; } -.openerp ul.oe_form_steps_clickable li.oe_form_steps_active:before { - content: " "; - display: block; - width: 0; - height: 0; - border-top: 21px solid transparent; - border-bottom: 21px solid transparent; - border-left: 5px solid white; - position: absolute; - top: 50%; - margin-top: -21px; - margin-left: 2px; - left: 100%; - z-index: 2; +.openerp ul.oe_form_steps_clickable li.oe_active:hover { + background-color: #4c85c2; + background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d)); + background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d); + background-image: -moz-linear-gradient(top, #4c85c2, #284d7d); + background-image: -ms-linear-gradient(top, #4c85c2, #284d7d); + background-image: -o-linear-gradient(top, #4c85c2, #284d7d); + background-image: linear-gradient(to bottom, #4c85c2, #284d7d); +} +.openerp ul.oe_form_steps_clickable li.oe_active:hover .label { + text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4; +} +.openerp ul.oe_form_steps_clickable li.oe_active:hover .arrow span { + background-color: #284d7d; + background: -moz-linear-gradient(135deg, #284d7d, #4c85c2); + background: -o-linear-gradient(135deg, #4c85c2, #284d7d); + background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d)); } .openerp .oe_form .oe_subtotal_footer { width: 1% !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b420a237278..3aee82e274d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -87,6 +87,18 @@ $sheet-max-width: 860px -ms-box-sizing: #{$type}-box box-sizing: #{$type}-box +@mixin skew-gradient($startColor: #555, $endColor: #333) + background-color: $endColor + background: -moz-linear-gradient(135deg, $endColor, $startColor) + background: -o-linear-gradient(135deg, $startColor, $endColor) + background: -webkit-gradient(linear, left top, right bottom, from($startColor), to($endColor)) + +@mixin transform($transform) + -moz-transform: $transform + -webkit-transform: $transform + -o-transform: $transform + -ms-transform: $transform + // Transforms the (readable) text of an inline element into an mmlicons icon, // allows for actual readable text in-code (and in readers?) with iconic looks @mixin text-to-icon($icon-name, $color: #404040) @@ -141,6 +153,7 @@ $sheet-max-width: 860px color: #4c4c4c font-size: 13px background: white + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5) // }}} //Placeholder style{{{ \:-moz-placeholder @@ -195,7 +208,7 @@ $sheet-max-width: 860px a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button display: inline-block border: 1px solid #ababab - color: #404040 + color: #4c4c4c margin: 0 padding: 3px 12px font-size: 13px @@ -1498,7 +1511,7 @@ $sheet-max-width: 860px 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 @@ -1515,122 +1528,78 @@ $sheet-max-width: 860px max-width: 650px label min-width: 150px - ul.oe_form_steps - height: 30px - padding: 0 - margin: 0 - text-shadow: 0 1px 1px white - img - vertical-align: top - margin-left: 8px - li - border-right: none - padding: 0 - margin: 0 - float: left - vertical-align: top - height: 30px - padding: 0 0 0 12px - &:first-child + + + ul.oe_form_steps, ul.oe_form_steps_clickable + display: inline-block + padding-right: 18px + li + display: inline-block + margin-right: -20px + @include vertical-gradient(#fcfcfc, #dedede) + &:first-child .label border-left: 1px solid #cacaca + padding-left: 14px &:last-child - margin-right: 12px - padding-right: 12px border-right: 1px solid #cacaca - a + .label + padding-right: 14px + .arrow + display: none + .label color: #4c4c4c - &:hover - color: black - .oe_form_steps_active - font-weight: bold - color: #b33630 + text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede + padding: 7px + display: inline-block + padding-left: 24px + margin: 0 + position: relative + z-index: 10 + .arrow + width: 17px + display: inline-block + vertical-align: top + overflow: hidden + margin-left: -5px + span + position: relative + z-index: 11 + width: 24px + height: 24px + display: inline-block + margin-left: -12px + margin-top: 3px + box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2) + @include skew-gradient(#fcfcfc, #dedede) + @include radius(3px) + @include transform(rotate(45deg)) + li.oe_active + @include vertical-gradient(#729fcf, #3465a4) + .arrow span + @include skew-gradient(#729fcf, #3465a4) + .label + color: white + text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 + ul.oe_form_steps_clickable - height: 30px - margin: 0 - padding: 0 - text-shadow: 0 1px 1px #cacaca - box-shadow: 0 0 1px rgba(0,0,0,0.5) - overflow: hidden li - border-right: none - padding: 0 0 0 12px - position: relative - float: left - vertical-align: top - height: 30px - color: white - &:after - content: " " - width: 0 - height: 0 - border-top: 21px solid transparent - border-bottom: 21px solid transparent - border-left: 5px solid #807fb4 - position: absolute - top: 50% - margin-top: -21px - left: 100% - z-index: 2 - &:hover:after - border-left: 5px solid #807fb4 - &:before - content: " " - width: 0 - height: 0 - border-top: 21px solid transparent - border-bottom: 21px solid transparent - border-left: 5px solid white - position: absolute - top: 50% - margin-top: -21px - margin-left: 2px - left: 100% - z-index: 2 - &.oe_form_steps_active - font-weight: bold - text-shadow: 0 1px 1px #999999 - box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25) - background-color: #dc5f59 - background: -webkit-linear-gradient(top, #dc5f59, #b33630) - color: white - &.oe_form_steps_inactive - cursor: pointer - box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25) - background-color: #adadcf - background: -webkit-linear-gradient(top, #adadcf, #7c7ba7) - div - padding: 0 30px 0 0 - &.oe_form_steps_inactive:hover - background: -webkit-linear-gradient(top, #7c7ba7, #adadcf) - div - padding: 0 30px 0 0 - &.oe_form_steps_active:after - content: " " - display: block - width: 0 - height: 0 - border-top: 21px solid transparent - border-bottom: 21px solid transparent - border-left: 5px solid #b33630 - position: absolute - top: 50% - margin-top: -21px - left: 100% - z-index: 2 - &.oe_form_steps_active:before - content: " " - display: block - width: 0 - height: 0 - border-top: 21px solid transparent - border-bottom: 21px solid transparent - border-left: 5px solid white - position: absolute - top: 50% - margin-top: -21px - margin-left: 2px - left: 100% - z-index: 2 + cursor: pointer + &:hover + @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) + .label + text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede + .arrow span + @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) + .label + color: $link-color + li.oe_active + &:hover + @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .label + text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 + .arrow span + @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .oe_form .oe_subtotal_footer width: 1% !important td.oe_form_group_cell -- cgit v1.2.3 From 332b118e3e16ae764dface838af6451ad567c433 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 16 Aug 2012 18:38:42 +0200 Subject: fixed configuration view header bzr revid: mit@openerp.com-20120816163842-3g2y0hgmmcdtjzsd --- addons/web/static/src/css/base.css | 8 +++----- addons/web/static/src/css/base.sass | 10 ++++------ 2 files changed, 7 insertions(+), 11 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 f602e6feea2..38d9311c3e2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1924,12 +1924,10 @@ width: auto; } .openerp .oe_form_nosheet { - margin: 8px; + margin: 16px; } .openerp .oe_form_nosheet > header { - margin-top: -20px; - margin-left: -20px; - margin-right: -20px; + margin: -16px -16px 0 -16px; } .openerp .oe_form header { position: relative; @@ -1941,7 +1939,7 @@ background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); - padding: 0 8px; + padding: 8px; } .openerp .oe_form header ul { display: inline-block; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3aee82e274d..ad2b3b87773 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1498,11 +1498,9 @@ $sheet-max-width: 860px .oe_form .oe_form_field_date width: auto .oe_form_nosheet - margin: 8px - .oe_form_nosheet > header - margin-top: -20px - margin-left: -20px - margin-right: -20px + margin: 16px + > header + margin: -16px -16px 0 -16px // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1510,7 +1508,7 @@ $sheet-max-width: 860px position: relative border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) - padding: 0 8px + padding: 8px //line-height: 30px ul display: inline-block -- cgit v1.2.3 From 281877d27470826b8b4925aaa1e79d14c95f963f Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 17 Aug 2012 02:09:35 +0200 Subject: [FIX] nosheet css fix, revert 3 lines from 2903, does anyone care ? bzr revid: al@openerp.com-20120817000935-ev1iqsmrolq3sjiq --- 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 330885de21f..a39838070cb 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1926,9 +1926,9 @@ margin: 8px; } .openerp .oe_form_nosheet > header { - margin-top: -20px; - margin-left: -20px; - margin-right: -20px; + margin-top: -8px; + margin-left: -8px; + margin-right: -8px; } .openerp .oe_form header { position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a1726e7e1a9..f1d1f2e9f1f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1487,9 +1487,9 @@ $sheet-max-width: 860px .oe_form_nosheet margin: 8px .oe_form_nosheet > header - margin-top: -20px - margin-left: -20px - margin-right: -20px + margin-top: -8px + margin-left: -8px + margin-right: -8px // }}} // FormView.custom tags and classes {{{ .oe_form -- cgit v1.2.3 From 651b7baf5fc9b143aaba8c53c8cc5929e352dca7 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 17 Aug 2012 15:57:13 +0200 Subject: [FIX] header padding bzr revid: al@openerp.com-20120817135713-vyvu8scxttsy04rr --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 6 +++--- 2 files changed, 5 insertions(+), 5 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 b9eb6fed93b..87a83b4c70e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -79,7 +79,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -1931,6 +1931,7 @@ } .openerp .oe_form_nosheet > header { margin: -16px -16px 0 -16px; + padding: 8px; } .openerp .oe_form header { position: relative; @@ -1942,7 +1943,6 @@ background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); - padding: 8px; } .openerp .oe_form header ul { display: inline-block; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index befb68b42db..7055f867b36 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1502,8 +1502,9 @@ $sheet-max-width: 860px width: auto .oe_form_nosheet margin: 16px - > header - margin: -16px -16px 0 -16px + .oe_form_nosheet > header + margin: -16px -16px 0 -16px + padding: 8px // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1511,7 +1512,6 @@ $sheet-max-width: 860px position: relative border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) - padding: 8px //line-height: 30px ul display: inline-block -- cgit v1.2.3 From 86f04a8726eb4a9e838a3a2fe3a0953b45a2fe28 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 17 Aug 2012 16:22:29 +0200 Subject: darker link color and padding fix bzr revid: mit@openerp.com-20120817142229-v8pvwnysx8vpqyl0 --- addons/web/static/src/css/base.css | 32 ++++++++++++++++---------------- addons/web/static/src/css/base.sass | 9 ++++----- 2 files changed, 20 insertions(+), 21 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 b9eb6fed93b..ab74e92ac69 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"); @@ -79,7 +79,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -234,7 +234,7 @@ font-size: 13px; } .openerp .ui-widget-content a { - color: #8a89ba; + color: #7c7bad; } .openerp .ui-menu .ui-menu-item { margin: 0 8px 0 0; @@ -336,7 +336,7 @@ border-radius: 0 0 2px 2px; } .openerp.ui-dialog .oe_about a { - color: #8a89ba; + color: #7c7bad; } .openerp.ui-dialog .oe_about a:hover { text-decoration: underline; @@ -547,7 +547,7 @@ -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; - color: #8a89ba; + color: #7c7bad; font-weight: bold; } .openerp .oe_button.oe_link span:hover { @@ -578,7 +578,7 @@ color: #4c4c4c; } .openerp .oe_tag_dark { - background: #8786b7; + background: #7c7bad; color: #eeeeee; } .openerp .oe_tags.oe_inline { @@ -1180,7 +1180,7 @@ .openerp .oe_secondary_menu_section { font-weight: bold; margin-left: 8px; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu { padding: 2px 0 8px 0; @@ -1202,7 +1202,7 @@ top: 1px; right: 1px; font-size: 10px; - background: #8a89ba; + background: #7c7bad; color: white; padding: 2px 4px; margin: 1px 6px 0 0; @@ -1222,7 +1222,7 @@ padding: 1px 4px; } .openerp .oe_secondary_submenu .oe_active { - background: #8a89ba; + background: #7c7bad; border-top: 1px solid lightGray; border-bottom: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1235,7 +1235,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_label { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; text-shadow: 0 1px 1px white; -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1243,7 +1243,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu .oe_menu_toggler:before { width: 0; @@ -1273,7 +1273,7 @@ width: 100%; } .openerp .oe_application a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_application a:hover { text-decoration: underline; @@ -1314,7 +1314,7 @@ float: left; } .openerp .oe_view_manager table.oe_view_manager_header h2 a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group { display: inline-block; @@ -1673,7 +1673,7 @@ } .openerp .oe_searchview .oe_searchview_drawer h3 { margin: 8px 4px 4px 12px; - color: #8786b7; + color: #7c7bad; font-size: 13px; } .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { @@ -1931,6 +1931,7 @@ } .openerp .oe_form_nosheet > header { margin: -16px -16px 0 -16px; + padding: 8px; } .openerp .oe_form header { position: relative; @@ -1942,7 +1943,6 @@ background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); - padding: 8px; } .openerp .oe_form header ul { display: inline-block; @@ -2074,7 +2074,7 @@ background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } .openerp ul.oe_form_steps_clickable li .label { - color: #8a89ba; + color: #7c7bad; } .openerp ul.oe_form_steps_clickable li.oe_active:hover { background-color: #4c85c2; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index befb68b42db..6472f7aaacd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2,13 +2,13 @@ // Variables {{{ $facets-border: #afafb6 -$section-title-color: #8786b7 +$section-title-color: #7C7BAD $tag-bg-light: #f0f0fa -$tag-bg-dark: #8786b7 +$tag-bg-dark: #7C7BAD $tag-border: #afafb6 $tag-border-selected: #a6a6fe $hover-background: #f0f0fa -$link-color: #8a89ba +$link-color: #7C7BAD $sheet-max-width: 860px // }}} // Mixins {{{ @@ -1504,6 +1504,7 @@ $sheet-max-width: 860px margin: 16px > header margin: -16px -16px 0 -16px + padding: 8px // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1511,8 +1512,6 @@ $sheet-max-width: 860px position: relative border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) - padding: 8px - //line-height: 30px ul display: inline-block float: right -- cgit v1.2.3 From 11fcfa2b07d3d92ef48630542e39db926a53ac43 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 17 Aug 2012 16:37:35 +0200 Subject: fix removed a useless line in sass bzr revid: mit@openerp.com-20120817143735-hverq9jb72kn2zdb --- addons/web/static/src/css/base.sass | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4c190549639..6472f7aaacd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1512,7 +1512,6 @@ $sheet-max-width: 860px position: relative border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) ->>>>>>> MERGE-SOURCE ul display: inline-block float: right -- cgit v1.2.3 From 65ac532462eeac41222ac1e863752c205bdad90d Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 17 Aug 2012 17:12:29 +0200 Subject: darker purple and config view alignment bzr revid: mit@openerp.com-20120817151229-iuujaaw5aflujgzq --- addons/web/static/src/css/base.css | 40 +++++++++++++++++++++---------------- addons/web/static/src/css/base.sass | 10 +++++++--- 2 files changed, 30 insertions(+), 20 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 87a83b4c70e..81e179c8de9 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"); @@ -234,7 +234,7 @@ font-size: 13px; } .openerp .ui-widget-content a { - color: #8a89ba; + color: #7c7bad; } .openerp .ui-menu .ui-menu-item { margin: 0 8px 0 0; @@ -336,7 +336,7 @@ border-radius: 0 0 2px 2px; } .openerp.ui-dialog .oe_about a { - color: #8a89ba; + color: #7c7bad; } .openerp.ui-dialog .oe_about a:hover { text-decoration: underline; @@ -547,7 +547,7 @@ -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; - color: #8a89ba; + color: #7c7bad; font-weight: bold; } .openerp .oe_button.oe_link span:hover { @@ -578,7 +578,7 @@ color: #4c4c4c; } .openerp .oe_tag_dark { - background: #8786b7; + background: #7c7bad; color: #eeeeee; } .openerp .oe_tags.oe_inline { @@ -1180,7 +1180,7 @@ .openerp .oe_secondary_menu_section { font-weight: bold; margin-left: 8px; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu { padding: 2px 0 8px 0; @@ -1202,7 +1202,7 @@ top: 1px; right: 1px; font-size: 10px; - background: #8a89ba; + background: #7c7bad; color: white; padding: 2px 4px; margin: 1px 6px 0 0; @@ -1222,7 +1222,7 @@ padding: 1px 4px; } .openerp .oe_secondary_submenu .oe_active { - background: #8a89ba; + background: #7c7bad; border-top: 1px solid lightGray; border-bottom: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1235,7 +1235,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_label { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; text-shadow: 0 1px 1px white; -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1243,7 +1243,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu .oe_menu_toggler:before { width: 0; @@ -1273,7 +1273,7 @@ width: 100%; } .openerp .oe_application a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_application a:hover { text-decoration: underline; @@ -1314,7 +1314,7 @@ float: left; } .openerp .oe_view_manager table.oe_view_manager_header h2 a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group { display: inline-block; @@ -1673,7 +1673,7 @@ } .openerp .oe_searchview .oe_searchview_drawer h3 { margin: 8px 4px 4px 12px; - color: #8786b7; + color: #7c7bad; font-size: 13px; } .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { @@ -1955,7 +1955,7 @@ padding: 16px 0 48px; } .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { - margin: 25px 0 10px 0; + margin: 12px 0 8px 0; } .openerp .oe_form div.oe_form_configuration p { color: #aaaaaa; @@ -1964,6 +1964,12 @@ .openerp .oe_form div.oe_form_configuration label { min-width: 150px; } +.openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label { + padding: 2px 0; +} +.openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div { + padding: 1px 0; +} .openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable { display: inline-block; padding-right: 18px; @@ -2074,7 +2080,7 @@ background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } .openerp ul.oe_form_steps_clickable li .label { - color: #8a89ba; + color: #7c7bad; } .openerp ul.oe_form_steps_clickable li.oe_active:hover { background-color: #4c85c2; @@ -2155,7 +2161,7 @@ .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; display: block; - min-width: 120px; + min-width: 160px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding-left: 6px; @@ -2187,7 +2193,7 @@ font-weight: bold; font-size: 20px; margin: 8px 0px 8px 0px; - color: #53637e; + color: #7c7bad; } .openerp .oe_horizontal_separator:empty { height: 5px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 6472f7aaacd..3463a25ad79 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1522,12 +1522,16 @@ $sheet-max-width: 860px padding: 16px 0 48px div.oe_form_configuration div.oe_horizontal_separator - margin: 25px 0 10px 0 + margin: 12px 0 8px 0 p color: #aaa max-width: 650px label min-width: 150px + .oe_form_group_cell_label + padding: 2px 0 + .oe_form_group_cell div div + padding: 1px 0 ul.oe_form_steps, ul.oe_form_steps_clickable @@ -1650,7 +1654,7 @@ $sheet-max-width: 860px label line-height: 18px display: block - min-width: 120px + min-width: 160px td.oe_form_group_cell + .oe_form_group_cell padding-left: 6px .oe_form_group @@ -1680,7 +1684,7 @@ $sheet-max-width: 860px font-weight: bold font-size: 20px margin: 8px 0px 8px 0px - color: #53637e + color: $section-title-color .oe_horizontal_separator:empty height: 5px .oe_vertical_separator -- cgit v1.2.3 From fff594348ae8ada571b4e9e7e6a0e16b5c306037 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 17 Aug 2012 17:55:51 +0200 Subject: fixed the 'more' dropdown menu bzr revid: mit@openerp.com-20120817155551-4eq9lumqderd09rl --- addons/web/static/src/css/base.css | 16 ++++------------ addons/web/static/src/css/base.sass | 35 +++++++++++++++-------------------- 2 files changed, 19 insertions(+), 32 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 81e179c8de9..c15a37b26f5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1032,14 +1032,6 @@ -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } -.openerp .oe_topbar .oe_topbar_item .oe_active { - background: #303030; - font-weight: bold; - color: white; - -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -} .openerp .oe_topbar .oe_topbar_avatar { width: 24px; height: 24px; @@ -1150,10 +1142,10 @@ padding: 0; margin: 0; } -.openerp .oe_menu li { +.openerp .oe_menu > li { float: left; } -.openerp .oe_menu a { +.openerp .oe_menu > li > a { display: block; padding: 5px 10px 7px; line-height: 20px; @@ -1162,14 +1154,14 @@ vertical-align: top; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); } -.openerp .oe_menu a:hover { +.openerp .oe_menu > li > a:hover { background: #303030; color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } -.openerp .oe_menu .oe_active { +.openerp .oe_menu > li > .oe_active { background: #303030; font-weight: bold; color: white; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3463a25ad79..db56bdbacfa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -810,11 +810,6 @@ $sheet-max-width: 860px background: #303030 color: white @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) - .oe_active - background: #303030 - font-weight: bold - color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) .oe_topbar_avatar width: 24px @@ -902,25 +897,25 @@ $sheet-max-width: 860px float: left padding: 0 margin: 0 - li + > li float: left - a - display: block - padding: 5px 10px 7px - line-height: 20px - height: 20px - color: #eee - vertical-align: top - text-shadow: 0 1px 1px rgba(0,0,0,0.2) - &:hover + > a + display: block + padding: 5px 10px 7px + line-height: 20px + height: 20px + color: #eee + vertical-align: top + text-shadow: 0 1px 1px rgba(0,0,0,0.2) + &:hover + background: #303030 + color: white + @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + > .oe_active background: #303030 + font-weight: bold color: white @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) - .oe_active - background: #303030 - font-weight: bold - color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) .oe_secondary_menu_section font-weight: bold margin-left: 8px -- cgit v1.2.3 From 2501b06ca0dec18c98f2b9d73b64a7b0aebe13e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Mon, 20 Aug 2012 14:22:43 +0200 Subject: [IMP] removed left and top bar from printing bzr revid: fva@openerp.com-20120820122243-z9wtrkpb2ub79enf --- addons/web/static/src/css/base.css | 41 +++++++++++++++++++++---------------- addons/web/static/src/css/base.sass | 4 ++++ 2 files changed, 27 insertions(+), 18 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 87a83b4c70e..2276bb2445e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -64,6 +64,11 @@ } } +@media print { + .oe_topbar, .oe_leftbar, .oe_loading { + display: none !important; + } +} .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -234,7 +239,7 @@ font-size: 13px; } .openerp .ui-widget-content a { - color: #8a89ba; + color: #7c7bad; } .openerp .ui-menu .ui-menu-item { margin: 0 8px 0 0; @@ -336,7 +341,7 @@ border-radius: 0 0 2px 2px; } .openerp.ui-dialog .oe_about a { - color: #8a89ba; + color: #7c7bad; } .openerp.ui-dialog .oe_about a:hover { text-decoration: underline; @@ -547,7 +552,7 @@ -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; - color: #8a89ba; + color: #7c7bad; font-weight: bold; } .openerp .oe_button.oe_link span:hover { @@ -578,7 +583,7 @@ color: #4c4c4c; } .openerp .oe_tag_dark { - background: #8786b7; + background: #7c7bad; color: #eeeeee; } .openerp .oe_tags.oe_inline { @@ -1007,7 +1012,7 @@ .openerp .oe_topbar { width: 100%; height: 31px; - border-top: solid 1px #d3d3d3; + border-top: solid 1px lightgrey; background-color: #646060; background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); background-image: -webkit-linear-gradient(top, #646060, #262626); @@ -1180,7 +1185,7 @@ .openerp .oe_secondary_menu_section { font-weight: bold; margin-left: 8px; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu { padding: 2px 0 8px 0; @@ -1202,11 +1207,11 @@ top: 1px; right: 1px; font-size: 10px; - background: #8a89ba; + background: #7c7bad; color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightGray; + border: 1px solid lightgrey; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1222,9 +1227,9 @@ padding: 1px 4px; } .openerp .oe_secondary_submenu .oe_active { - background: #8a89ba; - border-top: 1px solid lightGray; - border-bottom: 1px solid lightGray; + background: #7c7bad; + border-top: 1px solid lightgrey; + border-bottom: 1px solid lightgrey; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1235,7 +1240,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_label { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; text-shadow: 0 1px 1px white; -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1243,7 +1248,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu .oe_menu_toggler:before { width: 0; @@ -1273,7 +1278,7 @@ width: 100%; } .openerp .oe_application a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_application a:hover { text-decoration: underline; @@ -1314,7 +1319,7 @@ float: left; } .openerp .oe_view_manager table.oe_view_manager_header h2 a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group { display: inline-block; @@ -1673,7 +1678,7 @@ } .openerp .oe_searchview .oe_searchview_drawer h3 { margin: 8px 4px 4px 12px; - color: #8786b7; + color: #7c7bad; font-size: 13px; } .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { @@ -2074,7 +2079,7 @@ background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } .openerp ul.oe_form_steps_clickable li .label { - color: #8a89ba; + color: #7c7bad; } .openerp ul.oe_form_steps_clickable li.oe_active:hover { background-color: #4c85c2; @@ -2174,7 +2179,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkGreen; + color: darkgreen; vertical-align: top; position: relative; top: -4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 6472f7aaacd..653adad7813 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -142,6 +142,10 @@ $sheet-max-width: 860px opacity: 1 // }}} +@media print + .oe_topbar, .oe_leftbar, .oe_loading + display: none !important + .openerp.openerp_webclient_container height: 100% position: relative -- cgit v1.2.3 From 6bd1711418b78c3bbbd4304022e5843a3631413b Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Tue, 21 Aug 2012 14:41:23 +0530 Subject: [IMP]widget_html li tag bzr revid: pna@tinyerp.com-20120821091123-rbd47o84ex5aqcot --- addons/web/static/src/css/base.css | 5 +++++ 1 file changed, 5 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 2276bb2445e..dca16278ffa 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -148,6 +148,11 @@ .openerp li { list-style-type: none; } + +.openerp .oe_form_field_html li { + list-style-type: disc; +} + .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; -- cgit v1.2.3 From a70222628b7749f20a6ce2db2f4b6ac47e71c577 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 21 Aug 2012 18:15:17 +0200 Subject: [IMP] added preview_image and size in images bzr revid: nicolas.vanhoren@openerp.com-20120821161517-umnu1465gq809orj --- 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 269d224bc06..24828e89452 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -505,8 +505,8 @@ margin: 4px; } .openerp .oe_avatar > img { - height: 90px; - max-width: 100px; + max-height: 90px; + max-width: 90px; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f195015ff1e..176a255a239 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -426,8 +426,8 @@ $sheet-max-width: 860px margin: 4px .oe_avatar > img - height: 90px - max-width: 100px + max-height: 90px + max-width: 90px @include radius(3px) @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) border: none -- cgit v1.2.3 From 17768541a07ca47e6b7ae48dc0a5455ef0301d7f Mon Sep 17 00:00:00 2001 From: "Pinakin Nai(OpenERP)" <> Date: Wed, 22 Aug 2012 19:00:35 +0530 Subject: [IMP] Added new stlye to avoid overriding of text in header section bzr revid: pso@tinyerp.com-20120822133035-totgh1ez1omty11r --- addons/web/static/src/css/base.css | 4 ++++ 1 file 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 dca16278ffa..bd22cce70b2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -153,6 +153,10 @@ list-style-type: disc; } + .openerp .oe_form_field_html h1,h2 { + line-height:26px; +} + .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; -- cgit v1.2.3 From dbb9833d689f1da94957e526fd99ab712f4b456e Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 23 Aug 2012 11:45:32 +0200 Subject: fix jquery-ui widget border bzr revid: mit@openerp.com-20120823094532-bluw3pix6dwm1a6i --- addons/web/static/src/css/base.css | 12 +----------- addons/web/static/src/css/base.sass | 10 +--------- 2 files changed, 2 insertions(+), 20 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 9ea94ebdbb0..4f34c050f46 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -454,13 +454,6 @@ -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } -.openerp ul.oe_flatlist, .openerp ol.oe_flatlist { - margin: 0; - padding: 0; -} -.openerp ul.oe_flatlist li, .openerp ol.oe_flatlist li { - list-style-type: none; -} .openerp .oe_form_dirty .oe_highlight_on_dirty { color: white; background: #dc5f59; @@ -2753,6 +2746,7 @@ div.ui-widget-overlay { -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); margin-top: 4px; + border: 1px solid #afafb6; } .ui-menu .ui-menu-item { width: 100%; @@ -2778,7 +2772,3 @@ div.ui-widget-overlay { -webkit-border-radius: 3px; border-radius: 3px; } - -.ui-widget-content { - border: 1px solid #afafb6; -} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b5eae0d7213..4a26ea0d54e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -391,12 +391,6 @@ $sheet-max-width: 860px //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) - ul.oe_flatlist, ol.oe_flatlist - margin: 0 - padding: 0 - li - list-style-type: none - .oe_form_dirty .oe_highlight_on_dirty color: white @@ -2152,6 +2146,7 @@ div.ui-widget-overlay padding: 2px 0 @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) margin-top: 4px + border: 1px solid $tag-border .ui-menu-item width: 100% padding: 0 @@ -2169,8 +2164,5 @@ div.ui-widget-overlay .ui-corner-all @include radius(3px) -.ui-widget-content - border: 1px solid $tag-border - // 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 decab66e70d67e197c406f307baa366327ec105b Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 23 Aug 2012 18:19:53 +0200 Subject: added hover effect to menu counter bzr revid: mit@openerp.com-20120823161953-h5sc0npkpz5drgq1 --- addons/web/static/src/css/base.css | 7 +++++++ addons/web/static/src/css/base.sass | 4 ++++ 2 files changed, 11 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 4f34c050f46..ff90d0050ec 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1206,6 +1206,13 @@ margin: 0px; padding: 1px 4px; } +.openerp .oe_secondary_submenu .oe_menu_counter:hover { + cursor: pointer; + border: 1px solid #c81010; + -moz-box-shadow: 0 0 2px #c81010; + -webkit-box-shadow: 0 0 2px #c81010; + box-shadow: 0 0 2px #c81010; +} .openerp .oe_secondary_submenu .oe_active { background: #7c7bad; border-top: 1px solid lightGray; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4a26ea0d54e..2bcd5ac5be4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -945,6 +945,10 @@ $sheet-max-width: 860px text-shadow: 0 1px 1px rgba(0,0,0,0.2) margin: 0px padding: 1px 4px + &:hover + cursor: pointer + border: 1px solid #C81010 + @include box-shadow(0 0 2px #C81010) .oe_active background: $link-color border-top: 1px solid lightGray -- cgit v1.2.3 From e28ec55117cfb6813e52caf571b71ba7a7ab92e5 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 24 Aug 2012 12:44:36 +0200 Subject: [IMP] added oe_semantic_html bzr revid: nicolas.vanhoren@openerp.com-20120824104436-er3w1zdijvcv9j04 --- addons/web/static/src/css/base.css | 21 +++++++++++---------- addons/web/static/src/css/base.sass | 9 +++++++++ 2 files changed, 20 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 30571da3a2a..47ab720b748 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"); @@ -148,15 +148,6 @@ .openerp li { list-style-type: none; } - -.openerp .oe_form_field_html li { - list-style-type: disc; -} - - .openerp .oe_form_field_html h1,h2 { - line-height:26px; -} - .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; @@ -2734,6 +2725,16 @@ float: right; color: #333333; } +.openerp .oe_semantic_html li { + list-style-type: disc; + display: list-item; +} +.openerp .oe_semantic_html ul { + padding-left: 1em; +} +.openerp .oe_semantic_html p { + color: #4c4c4c !important; +} .kitten-mode-activated { background-image: url(http://placekitten.com/g/1365/769); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 33b33d01701..9b541bdc625 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2128,6 +2128,15 @@ $sheet-max-width: 860px float: right color: #333 // }}} + .oe_semantic_html // a style to use normal html + li + list-style-type: disc + display: list-item + ul + padding-left: 1em + p + color: #4C4C4C !important + // Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) -- cgit v1.2.3 From 7c334cfb5aadab0f1626886cc3162d649d404b17 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 24 Aug 2012 13:42:04 +0200 Subject: [IMP] Improved css to support semantic html bzr revid: nicolas.vanhoren@openerp.com-20120824114204-i6qprxhwczkkem6z --- addons/web/static/src/css/Makefile | 2 +- addons/web/static/src/css/base.css | 70 ++++++++++++++++++++++++++++++++----- addons/web/static/src/css/base.sass | 30 ++++++++++++---- 3 files changed, 87 insertions(+), 15 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile index eca044497ef..d6b4f4b2fc8 100644 --- a/addons/web/static/src/css/Makefile +++ b/addons/web/static/src/css/Makefile @@ -1,3 +1,3 @@ base.css: base.sass - sass -t expanded base.sass base.css + sass --trace -t expanded base.sass base.css diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 47ab720b748..e9d1fb1c268 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -141,13 +141,6 @@ background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede); } -.openerp ul, .openerp li, .openerp ol { - margin: 0; - padding: 0; -} -.openerp li { - list-style-type: none; -} .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; @@ -162,6 +155,13 @@ .openerp h4 { margin: 4px 0; } +.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override li, .openerp .oe_semantic_html_override ol { + margin: 0; + padding: 0; +} +.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override li li, .openerp .oe_semantic_html_override ol li { + list-style-type: none; +} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; @@ -633,6 +633,18 @@ padding: 0 16px; list-style: none; zoom: 1; + margin: 0; + padding: 0; +} +.openerp .oe_notebook li { + list-style-type: none; +} +.openerp .oe_notebook ul, .openerp .oe_notebook li, .openerp .oe_notebook ol { + margin: 0; + padding: 0; +} +.openerp .oe_notebook ul li, .openerp .oe_notebook li li, .openerp .oe_notebook ol li { + list-style-type: none; } .openerp .oe_notebook.ui-corner-all { -moz-border-radius: 0; @@ -937,6 +949,13 @@ -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); } +.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane li, .openerp .oe_login .oe_login_pane ol { + margin: 0; + padding: 0; +} +.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane li li, .openerp .oe_login .oe_login_pane ol li { + list-style-type: none; +} .openerp .oe_login .oe_login_pane h2 { margin-top: 0; font-size: 18px; @@ -1016,6 +1035,13 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } +.openerp .oe_topbar ul, .openerp .oe_topbar li, .openerp .oe_topbar ol { + margin: 0; + padding: 0; +} +.openerp .oe_topbar ul li, .openerp .oe_topbar li li, .openerp .oe_topbar ol li { + list-style-type: none; +} .openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; @@ -1088,6 +1114,13 @@ text-shadow: 0 1px 1px white; padding-bottom: 16px; } +.openerp .oe_leftbar ul, .openerp .oe_leftbar li, .openerp .oe_leftbar ol { + margin: 0; + padding: 0; +} +.openerp .oe_leftbar ul li, .openerp .oe_leftbar li li, .openerp .oe_leftbar ol li { + list-style-type: none; +} .openerp a.oe_logo { width: 220px; display: block; @@ -1283,6 +1316,13 @@ width: 100%; table-layout: fixed; } +.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header li, .openerp .oe_view_manager table.oe_view_manager_header ol { + margin: 0; + padding: 0; +} +.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header li li, .openerp .oe_view_manager table.oe_view_manager_header ol li { + list-style-type: none; +} .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; text-shadow: 0 1px 1px white; @@ -1952,7 +1992,7 @@ .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { margin: 12px 0 8px 0; } -.openerp .oe_form div.oe_form_configuration p { +.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { color: #aaaaaa; max-width: 650px; } @@ -2401,6 +2441,20 @@ float: right; padding-left: 2px; } +.openerp .oe_form_field_status { + margin: 0; + padding: 0; +} +.openerp .oe_form_field_status ul, .openerp .oe_form_field_status li, .openerp .oe_form_field_status ol { + margin: 0; + padding: 0; +} +.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status li li, .openerp .oe_form_field_status ol li { + list-style-type: none; +} +.openerp .oe_form_field_status li { + list-style-type: none; +} .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 9b541bdc625..60b59a61a46 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -111,6 +111,16 @@ $sheet-max-width: 860px content: $icon-name color: $color +@mixin ul-html-override() + margin: 0 + padding: 0 + li + list-style-type: none + +@mixin semantic-html-override() + ul, li, ol + @include ul-html-override() + // }}} // CSS animation bounces {{{ @-moz-keyframes bounce @@ -194,11 +204,6 @@ $sheet-max-width: 860px @include vertical-gradient(#f0f0fa, #eeeef6) .zebra tbody tr:hover td @include vertical-gradient(#eee, #dedede) - ul, li, ol - margin: 0 - padding: 0 - li - list-style-type: none input, textarea, select padding: 2px 4px border: 1px solid #ccc @@ -208,6 +213,8 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 + .oe_semantic_html_override + @include semantic-html-override // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button @@ -515,6 +522,8 @@ $sheet-max-width: 860px padding: 0 16px list-style: none zoom: 1 + @include ul-html-override + @include semantic-html-override .oe_notebook.ui-corner-all @include radius(0) .oe_notebook:before, .oe_notebook:after @@ -734,6 +743,7 @@ $sheet-max-width: 860px text-align: left @include radius(8px) @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) + @include semantic-html-override h2 margin-top: 0 font-size: 18px @@ -799,6 +809,7 @@ $sheet-max-width: 860px height: 31px border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) + @include semantic-html-override .oe_topbar_item display: block padding: 5px 10px 7px @@ -849,6 +860,7 @@ $sheet-max-width: 860px border-right: 1px solid $tag-border text-shadow: 0 1px 1px white padding-bottom: 16px + @include semantic-html-override a.oe_logo width: 220px display: block @@ -1009,6 +1021,7 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed + @include semantic-html-override .oe_header_row //min-height: 26px //line-height: 26px @@ -1521,7 +1534,7 @@ $sheet-max-width: 860px div.oe_form_configuration div.oe_horizontal_separator margin: 12px 0 8px 0 - p + p, ul, ol color: #aaa max-width: 650px label @@ -1856,6 +1869,11 @@ $sheet-max-width: 860px float: right padding-left: 2px // }}} + // FormView.fieldstatus {{{ + .oe_form_field_status + @include semantic-html-override + @include ul-html-override + // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page -- cgit v1.2.3 From 682168e202451ccd47df5f5042449c90fb3af818 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 27 Aug 2012 16:03:10 +0200 Subject: [REVERT] Revert hasty commit r.2976 - wreaks havoc on many views by revealing
  • bullets everywhere bzr revid: odo@openerp.com-20120827140310-zzp1kmtulvenuamo --- addons/web/static/src/css/Makefile | 2 +- addons/web/static/src/css/base.css | 70 +++++-------------------------------- addons/web/static/src/css/base.sass | 30 ++++------------ 3 files changed, 15 insertions(+), 87 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile index d6b4f4b2fc8..eca044497ef 100644 --- a/addons/web/static/src/css/Makefile +++ b/addons/web/static/src/css/Makefile @@ -1,3 +1,3 @@ base.css: base.sass - sass --trace -t expanded base.sass base.css + sass -t expanded base.sass base.css diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index eb641d5887e..908d407380c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -141,6 +141,13 @@ background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede); } +.openerp ul, .openerp li, .openerp ol { + margin: 0; + padding: 0; +} +.openerp li { + list-style-type: none; +} .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; @@ -155,13 +162,6 @@ .openerp h4 { margin: 4px 0; } -.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override li, .openerp .oe_semantic_html_override ol { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override li li, .openerp .oe_semantic_html_override ol li { - list-style-type: none; -} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; @@ -626,18 +626,6 @@ padding: 0 16px; list-style: none; zoom: 1; - margin: 0; - padding: 0; -} -.openerp .oe_notebook li { - list-style-type: none; -} -.openerp .oe_notebook ul, .openerp .oe_notebook li, .openerp .oe_notebook ol { - margin: 0; - padding: 0; -} -.openerp .oe_notebook ul li, .openerp .oe_notebook li li, .openerp .oe_notebook ol li { - list-style-type: none; } .openerp .oe_notebook.ui-corner-all { -moz-border-radius: 0; @@ -942,13 +930,6 @@ -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); } -.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane li, .openerp .oe_login .oe_login_pane ol { - margin: 0; - padding: 0; -} -.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane li li, .openerp .oe_login .oe_login_pane ol li { - list-style-type: none; -} .openerp .oe_login .oe_login_pane h2 { margin-top: 0; font-size: 18px; @@ -1028,13 +1009,6 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } -.openerp .oe_topbar ul, .openerp .oe_topbar li, .openerp .oe_topbar ol { - margin: 0; - padding: 0; -} -.openerp .oe_topbar ul li, .openerp .oe_topbar li li, .openerp .oe_topbar ol li { - list-style-type: none; -} .openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; @@ -1107,13 +1081,6 @@ text-shadow: 0 1px 1px white; padding-bottom: 16px; } -.openerp .oe_leftbar ul, .openerp .oe_leftbar li, .openerp .oe_leftbar ol { - margin: 0; - padding: 0; -} -.openerp .oe_leftbar ul li, .openerp .oe_leftbar li li, .openerp .oe_leftbar ol li { - list-style-type: none; -} .openerp a.oe_logo { width: 220px; display: block; @@ -1316,13 +1283,6 @@ width: 100%; table-layout: fixed; } -.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header li, .openerp .oe_view_manager table.oe_view_manager_header ol { - margin: 0; - padding: 0; -} -.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header li li, .openerp .oe_view_manager table.oe_view_manager_header ol li { - list-style-type: none; -} .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; text-shadow: 0 1px 1px white; @@ -1992,7 +1952,7 @@ .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { margin: 12px 0 8px 0; } -.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { +.openerp .oe_form div.oe_form_configuration p { color: #aaaaaa; max-width: 650px; } @@ -2441,20 +2401,6 @@ float: right; padding-left: 2px; } -.openerp .oe_form_field_status { - margin: 0; - padding: 0; -} -.openerp .oe_form_field_status ul, .openerp .oe_form_field_status li, .openerp .oe_form_field_status ol { - margin: 0; - padding: 0; -} -.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status li li, .openerp .oe_form_field_status ol li { - list-style-type: none; -} -.openerp .oe_form_field_status li { - list-style-type: none; -} .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 aa75956f0a1..52d54de3fbb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -111,16 +111,6 @@ $sheet-max-width: 860px content: $icon-name color: $color -@mixin ul-html-override() - margin: 0 - padding: 0 - li - list-style-type: none - -@mixin semantic-html-override() - ul, li, ol - @include ul-html-override() - // }}} // CSS animation bounces {{{ @-moz-keyframes bounce @@ -204,6 +194,11 @@ $sheet-max-width: 860px @include vertical-gradient(#f0f0fa, #eeeef6) .zebra tbody tr:hover td @include vertical-gradient(#eee, #dedede) + ul, li, ol + margin: 0 + padding: 0 + li + list-style-type: none input, textarea, select padding: 2px 4px border: 1px solid #ccc @@ -213,8 +208,6 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 - .oe_semantic_html_override - @include semantic-html-override // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button @@ -516,8 +509,6 @@ $sheet-max-width: 860px padding: 0 16px list-style: none zoom: 1 - @include ul-html-override - @include semantic-html-override .oe_notebook.ui-corner-all @include radius(0) .oe_notebook:before, .oe_notebook:after @@ -737,7 +728,6 @@ $sheet-max-width: 860px text-align: left @include radius(8px) @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) - @include semantic-html-override h2 margin-top: 0 font-size: 18px @@ -803,7 +793,6 @@ $sheet-max-width: 860px height: 31px border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) - @include semantic-html-override .oe_topbar_item display: block padding: 5px 10px 7px @@ -854,7 +843,6 @@ $sheet-max-width: 860px border-right: 1px solid $tag-border text-shadow: 0 1px 1px white padding-bottom: 16px - @include semantic-html-override a.oe_logo width: 220px display: block @@ -1019,7 +1007,6 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed - @include semantic-html-override .oe_header_row //min-height: 26px //line-height: 26px @@ -1532,7 +1519,7 @@ $sheet-max-width: 860px div.oe_form_configuration div.oe_horizontal_separator margin: 12px 0 8px 0 - p, ul, ol + p color: #aaa max-width: 650px label @@ -1867,11 +1854,6 @@ $sheet-max-width: 860px float: right padding-left: 2px // }}} - // FormView.fieldstatus {{{ - .oe_form_field_status - @include semantic-html-override - @include ul-html-override - // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page -- cgit v1.2.3 From 67ea7a40a440deb6589952934cac986fe24b4091 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 28 Aug 2012 16:29:35 +0200 Subject: [FIX] State widget elements overlapping with dropdowns and menus bzr revid: fme@openerp.com-20120828142935-pdq8zb74f665bznt --- addons/web/static/src/css/base.css | 2 -- addons/web/static/src/css/base.sass | 2 -- 2 files changed, 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 908d407380c..02a5c155476 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2001,7 +2001,6 @@ padding-left: 24px; margin: 0; position: relative; - z-index: 10; } .openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow { width: 17px; @@ -2012,7 +2011,6 @@ } .openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span { position: relative; - z-index: 11; width: 24px; height: 24px; display: inline-block; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 52d54de3fbb..d3a04be28b8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1554,7 +1554,6 @@ $sheet-max-width: 860px padding-left: 24px margin: 0 position: relative - z-index: 10 .arrow width: 17px display: inline-block @@ -1563,7 +1562,6 @@ $sheet-max-width: 860px margin-left: -5px span position: relative - z-index: 11 width: 24px height: 24px display: inline-block -- cgit v1.2.3 From ba7aee832d999b940c1139218d6966db660510fe Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 29 Aug 2012 17:37:56 +0200 Subject: [IMP] Support for classnames in m2o autocomplete Also improved readability of code bzr revid: fme@openerp.com-20120829153756-7b3lq5lan6b97chy --- 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 02a5c155476..41a1bdf26fd 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2399,6 +2399,13 @@ float: right; padding-left: 2px; } +.openerp.ui-autocomplete li.oe_m2o_dropdown_option a { + font-style: italic; + padding-left: 2em; +} +.openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option { + margin-top: 10px; +} .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 d3a04be28b8..173dd551056 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1851,6 +1851,12 @@ $sheet-max-width: 860px line-height: 14px float: right padding-left: 2px + &.ui-autocomplete + li.oe_m2o_dropdown_option a + font-style: italic + padding-left: 2em + li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option + margin-top: 10px // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager -- cgit v1.2.3 From d0261477f833a84201c526cf76ca432b864c4f50 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 29 Aug 2012 21:08:19 +0200 Subject: [IMP] CSS improvement bzr revid: fp@tinyerp.com-20120829190819-gl2q4d0d0xsbh2l3 --- addons/web/static/src/css/base.css | 8 +++++++- addons/web/static/src/css/base.sass | 4 ++++ 2 files changed, 11 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 41a1bdf26fd..c28c12bf224 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,6 +69,7 @@ display: none !important; } } + .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -84,7 +85,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -1949,6 +1950,11 @@ margin: 0 auto; padding: 16px 0 48px; } +.openerp .oe_form .oe_grey { + color: #aaaaaa; + max-width: 650px; + margin: 0 0 10px 0; +} .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { margin: 12px 0 8px 0; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 173dd551056..92150ad687b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1516,6 +1516,10 @@ $sheet-max-width: 860px max-width: $sheet-max-width margin: 0 auto padding: 16px 0 48px + .oe_grey + color: #aaa + max-width: 650px + margin: 0 0 10px 0 div.oe_form_configuration div.oe_horizontal_separator margin: 12px 0 8px 0 -- cgit v1.2.3 From 6e943465be4c6df2a356b93e7be8a1da4eb8d74f Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 29 Aug 2012 21:12:43 +0200 Subject: imp_css bzr revid: fp@tinyerp.com-20120829191243-zmgsqb8twjcwzx02 --- addons/web/static/src/css/base.css | 5 +---- addons/web/static/src/css/base.sass | 4 +--- 2 files changed, 2 insertions(+), 7 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 c28c12bf224..06a37a54727 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1955,9 +1955,6 @@ max-width: 650px; margin: 0 0 10px 0; } -.openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { - margin: 12px 0 8px 0; -} .openerp .oe_form div.oe_form_configuration p { color: #aaaaaa; max-width: 650px; @@ -2191,7 +2188,7 @@ .openerp .oe_horizontal_separator { font-weight: bold; font-size: 20px; - margin: 8px 0px 8px 0px; + margin: 15px 0px 10px 0px; color: #7c7bad; } .openerp .oe_horizontal_separator:empty { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 92150ad687b..c238ef6ee07 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1521,8 +1521,6 @@ $sheet-max-width: 860px max-width: 650px margin: 0 0 10px 0 div.oe_form_configuration - div.oe_horizontal_separator - margin: 12px 0 8px 0 p color: #aaa max-width: 650px @@ -1681,7 +1679,7 @@ $sheet-max-width: 860px .oe_horizontal_separator font-weight: bold font-size: 20px - margin: 8px 0px 8px 0px + margin: 15px 0px 10px 0px color: $section-title-color .oe_horizontal_separator:empty height: 5px -- cgit v1.2.3 From 16773839a48cf3dd9997a1343f789b39e0f37d2f Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 30 Aug 2012 15:05:24 +0200 Subject: Styling of group header in listview group by bzr revid: mit@openerp.com-20120830130524-3szsbr80dltbenzm --- addons/web/static/src/css/base.css | 14 +++++++++++--- addons/web/static/src/css/base.sass | 3 +++ 2 files changed, 14 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 06a37a54727..c3552811fd4 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"); @@ -69,7 +69,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -85,7 +84,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -2523,6 +2522,15 @@ margin: 0 !important; padding: 0; } +.openerp .oe_list .oe_list_content .oe_group_header { + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); +} .openerp .oe_list_content { width: 100%; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c238ef6ee07..0ac0d99def8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1970,6 +1970,8 @@ $sheet-max-width: 860px position: absolute margin: 0 !important // dammit padding: 0 + .oe_list_content .oe_group_header + @include vertical-gradient(#fcfcfc, #dedede) .oe_list_content width: 100% @@ -2028,6 +2030,7 @@ $sheet-max-width: 860px > tr:nth-child(odd) background-color: #f0f0fa @include vertical-gradient(#f0f0fa, #eeeef6) + > tfoot border-top: 2px solid #cacaca border-bottom: 1px solid #cacaca -- cgit v1.2.3 From 723d2ee1daaf2d709926f0ea1bce6c5ba334285d Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 31 Aug 2012 18:31:53 +0200 Subject: uniformization of avatar box-shadow bzr revid: mit@openerp.com-20120831163153-8515c0vfr6sw09n1 --- addons/web/static/src/css/base.css | 12 ++++++------ addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 8 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 c3552811fd4..dcb3fd958f4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -498,9 +498,9 @@ -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); border: none; } .openerp .oe_avatar + div { @@ -866,9 +866,9 @@ font-family: "Lucida Grande", Helvetica, Verdana, Arial; border: 1px solid #999999; background: whitesmoke; - -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); + -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); + box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0ac0d99def8..43b8ace724b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -420,7 +420,7 @@ $sheet-max-width: 860px max-height: 90px max-width: 90px @include radius(3px) - @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) + @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4)) border: none .oe_avatar + div margin-left: 5px @@ -687,7 +687,7 @@ $sheet-max-width: 860px font-family: "Lucida Grande", Helvetica, Verdana, Arial border: 1px solid #999999 background: whitesmoke - @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.3)) + @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.4)) @include radius(3px) input margin-bottom: 9px -- cgit v1.2.3 From 972306d0157ca92b57462f3e3735767e5a3618fa Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 2 Sep 2012 14:58:05 +0200 Subject: [IMP] CSS bzr revid: fp@openerp.com-20120902125805-jeivl4whuzzubv7l --- 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 06a37a54727..5ce814ef011 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -85,7 +85,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -503,6 +503,7 @@ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); border: none; + margin-bottom: 10px; } .openerp .oe_avatar + div { margin-left: 5px; @@ -2157,7 +2158,7 @@ .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; display: block; - min-width: 160px; + min-width: 140px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding-left: 6px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c238ef6ee07..f16e369f531 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -422,6 +422,7 @@ $sheet-max-width: 860px @include radius(3px) @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) border: none + margin-bottom: 10px .oe_avatar + div margin-left: 5px .oe_image_small > img @@ -1650,7 +1651,7 @@ $sheet-max-width: 860px label line-height: 18px display: block - min-width: 160px + min-width: 140px td.oe_form_group_cell + .oe_form_group_cell padding-left: 6px .oe_form_group -- cgit v1.2.3 From d7a2ea78dc50f17813e2d20712c146a427dece0b Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 2 Sep 2012 15:30:23 +0200 Subject: [IMP] CSS bzr revid: fp@openerp.com-20120902133023-dgdicbx0xnlht2l5 --- 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 5ce814ef011..dd168653f03 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -576,6 +576,9 @@ background: #7c7bad; color: #eeeeee; } +.openerp .oe_tags { + margin-bottom: 1px; +} .openerp .oe_tags.oe_inline { min-width: 250px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f16e369f531..537988e9c4a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -476,6 +476,7 @@ $sheet-max-width: 860px .text-core .text-wrap .text-dropdown .text-list .text-suggestion em font-style: italic text-decoration: none + margin-bottom: 1px // }}} // Tooltips {{{ &.oe_tooltip -- cgit v1.2.3 From da86f505acf8b6c906f80933dc733c02ffa84eec Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 3 Sep 2012 18:40:10 +0200 Subject: Added polish to left menu bzr revid: mit@openerp.com-20120903164010-itzwtaf37c6bas71 --- addons/web/static/src/css/base.css | 33 +++++++++++++++++++++++---------- addons/web/static/src/css/base.sass | 16 ++++++++++------ 2 files changed, 33 insertions(+), 16 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 b1c6348b2ad..e875ff9fab2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -454,6 +454,9 @@ -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } +.openerp .oe_background_grey { + background: #eeeeee !important; +} .openerp .oe_form_dirty .oe_highlight_on_dirty { color: white; background: #dc5f59; @@ -1207,24 +1210,31 @@ .openerp .oe_secondary_submenu .oe_menu_counter { float: right; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - margin: 0px; + margin: 1px; padding: 1px 4px; + border: none; } .openerp .oe_secondary_submenu .oe_menu_counter:hover { cursor: pointer; - border: 1px solid #c81010; - -moz-box-shadow: 0 0 2px #c81010; - -webkit-box-shadow: 0 0 2px #c81010; - box-shadow: 0 0 2px #c81010; + -moz-transform: scale(1.1); + -webkit-transform: scale(1.1); + -o-transform: scale(1.1); + -ms-transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - background: #7c7bad; border-top: 1px solid lightGray; - border-bottom: 1px solid lightGray; + border-bottom: 1px solid #e0e0e0; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); + background-color: #7372a7; + background-image: -webkit-gradient(linear, left top, left bottom, from(#7372a7), to(#8281b1)); + background-image: -webkit-linear-gradient(top, #7372a7, #8281b1); + background-image: -moz-linear-gradient(top, #7372a7, #8281b1); + background-image: -ms-linear-gradient(top, #7372a7, #8281b1); + background-image: -o-linear-gradient(top, #7372a7, #8281b1); + background-image: linear-gradient(to bottom, #7372a7, #8281b1); } .openerp .oe_secondary_submenu .oe_active a { color: white; @@ -1240,6 +1250,9 @@ .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; color: #7c7bad; + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); } .openerp .oe_secondary_submenu .oe_menu_toggler:before { width: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1b6a1b3d766..637a1975e32 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -390,6 +390,8 @@ $sheet-max-width: 860px @include vertical-gradient(#DF6B66, #BF3A33) //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + .oe_background_grey + background: #eee !important .oe_form_dirty .oe_highlight_on_dirty @@ -945,18 +947,19 @@ $sheet-max-width: 860px .oe_menu_counter float: right text-shadow: 0 1px 1px rgba(0,0,0,0.2) - margin: 0px + margin: 1px padding: 1px 4px + border: none &:hover cursor: pointer - border: 1px solid #C81010 - @include box-shadow(0 0 2px #C81010) + @include transform(scale(1.1)) .oe_active - background: $link-color border-top: 1px solid lightGray - border-bottom: 1px solid lightGray + border-bottom: 1px solid #e0e0e0 text-shadow: 0 1px 1px rgba(0,0,0,0.2) - @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2)) + @include box-shadow((inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2))) + //background: $link-color + @include vertical-gradient(darken($link-color, 3%), lighten($link-color, 2%)) a color: white .oe_menu_label @@ -967,6 +970,7 @@ $sheet-max-width: 860px .oe_menu_counter background: #eee color: $link-color + @include box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.2)) .oe_menu_toggler:before width: 0 height: 0 -- cgit v1.2.3 From b203377994ff51231a632f5b940c14482b9c3206 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 4 Sep 2012 09:41:45 +0200 Subject: [IMP] in list views: hide drag-n-drop handle and trash can with css classes bzr revid: rco@openerp.com-20120904074145-5mefinpkz0pl0qyb --- addons/web/static/src/css/base.css | 9 +++++++-- addons/web/static/src/css/base.sass | 7 +++++++ 2 files changed, 14 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 06a37a54727..d32b0a9f42a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,7 +69,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -85,7 +84,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -2638,6 +2637,12 @@ content: "ö"; color: #404040; } +.openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle { + display: none !important; +} +.openerp .oe_list_cannot_delete .oe_list_header_delete, .openerp .oe_list_cannot_delete .oe_list_record_delete { + display: none !important; +} .openerp .tree_header { background-color: #f0f0f0; border-bottom: 1px solid #cacaca; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c238ef6ee07..8ddf9b56b9f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2050,6 +2050,13 @@ $sheet-max-width: 860px .oe_list_handle @include text-to-icon("ö") + .oe_list_cannot_edit + .oe_list_header_handle, .oe_list_field_handle + display: none !important + .oe_list_cannot_delete + .oe_list_header_delete, .oe_list_record_delete + display: none !important + // }}} // Tree view {{{ .tree_header -- cgit v1.2.3 From 8b98de00e43b2ba0a3df676f0362a9d3d342092b Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 4 Sep 2012 09:49:21 +0200 Subject: [IMP] simplification in list views: merge two css classes bzr revid: rco@openerp.com-20120904074921-ff9pkr64g58ku9n3 --- 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 d32b0a9f42a..bbee2adfbc4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2640,7 +2640,7 @@ .openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle { display: none !important; } -.openerp .oe_list_cannot_delete .oe_list_header_delete, .openerp .oe_list_cannot_delete .oe_list_record_delete { +.openerp .oe_list_cannot_delete .oe_list_record_delete { display: none !important; } .openerp .tree_header { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8ddf9b56b9f..63c6f3398fa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2054,7 +2054,7 @@ $sheet-max-width: 860px .oe_list_header_handle, .oe_list_field_handle display: none !important .oe_list_cannot_delete - .oe_list_header_delete, .oe_list_record_delete + .oe_list_record_delete display: none !important // }}} -- cgit v1.2.3 From 9612626dacbaf3a7956a68f8bd7696966430c0ec Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 4 Sep 2012 12:19:16 +0200 Subject: [ADD] Kanban dummy cell click triggers 'add column' button bounce effect bzr revid: fme@openerp.com-20120904101916-wzkxutkcthgyv2fe --- addons/web/static/src/css/base.css | 4 +++- addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 5 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 dd168653f03..94cb4d3a007 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,7 +69,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -238,6 +237,9 @@ .openerp .ui-widget-content a { color: #7c7bad; } +.openerp .oe_bounce_container { + display: inline-block; +} .openerp.ui-dialog { display: none; padding: 6px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 537988e9c4a..ad5794ab5cf 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -251,6 +251,8 @@ $sheet-max-width: 860px // Jquery ui Overrides {{{ .ui-widget-content a color: $link-color + .oe_bounce_container + display: inline-block // Modal box &.ui-dialog -- cgit v1.2.3 From fd40dcbeff2973c6501db4eb4e752597ef7fcbd2 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 4 Sep 2012 12:11:39 +0200 Subject: [FIX] add minimum height to listview rows matching that of edition row fields Also fix reset of border-radius: none is not a valid value for border-radius, change to 0. bzr revid: xmo@openerp.com-20120904101139-xyl0dskdk6dbdfe1 --- addons/web/static/src/css/base.css | 20 +++++++++++--------- addons/web/static/src/css/base.sass | 12 +++++++----- 2 files changed, 18 insertions(+), 14 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 94cb4d3a007..c20cdf92891 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -523,9 +523,9 @@ padding: 0; margin: 0; background: none; - -moz-border-radius: none; - -webkit-border-radius: none; - border-radius: none; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; @@ -538,9 +538,9 @@ padding: 0; margin: 0; background: none; - -moz-border-radius: none; - -webkit-border-radius: none; - border-radius: none; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; @@ -2479,10 +2479,11 @@ height: 27px; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; border: 1px solid #aaaaff; - border-radius: 0px; - margin: 0px; - -webkit-border-radius: 0px; + margin: 0; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { height: 60px; @@ -2582,6 +2583,7 @@ cursor: pointer; } .openerp .oe_list_content > tbody > tr { + height: 27px; border-top: 1px solid #dddddd; } .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ad5794ab5cf..5f72b7ae548 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -36,7 +36,7 @@ $sheet-max-width: 860px padding: 0 margin: 0 background: none - @include radius(none) + @include radius(0) @include box-shadow(none) @mixin vertical-gradient($startColor: #555, $endColor: #333) @@ -1911,6 +1911,8 @@ $sheet-max-width: 860px background-color: #d2d2ff td.oe_readonly background-color: #eee + + $row-height: 27px .oe_list_editable .oe_list_content td.oe_list_field_cell @@ -1925,12 +1927,11 @@ $sheet-max-width: 860px display: none .oe_form_field input - height: 27px + height: $row-height input, textarea + @include radius(0) border: 1px solid #aaf - border-radius: 0px - margin: 0px - -webkit-border-radius: 0px + margin: 0 textarea height: 60px &.oe_form_field_float,&.oe_form_view_integer @@ -2015,6 +2016,7 @@ $sheet-max-width: 860px > tbody cursor: pointer > tr + height: $row-height border-top: 1px solid #ddd > td.oe_list_field_cell padding: 3px 6px -- cgit v1.2.3 From a613b710e92c09ed0da76fef145ef91a7a041d3d Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Tue, 4 Sep 2012 14:41:17 +0200 Subject: [FIX] Fixed padding in popups. bzr revid: vta@openerp.com-20120904124117-3ilh4ryfu4r0wpqx --- addons/web/static/src/css/base.css | 95 +++++++++-------- addons/web/static/src/css/base.sass | 202 ++++++++++++++++++------------------ 2 files changed, 150 insertions(+), 147 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 dd168653f03..f28e3c6aa0d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,7 +69,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -1933,6 +1932,35 @@ margin: -16px -16px 0 -16px; padding: 8px; } +.openerp .oe_form_sheetbg { + padding: 8px 0; +} +.openerp .oe_form_sheet_width { + min-width: 650px; + max-width: 860px; + margin: 0 auto; +} +.openerp .oe_form_sheet { + background: white; + min-height: 330px; + padding: 16px; +} +.openerp .oe_application .oe_form_sheetbg { + background: url(/web/static/src/img/form_sheetbg.png); + border-bottom: 1px solid #dddddd; +} +.openerp .oe_application .oe_form_sheet { + border: 1px solid #afafb6; + -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); +} +.openerp .oe_application .oe_form_sheet .ui-tabs { + margin: 0 -16px; +} +.openerp .oe_application .oe_form_sheet .oe_notebook_page { + padding: 0 16px; +} .openerp .oe_form header { position: relative; border-bottom: 1px solid #cacaca; @@ -1972,11 +2000,11 @@ .openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div { padding: 1px 0; } -.openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable { +.openerp .oe_form ul.oe_form_steps, .openerp .oe_form ul.oe_form_steps_clickable { display: inline-block; padding-right: 18px; } -.openerp ul.oe_form_steps li, .openerp ul.oe_form_steps_clickable li { +.openerp .oe_form ul.oe_form_steps li, .openerp .oe_form ul.oe_form_steps_clickable li { display: inline-block; margin-right: -20px; background-color: #fcfcfc; @@ -1987,20 +2015,20 @@ background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); } -.openerp ul.oe_form_steps li:first-child .label, .openerp ul.oe_form_steps_clickable li:first-child .label { +.openerp .oe_form ul.oe_form_steps li:first-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:first-child .label { border-left: 1px solid #cacaca; padding-left: 14px; } -.openerp ul.oe_form_steps li:last-child, .openerp ul.oe_form_steps_clickable li:last-child { +.openerp .oe_form ul.oe_form_steps li:last-child, .openerp .oe_form ul.oe_form_steps_clickable li:last-child { border-right: 1px solid #cacaca; } -.openerp ul.oe_form_steps li:last-child .label, .openerp ul.oe_form_steps_clickable li:last-child .label { +.openerp .oe_form ul.oe_form_steps li:last-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .label { padding-right: 14px; } -.openerp ul.oe_form_steps li:last-child .arrow, .openerp ul.oe_form_steps_clickable li:last-child .arrow { +.openerp .oe_form ul.oe_form_steps li:last-child .arrow, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .arrow { display: none; } -.openerp ul.oe_form_steps li .label, .openerp ul.oe_form_steps_clickable li .label { +.openerp .oe_form ul.oe_form_steps li .label, .openerp .oe_form ul.oe_form_steps_clickable li .label { color: #4c4c4c; text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede; padding: 7px; @@ -2009,14 +2037,14 @@ margin: 0; position: relative; } -.openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow { +.openerp .oe_form ul.oe_form_steps li .arrow, .openerp .oe_form ul.oe_form_steps_clickable li .arrow { width: 17px; display: inline-block; vertical-align: top; overflow: hidden; margin-left: -5px; } -.openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span { +.openerp .oe_form ul.oe_form_steps li .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li .arrow span { position: relative; width: 24px; height: 24px; @@ -2036,7 +2064,7 @@ -o-transform: rotate(45deg); -ms-transform: rotate(45deg); } -.openerp ul.oe_form_steps li.oe_active, .openerp ul.oe_form_steps_clickable li.oe_active { +.openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active { background-color: #729fcf; background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); background-image: -webkit-linear-gradient(top, #729fcf, #3465a4); @@ -2045,20 +2073,20 @@ background-image: -o-linear-gradient(top, #729fcf, #3465a4); background-image: linear-gradient(to bottom, #729fcf, #3465a4); } -.openerp ul.oe_form_steps li.oe_active .arrow span, .openerp ul.oe_form_steps_clickable li.oe_active .arrow span { +.openerp .oe_form ul.oe_form_steps li.oe_active .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .arrow span { background-color: #3465a4; background: -moz-linear-gradient(135deg, #3465a4, #729fcf); background: -o-linear-gradient(135deg, #729fcf, #3465a4); background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4)); } -.openerp ul.oe_form_steps li.oe_active .label, .openerp ul.oe_form_steps_clickable li.oe_active .label { +.openerp .oe_form ul.oe_form_steps li.oe_active .label, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .label { color: white; text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4; } -.openerp ul.oe_form_steps_clickable li { +.openerp .oe_form ul.oe_form_steps_clickable li { cursor: pointer; } -.openerp ul.oe_form_steps_clickable li:hover { +.openerp .oe_form ul.oe_form_steps_clickable li:hover { background-color: #e8e8e8; background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); @@ -2067,10 +2095,10 @@ background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } -.openerp ul.oe_form_steps_clickable li:hover .label { +.openerp .oe_form ul.oe_form_steps_clickable li:hover .label { text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede; } -.openerp ul.oe_form_steps_clickable li:hover .arrow span { +.openerp .oe_form ul.oe_form_steps_clickable li:hover .arrow span { background-color: #e8e8e8; background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); @@ -2079,10 +2107,10 @@ background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } -.openerp ul.oe_form_steps_clickable li .label { +.openerp .oe_form ul.oe_form_steps_clickable li .label { color: #7c7bad; } -.openerp ul.oe_form_steps_clickable li.oe_active:hover { +.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover { background-color: #4c85c2; background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d)); background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d); @@ -2091,10 +2119,10 @@ background-image: -o-linear-gradient(top, #4c85c2, #284d7d); background-image: linear-gradient(to bottom, #4c85c2, #284d7d); } -.openerp ul.oe_form_steps_clickable li.oe_active:hover .label { +.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .label { text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4; } -.openerp ul.oe_form_steps_clickable li.oe_active:hover .arrow span { +.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .arrow span { background-color: #284d7d; background: -moz-linear-gradient(135deg, #284d7d, #4c85c2); background: -o-linear-gradient(135deg, #4c85c2, #284d7d); @@ -2126,31 +2154,6 @@ .openerp .oe_form .oe_subtotal_footer label.oe_form_label_help { font-weight: normal; } -.openerp .oe_application .oe_form_sheetbg { - background: url(/web/static/src/img/form_sheetbg.png); - padding: 8px 0; - border-bottom: 1px solid #dddddd; -} -.openerp .oe_application .oe_form_sheet_width { - min-width: 650px; - max-width: 860px; - margin: 0 auto; -} -.openerp .oe_application .oe_form_sheet { - background: white; - min-height: 330px; - padding: 16px; - border: 1px solid #afafb6; - -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); -} -.openerp .oe_application .oe_form_sheet .ui-tabs { - margin: 0 -16px; -} -.openerp .oe_application .oe_form_sheet .oe_notebook_page { - padding: 0 16px; -} .openerp .oe_form .oe_form_button { margin: 2px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 537988e9c4a..4f231331ff7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1498,11 +1498,34 @@ $sheet-max-width: 860px display: none !important .oe_form .oe_form_field_date width: auto + // Sheet and padding .oe_form_nosheet margin: 16px > header margin: -16px -16px 0 -16px padding: 8px + .oe_form_sheetbg + padding: 8px 0 + .oe_form_sheet_width + min-width: 650px + max-width: $sheet-max-width + margin: 0 auto + .oe_form_sheet + background: white + min-height: 330px + padding: 16px + // Sheet inline mode + .oe_application + .oe_form_sheetbg + background: url(/web/static/src/img/form_sheetbg.png) + border-bottom: 1px solid #ddd + .oe_form_sheet + border: 1px solid $tag-border + @include box-shadow(0 0 10px rgba(0,0,0,0.3)) + .ui-tabs + margin: 0 -16px + .oe_notebook_page + padding: 0 16px // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1532,115 +1555,92 @@ $sheet-max-width: 860px padding: 2px 0 .oe_form_group_cell div div padding: 1px 0 - - - ul.oe_form_steps, ul.oe_form_steps_clickable - display: inline-block - padding-right: 18px - li + ul.oe_form_steps, ul.oe_form_steps_clickable display: inline-block - margin-right: -20px - @include vertical-gradient(#fcfcfc, #dedede) - &:first-child .label - border-left: 1px solid #cacaca - padding-left: 14px - &:last-child - border-right: 1px solid #cacaca - .label - padding-right: 14px - .arrow - display: none - .label - color: #4c4c4c - text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede - padding: 7px - display: inline-block - padding-left: 24px - margin: 0 - position: relative - .arrow - width: 17px + padding-right: 18px + li display: inline-block - vertical-align: top - overflow: hidden - margin-left: -5px - span + margin-right: -20px + @include vertical-gradient(#fcfcfc, #dedede) + &:first-child .label + border-left: 1px solid #cacaca + padding-left: 14px + &:last-child + border-right: 1px solid #cacaca + .label + padding-right: 14px + .arrow + display: none + .label + color: #4c4c4c + text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede + padding: 7px + display: inline-block + padding-left: 24px + margin: 0 position: relative - width: 24px - height: 24px + .arrow + width: 17px display: inline-block - margin-left: -12px - margin-top: 3px - box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2) - @include skew-gradient(#fcfcfc, #dedede) - @include radius(3px) - @include transform(rotate(45deg)) - li.oe_active - @include vertical-gradient(#729fcf, #3465a4) - .arrow span - @include skew-gradient(#729fcf, #3465a4) - .label - color: white - text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 - - ul.oe_form_steps_clickable - li - cursor: pointer - &:hover - @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) - .label - text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede + vertical-align: top + overflow: hidden + margin-left: -5px + span + position: relative + width: 24px + height: 24px + display: inline-block + margin-left: -12px + margin-top: 3px + box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2) + @include skew-gradient(#fcfcfc, #dedede) + @include radius(3px) + @include transform(rotate(45deg)) + li.oe_active + @include vertical-gradient(#729fcf, #3465a4) .arrow span + @include skew-gradient(#729fcf, #3465a4) + .label + color: white + text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 + ul.oe_form_steps_clickable + li + cursor: pointer + &:hover @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) - .label - color: $link-color - li.oe_active - &:hover - @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .label + text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede + .arrow span + @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) .label - text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 - .arrow span - @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + color: $link-color + li.oe_active + &:hover + @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .label + text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 + .arrow span + @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .oe_subtotal_footer + width: 1% !important + td.oe_form_group_cell + text-align: right + padding: 0 !important + 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 + label:after + content: ":" + label.oe_subtotal_footer_separator + font-weight: bold !important + padding: 2px 11px 2px 0px !important + label.oe_form_label_help + font-weight: normal - .oe_form .oe_subtotal_footer - width: 1% !important - td.oe_form_group_cell - text-align: right - padding: 0 !important - 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 - label:after - content: ":" - label.oe_subtotal_footer_separator - font-weight: bold !important - padding: 2px 11px 2px 0px !important - label.oe_form_label_help - font-weight: normal - // no sheet in popups - .oe_application - .oe_form_sheetbg - background: url(/web/static/src/img/form_sheetbg.png) - padding: 8px 0 - border-bottom: 1px solid #ddd - .oe_form_sheet_width - min-width: 650px - max-width: $sheet-max-width - margin: 0 auto - .oe_form_sheet - background: white - min-height: 330px - padding: 16px - border: 1px solid $tag-border - @include box-shadow(0 0 10px rgba(0,0,0,0.3)) - .ui-tabs - margin: 0 -16px - .oe_notebook_page - padding: 0 16px // }}} // FormView.group {{{ .oe_form -- cgit v1.2.3 From abdbc220d37ff68312db1b9c43c1ed801b1ad9ec Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 4 Sep 2012 14:49:21 +0200 Subject: [REM] incomplete and unused bounce CSS animation bzr revid: xmo@openerp.com-20120904124921-yur5k231wp8gn7vy --- addons/web/static/src/css/base.css | 49 +++---------------------------------- addons/web/static/src/css/base.sass | 46 ++++++++++++---------------------- 2 files changed, 18 insertions(+), 77 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 25df1334d21..de30642dfd6 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -20,50 +20,6 @@ font-style: normal; } -@-moz-keyframes bounce { - 0% { - -moz-transform: scale(0); - opacity: 0; - } - - 50% { - -moz-transform: scale(1.3); - opacity: 0.4; - } - - 75% { - -moz-transform: scale(0.9); - opacity: 0.7; - } - - 100% { - -moz-transform: scale(1); - opacity: 1; - } -} - -@-webkit-keyframes bounce { - 0% { - -webkit-transform: scale(0); - opacity: 0; - } - - 50% { - -webkit-transform: scale(1.3); - opacity: 0.4; - } - - 75% { - -webkit-transform: scale(0.9); - opacity: 0.7; - } - - 100% { - -webkit-transform: scale(1); - opacity: 1; - } -} - @media print { .oe_topbar, .oe_leftbar, .oe_loading { display: none !important; @@ -2062,10 +2018,11 @@ -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; - -moz-transform: rotate(45deg); -webkit-transform: rotate(45deg); - -o-transform: rotate(45deg); + -moz-transform: rotate(45deg); -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); } .openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active { background-color: #729fcf; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3c61702a60c..82c8e1a57ab 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -95,10 +95,23 @@ $sheet-max-width: 860px background: -webkit-gradient(linear, left top, right bottom, from($startColor), to($endColor)) @mixin transform($transform) - -moz-transform: $transform -webkit-transform: $transform - -o-transform: $transform + -moz-transform: $transform -ms-transform: $transform + -o-transform: $transform + transform: $transform + +@mixin keyframes($name) + @-webkit-keyframes #{$name} + @content + @-moz-keyframes #{$name} + @content + @-ms-keyframes #{$name} + @content + @-o-keyframes #{$name} + @content + @keyframes #{$name} + @content // Transforms the (readable) text of an inline element into an mmlicons icon, // allows for actual readable text in-code (and in readers?) with iconic looks @@ -112,35 +125,6 @@ $sheet-max-width: 860px color: $color // }}} -// CSS animation bounces {{{ -@-moz-keyframes bounce - 0% - -moz-transform: scale(0) - opacity: 0 - 50% - -moz-transform: scale(1.3) - opacity: 0.4 - 75% - -moz-transform: scale(0.9) - opacity: 0.7 - 100% - -moz-transform: scale(1) - opacity: 1 - -@-webkit-keyframes bounce - 0% - -webkit-transform: scale(0) - opacity: 0 - 50% - -webkit-transform: scale(1.3) - opacity: 0.4 - 75% - -webkit-transform: scale(0.9) - opacity: 0.7 - 100% - -webkit-transform: scale(1) - opacity: 1 -// }}} @media print .oe_topbar, .oe_leftbar, .oe_loading -- cgit v1.2.3 From 09fc23c99ef172dc3e8c8ceeaee40709c5091477 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 4 Sep 2012 15:05:09 +0200 Subject: changed red button style bzr revid: mit@openerp.com-20120904130509-94atd9x6rf3lb0sq --- addons/web/static/src/css/base.css | 88 +++++++++++++++++-------------------- addons/web/static/src/css/base.sass | 33 +++++++------- 2 files changed, 56 insertions(+), 65 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 e875ff9fab2..52e74b7c17e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -419,40 +419,35 @@ background: #dc5f59; } .openerp button.oe_highlight { - background-color: #dc5f59; - background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); - background-image: -moz-linear-gradient(top, #dc5f59, #b33630); - background-image: -ms-linear-gradient(top, #dc5f59, #b33630); - background-image: -o-linear-gradient(top, #dc5f59, #b33630); - background-image: linear-gradient(to bottom, #dc5f59, #b33630); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} -.openerp button.oe_highlight:active { - background-color: #b33630; - background-image: -webkit-gradient(linear, left top, left bottom, from(#b33630), to(#dc5f59)); - background-image: -webkit-linear-gradient(top, #b33630, #dc5f59); - background-image: -moz-linear-gradient(top, #b33630, #dc5f59); - background-image: -ms-linear-gradient(top, #b33630, #dc5f59); - background-image: -o-linear-gradient(top, #b33630, #dc5f59); - background-image: linear-gradient(to bottom, #b33630, #dc5f59); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; + border: 1px solid #795151; + background-color: #df3f3f; + background-image: -webkit-gradient(linear, left top, left bottom, from(#df3f3f), to(#a21a1a)); + background-image: -webkit-linear-gradient(top, #df3f3f, #a21a1a); + background-image: -moz-linear-gradient(top, #df3f3f, #a21a1a); + background-image: -ms-linear-gradient(top, #df3f3f, #a21a1a); + background-image: -o-linear-gradient(top, #df3f3f, #a21a1a); + background-image: linear-gradient(to bottom, #df3f3f, #a21a1a); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; } .openerp button.oe_highlight:hover { - background-color: #df6b66; - background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33)); - background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33); - background-image: -moz-linear-gradient(top, #df6b66, #bf3a33); - background-image: -ms-linear-gradient(top, #df6b66, #bf3a33); - background-image: -o-linear-gradient(top, #df6b66, #bf3a33); - background-image: linear-gradient(to bottom, #df6b66, #bf3a33); - -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); + background-color: #e46565; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e46565), to(#b81e1e)); + background-image: -webkit-linear-gradient(top, #e46565, #b81e1e); + background-image: -moz-linear-gradient(top, #e46565, #b81e1e); + background-image: -ms-linear-gradient(top, #e46565, #b81e1e); + background-image: -o-linear-gradient(top, #e46565, #b81e1e); + background-image: linear-gradient(to bottom, #e46565, #b81e1e); +} +.openerp button.oe_highlight:active { + background-color: #ab1b1b; + background-image: -webkit-gradient(linear, left top, left bottom, from(#ab1b1b), to(#e04848)); + background-image: -webkit-linear-gradient(top, #ab1b1b, #e04848); + background-image: -moz-linear-gradient(top, #ab1b1b, #e04848); + background-image: -ms-linear-gradient(top, #ab1b1b, #e04848); + background-image: -o-linear-gradient(top, #ab1b1b, #e04848); + background-image: linear-gradient(to bottom, #ab1b1b, #e04848); } .openerp .oe_background_grey { background: #eeeeee !important; @@ -1223,18 +1218,12 @@ } .openerp .oe_secondary_submenu .oe_active { border-top: 1px solid lightGray; - border-bottom: 1px solid #e0e0e0; + border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - -moz-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); - box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); - background-color: #7372a7; - background-image: -webkit-gradient(linear, left top, left bottom, from(#7372a7), to(#8281b1)); - background-image: -webkit-linear-gradient(top, #7372a7, #8281b1); - background-image: -moz-linear-gradient(top, #7372a7, #8281b1); - background-image: -ms-linear-gradient(top, #7372a7, #8281b1); - background-image: -o-linear-gradient(top, #7372a7, #8281b1); - background-image: linear-gradient(to bottom, #7372a7, #8281b1); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); + background: #7c7bad; } .openerp .oe_secondary_submenu .oe_active a { color: white; @@ -1948,6 +1937,7 @@ .openerp .oe_form header { position: relative; border-bottom: 1px solid #cacaca; + padding-left: 2px; background-color: #fcfcfc; background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); @@ -1960,6 +1950,9 @@ display: inline-block; float: right; } +.openerp .oe_form header .oe_form_button { + margin: 3px 2px; +} .openerp .oe_form div.oe_chatter { min-width: 650px; max-width: 860px; @@ -1979,7 +1972,7 @@ min-width: 150px; } .openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label { - padding: 2px 0; + padding: 1px 0; } .openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div { padding: 1px 0; @@ -2168,7 +2161,7 @@ } .openerp .oe_form td.oe_form_group_cell_label { border-right: 1px solid #dddddd; - padding: 4px 0px 4px 0px; + padding: 2px 0px; } .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; @@ -2176,7 +2169,7 @@ min-width: 140px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { - padding-left: 6px; + padding: 2px 0 2px 8px; } .openerp .oe_form .oe_form_group { width: 100%; @@ -2188,7 +2181,7 @@ .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; white-space: nowrap; - padding-right: 6px; + padding-right: 8px; } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; @@ -2264,7 +2257,6 @@ width: 100%; display: inline-block; padding: 2px 2px 2px 0px; - line-height: 1em; } .openerp .oe_form .oe_form_field input { margin: 0px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 637a1975e32..975a8103847 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -381,15 +381,13 @@ $sheet-max-width: 860px color: white background: #DC5F59 button.oe_highlight - @include vertical-gradient(#dc5f59, #b33630) - @include box-shadow(none) - button.oe_highlight:active - @include vertical-gradient(#b33630, #dc5f59) - @include box-shadow(none) + border: 1px solid #795151 + @include vertical-gradient(#df3f3f, #a21a1a) + @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset)) button.oe_highlight:hover - @include vertical-gradient(#DF6B66, #BF3A33) - //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) - @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + @include vertical-gradient(lighten(#e04f4f, 5%), lighten(#a21a1a, 5%)) + button.oe_highlight:active + @include vertical-gradient(lighten(#a21a1a, 2%), lighten(#df3f3f, 2%)) .oe_background_grey background: #eee !important @@ -955,11 +953,10 @@ $sheet-max-width: 860px @include transform(scale(1.1)) .oe_active border-top: 1px solid lightGray - border-bottom: 1px solid #e0e0e0 + border-bottom: 1px solid #dedede text-shadow: 0 1px 1px rgba(0,0,0,0.2) - @include box-shadow((inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2))) - //background: $link-color - @include vertical-gradient(darken($link-color, 3%), lighten($link-color, 2%)) + @include box-shadow((inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2))) + background: $link-color a color: white .oe_menu_label @@ -1513,10 +1510,13 @@ $sheet-max-width: 860px header position: relative border-bottom: 1px solid #cacaca + padding-left: 2px @include vertical-gradient(#fcfcfc, #dedede) ul display: inline-block float: right + .oe_form_button + margin: 3px 2px div.oe_chatter min-width: 650px max-width: $sheet-max-width @@ -1533,7 +1533,7 @@ $sheet-max-width: 860px label min-width: 150px .oe_form_group_cell_label - padding: 2px 0 + padding: 1px 0 .oe_form_group_cell div div padding: 1px 0 @@ -1652,13 +1652,13 @@ $sheet-max-width: 860px margin: 2px td.oe_form_group_cell_label border-right: 1px solid #ddd - padding: 4px 0px 4px 0px + padding: 2px 0px label line-height: 18px display: block min-width: 140px td.oe_form_group_cell + .oe_form_group_cell - padding-left: 6px + padding: 2px 0 2px 8px .oe_form_group width: 100% margin: 9px 0 9px 0 @@ -1670,7 +1670,7 @@ $sheet-max-width: 860px .oe_form_label_help[for], .oe_form_label[for] font-weight: bold white-space: nowrap - padding-right: 6px + padding-right: 8px span font-size: 80% color: darkGreen @@ -1733,7 +1733,6 @@ $sheet-max-width: 860px width: 100% display: inline-block padding: 2px 2px 2px 0px - line-height: 1em input margin: 0px input[type="text"], input[type="password"], input[type="file"], select -- cgit v1.2.3 From 7ce2e6ff63e744cc6509ba7360bd75efdeec1457 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 4 Sep 2012 16:34:36 +0200 Subject: fix status glitch on firefox bzr revid: mit@openerp.com-20120904143436-3b11jkrxxxmmtn4s --- 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 52e74b7c17e..1a1a07d0fb5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1951,7 +1951,7 @@ float: right; } .openerp .oe_form header .oe_form_button { - margin: 3px 2px; + margin: 3px 2px 1px; } .openerp .oe_form div.oe_chatter { min-width: 650px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 975a8103847..308f32e7daa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1516,7 +1516,7 @@ $sheet-max-width: 860px display: inline-block float: right .oe_form_button - margin: 3px 2px + margin: 3px 2px 1px div.oe_chatter min-width: 650px max-width: $sheet-max-width -- cgit v1.2.3 From 006ed33ff344784dd84c3458b6cef41f6db4ea7a Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 4 Sep 2012 18:42:41 +0200 Subject: wip bzr revid: nicolas.vanhoren@openerp.com-20120904164241-lrvvsj5i7axni5ng --- addons/web/static/src/css/Makefile | 2 +- addons/web/static/src/css/base.css | 97 ++++++++++++++++++++++++++++++++++--- addons/web/static/src/css/base.sass | 34 ++++++++++--- 3 files changed, 118 insertions(+), 15 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile index eca044497ef..d6b4f4b2fc8 100644 --- a/addons/web/static/src/css/Makefile +++ b/addons/web/static/src/css/Makefile @@ -1,3 +1,3 @@ base.css: base.sass - sass -t expanded base.sass base.css + sass --trace -t expanded base.sass base.css diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index de30642dfd6..09432786ca0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -97,13 +97,6 @@ background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede); } -.openerp ul, .openerp li, .openerp ol { - margin: 0; - padding: 0; -} -.openerp li { - list-style-type: none; -} .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; @@ -118,6 +111,24 @@ .openerp h4 { margin: 4px 0; } +.openerp .oe_semantic_html_override_ul { + margin: 0; + padding: 0; +} +.openerp .oe_semantic_html_override_ul li { + margin: 0; + padding: 0; + list-style-type: none; +} +.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol { + margin: 0; + padding: 0; +} +.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; @@ -589,6 +600,22 @@ padding: 0 16px; list-style: none; zoom: 1; + margin: 0; + padding: 0; +} +.openerp .oe_notebook li { + margin: 0; + padding: 0; + list-style-type: none; +} +.openerp .oe_notebook ul, .openerp .oe_notebook ol { + margin: 0; + padding: 0; +} +.openerp .oe_notebook ul li, .openerp .oe_notebook ol li { + margin: 0; + padding: 0; + list-style-type: none; } .openerp .oe_notebook.ui-corner-all { -moz-border-radius: 0; @@ -893,6 +920,15 @@ -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); } +.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane ol { + margin: 0; + padding: 0; +} +.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp .oe_login .oe_login_pane h2 { margin-top: 0; font-size: 18px; @@ -972,6 +1008,15 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } +.openerp .oe_topbar ul, .openerp .oe_topbar ol { + margin: 0; + padding: 0; +} +.openerp .oe_topbar ul li, .openerp .oe_topbar ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; @@ -1044,6 +1089,15 @@ text-shadow: 0 1px 1px white; padding-bottom: 16px; } +.openerp .oe_leftbar ul, .openerp .oe_leftbar ol { + margin: 0; + padding: 0; +} +.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp a.oe_logo { width: 220px; display: block; @@ -1246,6 +1300,15 @@ width: 100%; table-layout: fixed; } +.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header ol { + margin: 0; + padding: 0; +} +.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; text-shadow: 0 1px 1px white; @@ -1946,7 +2009,7 @@ max-width: 650px; margin: 0 0 10px 0; } -.openerp .oe_form div.oe_form_configuration p { +.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { color: #aaaaaa; max-width: 650px; } @@ -2376,6 +2439,24 @@ .openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option { margin-top: 10px; } +.openerp .oe_form_field_status { + margin: 0; + padding: 0; +} +.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol { + margin: 0; + padding: 0; +} +.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li { + margin: 0; + padding: 0; + list-style-type: none; +} +.openerp .oe_form_field_status li { + margin: 0; + padding: 0; + list-style-type: none; +} .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 82c8e1a57ab..40766085008 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -124,6 +124,18 @@ $sheet-max-width: 860px content: $icon-name color: $color +@mixin ul-html-override() + margin: 0 + padding: 0 + li + margin: 0 + padding: 0 + list-style-type: none + +@mixin semantic-html-override() + ul, ol + @include ul-html-override() + // }}} @media print @@ -178,11 +190,6 @@ $sheet-max-width: 860px @include vertical-gradient(#f0f0fa, #eeeef6) .zebra tbody tr:hover td @include vertical-gradient(#eee, #dedede) - ul, li, ol - margin: 0 - padding: 0 - li - list-style-type: none input, textarea, select padding: 2px 4px border: 1px solid #ccc @@ -192,6 +199,10 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 + .oe_semantic_html_override + @include semantic-html-override + .oe_semantic_html_override_ul + @include ul-html-override // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button @@ -497,6 +508,8 @@ $sheet-max-width: 860px padding: 0 16px list-style: none zoom: 1 + @include ul-html-override + @include semantic-html-override .oe_notebook.ui-corner-all @include radius(0) .oe_notebook:before, .oe_notebook:after @@ -716,6 +729,7 @@ $sheet-max-width: 860px text-align: left @include radius(8px) @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) + @include semantic-html-override h2 margin-top: 0 font-size: 18px @@ -781,6 +795,7 @@ $sheet-max-width: 860px height: 31px border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) + @include semantic-html-override .oe_topbar_item display: block padding: 5px 10px 7px @@ -831,6 +846,7 @@ $sheet-max-width: 860px border-right: 1px solid $tag-border text-shadow: 0 1px 1px white padding-bottom: 16px + @include semantic-html-override a.oe_logo width: 220px display: block @@ -995,6 +1011,7 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed + @include semantic-html-override .oe_header_row //min-height: 26px //line-height: 26px @@ -1532,7 +1549,7 @@ $sheet-max-width: 860px max-width: 650px margin: 0 0 10px 0 div.oe_form_configuration - p + p, ul, ol color: #aaa max-width: 650px label @@ -1848,6 +1865,11 @@ $sheet-max-width: 860px li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option margin-top: 10px // }}} + // FormView.fieldstatus {{{ + .oe_form_field_status + @include semantic-html-override + @include ul-html-override + // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page -- cgit v1.2.3 From 7761a0f603e90fa833d6f6c2abdd806d98fd9cc6 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 4 Sep 2012 19:02:47 +0200 Subject: styling tweaks to red buttons bzr revid: mit@openerp.com-20120904170247-fcqvjiy8n46zyf38 --- addons/web/static/src/css/base.css | 28 ++++++++++++++-------------- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 16 insertions(+), 16 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 1a1a07d0fb5..846c62f64b4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -432,22 +432,22 @@ box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; } .openerp button.oe_highlight:hover { - background-color: #e46565; - background-image: -webkit-gradient(linear, left top, left bottom, from(#e46565), to(#b81e1e)); - background-image: -webkit-linear-gradient(top, #e46565, #b81e1e); - background-image: -moz-linear-gradient(top, #e46565, #b81e1e); - background-image: -ms-linear-gradient(top, #e46565, #b81e1e); - background-image: -o-linear-gradient(top, #e46565, #b81e1e); - background-image: linear-gradient(to bottom, #e46565, #b81e1e); + background-color: #e25858; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e25858), to(#ab1b1b)); + background-image: -webkit-linear-gradient(top, #e25858, #ab1b1b); + background-image: -moz-linear-gradient(top, #e25858, #ab1b1b); + background-image: -ms-linear-gradient(top, #e25858, #ab1b1b); + background-image: -o-linear-gradient(top, #e25858, #ab1b1b); + background-image: linear-gradient(to bottom, #e25858, #ab1b1b); } .openerp button.oe_highlight:active { - background-color: #ab1b1b; - background-image: -webkit-gradient(linear, left top, left bottom, from(#ab1b1b), to(#e04848)); - background-image: -webkit-linear-gradient(top, #ab1b1b, #e04848); - background-image: -moz-linear-gradient(top, #ab1b1b, #e04848); - background-image: -ms-linear-gradient(top, #ab1b1b, #e04848); - background-image: -o-linear-gradient(top, #ab1b1b, #e04848); - background-image: linear-gradient(to bottom, #ab1b1b, #e04848); + background-color: #c52020; + background-image: -webkit-gradient(linear, left top, left bottom, from(#c52020), to(#d22323)); + background-image: -webkit-linear-gradient(top, #c52020, #d22323); + background-image: -moz-linear-gradient(top, #c52020, #d22323); + background-image: -ms-linear-gradient(top, #c52020, #d22323); + background-image: -o-linear-gradient(top, #c52020, #d22323); + background-image: linear-gradient(to bottom, #c52020, #d22323); } .openerp .oe_background_grey { background: #eeeeee !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 308f32e7daa..1991052180c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -385,9 +385,9 @@ $sheet-max-width: 860px @include vertical-gradient(#df3f3f, #a21a1a) @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset)) button.oe_highlight:hover - @include vertical-gradient(lighten(#e04f4f, 5%), lighten(#a21a1a, 5%)) + @include vertical-gradient(lighten(#e04f4f, 2%), lighten(#a21a1a, 2%)) button.oe_highlight:active - @include vertical-gradient(lighten(#a21a1a, 2%), lighten(#df3f3f, 2%)) + @include vertical-gradient(lighten(#a21a1a, 8%), darken(#df3f3f, 8%)) .oe_background_grey background: #eee !important -- cgit v1.2.3 From a454d6fae3c2fee59ff61720c4ff6e13cbdc8868 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 5 Sep 2012 10:03:53 +0200 Subject: wip bzr revid: nicolas.vanhoren@openerp.com-20120905080353-tquc3r3n27kt452v --- addons/web/static/src/css/base.css | 49 ++++++++++++++++++++++++++++++------- addons/web/static/src/css/base.sass | 7 ++++-- 2 files changed, 45 insertions(+), 11 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 09432786ca0..07467317c7c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -115,18 +115,33 @@ margin: 0; padding: 0; } -.openerp .oe_semantic_html_override_ul li { +.openerp .oe_semantic_html_override_ul ul, .openerp .oe_semantic_html_override_ul ol, .openerp .oe_semantic_html_override_ul li { margin: 0; padding: 0; +} +.openerp .oe_semantic_html_override_ul li { list-style-type: none; } .openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol { margin: 0; padding: 0; } +.openerp .oe_semantic_html_override ul ul, .openerp .oe_semantic_html_override ul ol, .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol ul, .openerp .oe_semantic_html_override ol ol, .openerp .oe_semantic_html_override ol li { + margin: 0; + padding: 0; +} .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li { + list-style-type: none; +} +.openerp ul.oe_semantic_html_override { + margin: 0; + padding: 0; +} +.openerp ul.oe_semantic_html_override ul, .openerp ul.oe_semantic_html_override ol, .openerp ul.oe_semantic_html_override li { margin: 0; padding: 0; +} +.openerp ul.oe_semantic_html_override li { list-style-type: none; } .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { @@ -603,18 +618,22 @@ margin: 0; padding: 0; } -.openerp .oe_notebook li { +.openerp .oe_notebook ul, .openerp .oe_notebook ol, .openerp .oe_notebook li { margin: 0; padding: 0; +} +.openerp .oe_notebook li { list-style-type: none; } .openerp .oe_notebook ul, .openerp .oe_notebook ol { margin: 0; padding: 0; } -.openerp .oe_notebook ul li, .openerp .oe_notebook ol li { +.openerp .oe_notebook ul ul, .openerp .oe_notebook ul ol, .openerp .oe_notebook ul li, .openerp .oe_notebook ol ul, .openerp .oe_notebook ol ol, .openerp .oe_notebook ol li { margin: 0; padding: 0; +} +.openerp .oe_notebook ul li, .openerp .oe_notebook ol li { list-style-type: none; } .openerp .oe_notebook.ui-corner-all { @@ -924,9 +943,11 @@ margin: 0; padding: 0; } -.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li { +.openerp .oe_login .oe_login_pane ul ul, .openerp .oe_login .oe_login_pane ul ol, .openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol ul, .openerp .oe_login .oe_login_pane ol ol, .openerp .oe_login .oe_login_pane ol li { margin: 0; padding: 0; +} +.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li { list-style-type: none; } .openerp .oe_login .oe_login_pane h2 { @@ -1012,9 +1033,11 @@ margin: 0; padding: 0; } -.openerp .oe_topbar ul li, .openerp .oe_topbar ol li { +.openerp .oe_topbar ul ul, .openerp .oe_topbar ul ol, .openerp .oe_topbar ul li, .openerp .oe_topbar ol ul, .openerp .oe_topbar ol ol, .openerp .oe_topbar ol li { margin: 0; padding: 0; +} +.openerp .oe_topbar ul li, .openerp .oe_topbar ol li { list-style-type: none; } .openerp .oe_topbar .oe_topbar_item { @@ -1093,9 +1116,11 @@ margin: 0; padding: 0; } -.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li { +.openerp .oe_leftbar ul ul, .openerp .oe_leftbar ul ol, .openerp .oe_leftbar ul li, .openerp .oe_leftbar ol ul, .openerp .oe_leftbar ol ol, .openerp .oe_leftbar ol li { margin: 0; padding: 0; +} +.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li { list-style-type: none; } .openerp a.oe_logo { @@ -1304,9 +1329,11 @@ margin: 0; padding: 0; } -.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li { +.openerp .oe_view_manager table.oe_view_manager_header ul ul, .openerp .oe_view_manager table.oe_view_manager_header ul ol, .openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol ul, .openerp .oe_view_manager table.oe_view_manager_header ol ol, .openerp .oe_view_manager table.oe_view_manager_header ol li { margin: 0; padding: 0; +} +.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li { list-style-type: none; } .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { @@ -2447,14 +2474,18 @@ margin: 0; padding: 0; } -.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li { +.openerp .oe_form_field_status ul ul, .openerp .oe_form_field_status ul ol, .openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol ul, .openerp .oe_form_field_status ol ol, .openerp .oe_form_field_status ol li { margin: 0; padding: 0; +} +.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li { list-style-type: none; } -.openerp .oe_form_field_status li { +.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol, .openerp .oe_form_field_status li { margin: 0; padding: 0; +} +.openerp .oe_form_field_status li { list-style-type: none; } .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 40766085008..495f88ad282 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -127,9 +127,10 @@ $sheet-max-width: 860px @mixin ul-html-override() margin: 0 padding: 0 - li + ul, ol, li margin: 0 padding: 0 + li list-style-type: none @mixin semantic-html-override() @@ -199,9 +200,11 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 + .oe_semantic_html_override_ul + @include ul-html-override .oe_semantic_html_override @include semantic-html-override - .oe_semantic_html_override_ul + ul.oe_semantic_html_override @include ul-html-override // }}} // Button style {{{ -- cgit v1.2.3 From 509838a440219119b2ce8c7047d34b4c541d1429 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 5 Sep 2012 10:10:19 +0200 Subject: Solved problem with left menu bzr revid: nicolas.vanhoren@openerp.com-20120905081019-o4x9d6v2meiwlfl7 --- addons/web/static/src/css/base.css | 8 ++++---- addons/web/static/src/css/base.sass | 4 ++-- 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 07467317c7c..a05b1bc25e5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1215,16 +1215,16 @@ width: 100%; display: inline-block; } -.openerp .oe_secondary_submenu > li { +.openerp .oe_secondary_submenu li { position: relative; - padding: 1px 0 1px 20px; + padding: 1px 0 1px 20px !important; } -.openerp .oe_secondary_submenu > li a { +.openerp .oe_secondary_submenu li a { display: block; color: #4c4c4c; padding: 2px 4px 2px 0; } -.openerp .oe_secondary_submenu > li .oe_menu_label { +.openerp .oe_secondary_submenu li .oe_menu_label { position: absolute; top: 1px; right: 1px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 495f88ad282..438f59df11f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -927,9 +927,9 @@ $sheet-max-width: 860px margin: 0 width: 100% display: inline-block - > li + li position: relative - padding: 1px 0 1px 20px + padding: 1px 0 1px 20px !important a display: block color: #4c4c4c -- cgit v1.2.3 From 88105a043b010870d759f0e16a459ccbeac8741e Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 5 Sep 2012 11:18:59 +0200 Subject: [FIX] small css problem with the "more" menu in form views bzr revid: nicolas.vanhoren@openerp.com-20120905091859-jkequxaxo2qd8cz8 --- addons/web/static/src/css/base.css | 28 ++++++++++------------------ addons/web/static/src/css/base.sass | 13 ++++++++++--- 2 files changed, 20 insertions(+), 21 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 a05b1bc25e5..601133b2e7f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -111,17 +111,6 @@ .openerp h4 { margin: 4px 0; } -.openerp .oe_semantic_html_override_ul { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override_ul ul, .openerp .oe_semantic_html_override_ul ol, .openerp .oe_semantic_html_override_ul li { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override_ul li { - list-style-type: none; -} .openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol { margin: 0; padding: 0; @@ -1325,16 +1314,15 @@ width: 100%; table-layout: fixed; } -.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header ol { - margin: 0; - padding: 0; -} -.openerp .oe_view_manager table.oe_view_manager_header ul ul, .openerp .oe_view_manager table.oe_view_manager_header ul ol, .openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol ul, .openerp .oe_view_manager table.oe_view_manager_header ol ol, .openerp .oe_view_manager table.oe_view_manager_header ol li { - margin: 0; +.openerp .oe_view_manager table.oe_view_manager_header ul { padding: 0; + margin-right: 0; + margin-top: 0; + margin-bottom: 0; } -.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li { +.openerp .oe_view_manager table.oe_view_manager_header ul li { list-style-type: none; + margin: 0; } .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; @@ -1445,11 +1433,15 @@ color: white; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } +.openerp .oe_view_manager .oe_view_manager_switch { + margin-left: 8px; +} .openerp .oe_view_manager .oe_view_manager_switch li { text-align: center; width: 24px; height: 24px; line-height: 16px; + padding: 0; } .openerp .oe_view_manager .oe_view_manager_switch li a { position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 438f59df11f..6ee03494e7d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -200,8 +200,6 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 - .oe_semantic_html_override_ul - @include ul-html-override .oe_semantic_html_override @include semantic-html-override ul.oe_semantic_html_override @@ -1014,7 +1012,14 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed - @include semantic-html-override + ul + padding: 0 + margin-right: 0 + margin-top: 0 + margin-bottom: 0 + li + list-style-type: none + margin: 0 .oe_header_row //min-height: 26px //line-height: 26px @@ -1099,11 +1104,13 @@ $sheet-max-width: 860px // }}} // ViewManager.switches {{{ .oe_view_manager_switch + margin-left: 8px li text-align: center width: 24px height: 24px line-height: 16px + padding: 0 a position: relative .oe_vm_switch_list:after, .oe_vm_switch_tree:after -- cgit v1.2.3 From dc6b5e92bf742c775eb4228dbae221321f31bedd Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Wed, 5 Sep 2012 13:24:46 +0200 Subject: [FIX] Fixed min-width input[type=text]. bzr revid: vta@openerp.com-20120905112446-yi6eyfde8pa31g0l --- 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 cb7ecddfa82..226ccbd3513 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2312,7 +2312,7 @@ -ms-box-sizing: border-box; box-sizing: border-box; background: white; - min-width: 70px; + min-width: 60px; color: #1f1f1f; } .openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 6fb2c8d21c1..13f740f218c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1751,7 +1751,7 @@ $sheet-max-width: 860px input[type="text"], input[type="password"], input[type="file"], select, textarea @include box-sizing(border) background: white - min-width: 70px + min-width: 60px color: #1f1f1f input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled] background: #E5E5E5 !important -- cgit v1.2.3 From d86d0f51b4ebe6b8509a02eb3c429c583165a300 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 6 Sep 2012 23:55:09 +0200 Subject: [FIX] ulgy grey topbar border bzr revid: al@openerp.com-20120906215509-z6mexulridkcwgjv --- addons/web/static/src/css/base.css | 8 ++++---- addons/web/static/src/css/base.sass | 1 - 2 files changed, 4 insertions(+), 5 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 03898f25d78..8698fdb9f94 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"); @@ -1007,7 +1007,6 @@ .openerp .oe_topbar { width: 100%; height: 31px; - border-top: solid 1px #d3d3d3; background-color: #646060; background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); background-image: -webkit-linear-gradient(top, #646060, #262626); @@ -1238,10 +1237,11 @@ } .openerp .oe_secondary_submenu .oe_menu_counter:hover { cursor: pointer; - -moz-transform: scale(1.1); -webkit-transform: scale(1.1); - -o-transform: scale(1.1); + -moz-transform: scale(1.1); -ms-transform: scale(1.1); + -o-transform: scale(1.1); + transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { border-top: 1px solid lightGray; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 65146407e54..374f3a6fc4e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -794,7 +794,6 @@ $sheet-max-width: 860px .oe_topbar width: 100% height: 31px - border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) @include semantic-html-override .oe_topbar_item -- cgit v1.2.3 From 9fd2332f552867b9b26b798910cfeca505f660ea Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 9 Sep 2012 01:12:08 +0200 Subject: [FIX] viewmanager css for inline view bzr revid: al@openerp.com-20120908231208-9s1bk5ked84vn018 --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 3 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 8698fdb9f94..73457e2bc19 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1503,10 +1503,10 @@ .openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row:first-child td { padding-top: 8px; } -.openerp .oe_view_manager_inline { +.openerp .oe_view_manager_inline, .openerp .oe_view_manager_inlineview { height: 100%; } -.openerp .oe_view_manager_inline > .oe_view_manager_header { +.openerp .oe_view_manager_inline > .oe_view_manager_header, .openerp .oe_view_manager_inlineview > .oe_view_manager_header { display: none; } .openerp .oe_popup_form > .oe_formview > .oe_form_pager { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 374f3a6fc4e..5e346b32df2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1155,7 +1155,7 @@ $sheet-max-width: 860px padding-top: 8px // }}} // ViewManager inline {{{ - .oe_view_manager_inline + .oe_view_manager_inline, .oe_view_manager_inlineview height: 100% > .oe_view_manager_header display: none -- cgit v1.2.3 From 5848e72d421d0c63a0a9bd3b254b6e4aa35d5cb6 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 11 Sep 2012 08:36:07 +0200 Subject: [REM] import from core, moving to module bzr revid: xmo@openerp.com-20120911063607-xvhyjqohptynro30 --- addons/web/static/src/css/base.css | 8 +++++- addons/web/static/src/css/base.sass | 6 +++- addons/web/static/src/css/data_import.css | 46 ------------------------------- 3 files changed, 12 insertions(+), 48 deletions(-) delete mode 100644 addons/web/static/src/css/data_import.css (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 73457e2bc19..f952dd298fd 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2574,10 +2574,13 @@ .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { display: none; } +.openerp .oe_list_buttons .oe_alternative { + visibility: hidden; +} .openerp .oe_list_buttons .oe_list_save, .openerp .oe_list_buttons .oe_list_discard { display: none; } -.openerp .oe_list_buttons.oe_editing .oe_list_add, .openerp .oe_list_buttons.oe_editing .oe_list_button_import { +.openerp .oe_list_buttons.oe_editing .oe_list_add { display: none; } .openerp .oe_list_buttons.oe_editing .oe_list_save { @@ -2586,6 +2589,9 @@ .openerp .oe_list_buttons.oe_editing .oe_list_discard { display: inline; } +.openerp .oe_list_buttons.oe_editing .oe_alternative { + visibility: visible; +} .openerp .oe_list { position: relative; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5e346b32df2..1f332756cf7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1971,15 +1971,19 @@ $sheet-max-width: 860px // }}} // ListView {{{ .oe_list_buttons + .oe_alternative + visibility: hidden .oe_list_save, .oe_list_discard display: none &.oe_editing - .oe_list_add, .oe_list_button_import + .oe_list_add display: none .oe_list_save display: inline-block .oe_list_discard display: inline + .oe_alternative + visibility: visible .oe_list position: relative diff --git a/addons/web/static/src/css/data_import.css b/addons/web/static/src/css/data_import.css deleted file mode 100644 index 47cd52aa081..00000000000 --- a/addons/web/static/src/css/data_import.css +++ /dev/null @@ -1,46 +0,0 @@ -.openerp .oe_import_grid { - border: none; - border-collapse: collapse; -} -.openerp .oe_import_grid-header .oe_import_grid-cell { - background: url(../img/gradientlinebg.gif) repeat-x #CCCCCC; - border-bottom: 1px solid #E3E3E3; - font-weight: bold; - text-align: left; -} -.openerp .oe_import_grid-row .oe_import_grid-cell { - border-bottom: 1px solid #E3E3E3; -} - -.openerp .oe_import_no_result .oe_import_result { - display: none; -} -.openerp .oe_import fieldset { - cursor: pointer; -} -.openerp .oe_import fieldset legend:before { - content: '\25BC '; -} -.openerp .oe_import fieldset.oe_closed legend:before { - content: '\25B6 '; -} -.openerp .oe_import fieldset.oe_closed table { - display: none; -} -.openerp .oe_import .separator.horizontal { - font-weight: bold; - border-bottom-width: 1px; - margin: 6px 4px 6px 1px; - height: 20px; -} -.openerp .duplicate_fld{ - background-color:#FF6666; -} -.openerp .select_fld{ - background: none repeat scroll 0 0 white; -} -.openerp .ui-autocomplete { - max-height: 300px; - overflow-y: auto; - padding-right: 20px; -} -- cgit v1.2.3 From 0b15180d4990709ac20557c3cb016b3cd24c1c79 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 11 Sep 2012 16:17:38 +0200 Subject: [FIX] css bzr revid: al@openerp.com-20120911141738-0vl1lnen5zwp546s --- addons/web/static/src/css/base.css | 381 ++++++++++++++---------------------- addons/web/static/src/css/base.sass | 197 ++++++++----------- 2 files changed, 229 insertions(+), 349 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 f952dd298fd..3c3be4bd2ea 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -111,28 +111,6 @@ .openerp h4 { margin: 4px 0; } -.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override ul ul, .openerp .oe_semantic_html_override ul ol, .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol ul, .openerp .oe_semantic_html_override ol ol, .openerp .oe_semantic_html_override ol li { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li { - list-style-type: none; -} -.openerp ul.oe_semantic_html_override { - margin: 0; - padding: 0; -} -.openerp ul.oe_semantic_html_override ul, .openerp ul.oe_semantic_html_override ol, .openerp ul.oe_semantic_html_override li { - margin: 0; - padding: 0; -} -.openerp ul.oe_semantic_html_override li { - list-style-type: none; -} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; @@ -602,26 +580,6 @@ padding: 0 16px; list-style: none; zoom: 1; - margin: 0; - padding: 0; -} -.openerp .oe_notebook ul, .openerp .oe_notebook ol, .openerp .oe_notebook li { - margin: 0; - padding: 0; -} -.openerp .oe_notebook li { - list-style-type: none; -} -.openerp .oe_notebook ul, .openerp .oe_notebook ol { - margin: 0; - padding: 0; -} -.openerp .oe_notebook ul ul, .openerp .oe_notebook ul ol, .openerp .oe_notebook ul li, .openerp .oe_notebook ol ul, .openerp .oe_notebook ol ol, .openerp .oe_notebook ol li { - margin: 0; - padding: 0; -} -.openerp .oe_notebook ul li, .openerp .oe_notebook ol li { - list-style-type: none; } .openerp .oe_notebook.ui-corner-all { -moz-border-radius: 0; @@ -697,6 +655,8 @@ top: 26px; left: 0; z-index: 1; + margin: 0; + padding: 0; border: 1px solid #afafb6; background: white; padding: 4px 0; @@ -714,6 +674,7 @@ float: none; display: block; position: relative; + margin: 0; padding: 2px 8px; } .openerp .oe_dropdown_menu > li:hover { @@ -926,17 +887,6 @@ -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); } -.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane ol { - margin: 0; - padding: 0; -} -.openerp .oe_login .oe_login_pane ul ul, .openerp .oe_login .oe_login_pane ul ol, .openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol ul, .openerp .oe_login .oe_login_pane ol ol, .openerp .oe_login .oe_login_pane ol li { - margin: 0; - padding: 0; -} -.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li { - list-style-type: none; -} .openerp .oe_login .oe_login_pane h2 { margin-top: 0; font-size: 18px; @@ -1015,17 +965,6 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } -.openerp .oe_topbar ul, .openerp .oe_topbar ol { - margin: 0; - padding: 0; -} -.openerp .oe_topbar ul ul, .openerp .oe_topbar ul ol, .openerp .oe_topbar ul li, .openerp .oe_topbar ol ul, .openerp .oe_topbar ol ol, .openerp .oe_topbar ol li { - margin: 0; - padding: 0; -} -.openerp .oe_topbar ul li, .openerp .oe_topbar ol li { - list-style-type: none; -} .openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; @@ -1098,17 +1037,6 @@ text-shadow: 0 1px 1px white; padding-bottom: 16px; } -.openerp .oe_leftbar ul, .openerp .oe_leftbar ol { - margin: 0; - padding: 0; -} -.openerp .oe_leftbar ul ul, .openerp .oe_leftbar ul ol, .openerp .oe_leftbar ul li, .openerp .oe_leftbar ol ul, .openerp .oe_leftbar ol ol, .openerp .oe_leftbar ol li { - margin: 0; - padding: 0; -} -.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li { - list-style-type: none; -} .openerp a.oe_logo { width: 220px; display: block; @@ -1164,6 +1092,9 @@ margin: 0; } .openerp .oe_menu > li { + list-style-type: none; + padding: 0; + margin: 0; float: left; } .openerp .oe_menu > li > a { @@ -1203,7 +1134,9 @@ } .openerp .oe_secondary_submenu li { position: relative; + margin: 0; padding: 1px 0 1px 20px !important; + list-style-type: none; } .openerp .oe_secondary_submenu li a { display: block; @@ -1316,16 +1249,6 @@ width: 100%; table-layout: fixed; } -.openerp .oe_view_manager table.oe_view_manager_header ul { - padding: 0; - margin-right: 0; - margin-top: 0; - margin-bottom: 0; -} -.openerp .oe_view_manager table.oe_view_manager_header ul li { - list-style-type: none; - margin: 0; -} .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; text-shadow: 0 1px 1px white; @@ -1397,6 +1320,10 @@ float: left; margin-right: 8px; } +.openerp .oe_view_manager ul.oe_pager_group { + padding: 0; + margin: 0; +} .openerp .oe_view_manager .oe_pager_group { float: left; height: 24px; @@ -1412,6 +1339,8 @@ height: 24px; line-height: 24px; padding: 0; + margin: 0; + list-style-type: none; float: left; border-right: 1px solid #ababab; } @@ -1436,14 +1365,17 @@ text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } .openerp .oe_view_manager .oe_view_manager_switch { - margin-left: 8px; + padding: 0; + margin: 0 0 0 8px; } .openerp .oe_view_manager .oe_view_manager_switch li { - text-align: center; + margin: 0; width: 24px; height: 24px; line-height: 16px; padding: 0; + text-align: center; + list-style-type: none; } .openerp .oe_view_manager .oe_view_manager_switch li a { position: relative; @@ -2047,135 +1979,6 @@ .openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div { padding: 1px 0; } -.openerp .oe_form ul.oe_form_steps, .openerp .oe_form ul.oe_form_steps_clickable { - display: inline-block; - padding-right: 18px; -} -.openerp .oe_form ul.oe_form_steps li, .openerp .oe_form ul.oe_form_steps_clickable li { - display: inline-block; - margin-right: -20px; - background-color: #fcfcfc; - background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); - background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); - background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); - background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); - background-image: -o-linear-gradient(top, #fcfcfc, #dedede); - background-image: linear-gradient(to bottom, #fcfcfc, #dedede); -} -.openerp .oe_form ul.oe_form_steps li:first-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:first-child .label { - border-left: 1px solid #cacaca; - padding-left: 14px; -} -.openerp .oe_form ul.oe_form_steps li:last-child, .openerp .oe_form ul.oe_form_steps_clickable li:last-child { - border-right: 1px solid #cacaca; -} -.openerp .oe_form ul.oe_form_steps li:last-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .label { - padding-right: 14px; -} -.openerp .oe_form ul.oe_form_steps li:last-child .arrow, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .arrow { - display: none; -} -.openerp .oe_form ul.oe_form_steps li .label, .openerp .oe_form ul.oe_form_steps_clickable li .label { - color: #4c4c4c; - text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede; - padding: 7px; - display: inline-block; - padding-left: 24px; - margin: 0; - position: relative; -} -.openerp .oe_form ul.oe_form_steps li .arrow, .openerp .oe_form ul.oe_form_steps_clickable li .arrow { - width: 17px; - display: inline-block; - vertical-align: top; - overflow: hidden; - margin-left: -5px; -} -.openerp .oe_form ul.oe_form_steps li .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li .arrow span { - position: relative; - width: 24px; - height: 24px; - display: inline-block; - margin-left: -12px; - margin-top: 3px; - box-shadow: -1px 1px 2px rgba(255, 255, 255, 0.2), inset -1px 1px 1px rgba(0, 0, 0, 0.2); - background-color: #dedede; - background: -moz-linear-gradient(135deg, #dedede, #fcfcfc); - background: -o-linear-gradient(135deg, #fcfcfc, #dedede); - background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede)); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); -} -.openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active { - background-color: #729fcf; - background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); - background-image: -webkit-linear-gradient(top, #729fcf, #3465a4); - background-image: -moz-linear-gradient(top, #729fcf, #3465a4); - background-image: -ms-linear-gradient(top, #729fcf, #3465a4); - background-image: -o-linear-gradient(top, #729fcf, #3465a4); - background-image: linear-gradient(to bottom, #729fcf, #3465a4); -} -.openerp .oe_form ul.oe_form_steps li.oe_active .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .arrow span { - background-color: #3465a4; - background: -moz-linear-gradient(135deg, #3465a4, #729fcf); - background: -o-linear-gradient(135deg, #729fcf, #3465a4); - background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4)); -} -.openerp .oe_form ul.oe_form_steps li.oe_active .label, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .label { - color: white; - text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4; -} -.openerp .oe_form ul.oe_form_steps_clickable li { - cursor: pointer; -} -.openerp .oe_form ul.oe_form_steps_clickable li:hover { - background-color: #e8e8e8; - background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); - background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); - background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); - background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); - background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); - background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); -} -.openerp .oe_form ul.oe_form_steps_clickable li:hover .label { - text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede; -} -.openerp .oe_form ul.oe_form_steps_clickable li:hover .arrow span { - background-color: #e8e8e8; - background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); - background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); - background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); - background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); - background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); - background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); -} -.openerp .oe_form ul.oe_form_steps_clickable li .label { - color: #7c7bad; -} -.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover { - background-color: #4c85c2; - background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d)); - background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d); - background-image: -moz-linear-gradient(top, #4c85c2, #284d7d); - background-image: -ms-linear-gradient(top, #4c85c2, #284d7d); - background-image: -o-linear-gradient(top, #4c85c2, #284d7d); - background-image: linear-gradient(to bottom, #4c85c2, #284d7d); -} -.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .label { - text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4; -} -.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .arrow span { - background-color: #284d7d; - background: -moz-linear-gradient(135deg, #284d7d, #4c85c2); - background: -o-linear-gradient(135deg, #4c85c2, #284d7d); - background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d)); -} .openerp .oe_form .oe_subtotal_footer { width: 1% !important; } @@ -2463,27 +2266,137 @@ .openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option { margin-top: 10px; } -.openerp .oe_form_field_status { +.openerp ul.oe_form_status, .openerp ul.oe_form_status_clickable { + display: inline-block; margin: 0; - padding: 0; + padding: 0 18px 0 0; } -.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol { - margin: 0; +.openerp ul.oe_form_status li, .openerp ul.oe_form_status_clickable li { + display: inline-block; + list-style-type: none; + margin: 0 -20px 0 0; padding: 0; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); } -.openerp .oe_form_field_status ul ul, .openerp .oe_form_field_status ul ol, .openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol ul, .openerp .oe_form_field_status ol ol, .openerp .oe_form_field_status ol li { - margin: 0; - padding: 0; +.openerp ul.oe_form_status li:first-child .label, .openerp ul.oe_form_status_clickable li:first-child .label { + border-left: 1px solid #cacaca; + padding-left: 14px; } -.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li { - list-style-type: none; +.openerp ul.oe_form_status li:last-child, .openerp ul.oe_form_status_clickable li:last-child { + border-right: 1px solid #cacaca; } -.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol, .openerp .oe_form_field_status li { +.openerp ul.oe_form_status li:last-child .label, .openerp ul.oe_form_status_clickable li:last-child .label { + padding-right: 14px; +} +.openerp ul.oe_form_status li:last-child .arrow, .openerp ul.oe_form_status_clickable li:last-child .arrow { + display: none; +} +.openerp ul.oe_form_status li .label, .openerp ul.oe_form_status_clickable li .label { + color: #4c4c4c; + text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede; + padding: 7px; + display: inline-block; + padding-left: 24px; margin: 0; - padding: 0; + position: relative; } -.openerp .oe_form_field_status li { - list-style-type: none; +.openerp ul.oe_form_status li .arrow, .openerp ul.oe_form_status_clickable li .arrow { + width: 17px; + display: inline-block; + vertical-align: top; + overflow: hidden; + margin-left: -5px; +} +.openerp ul.oe_form_status li .arrow span, .openerp ul.oe_form_status_clickable li .arrow span { + position: relative; + width: 24px; + height: 24px; + display: inline-block; + margin-left: -12px; + margin-top: 3px; + box-shadow: -1px 1px 2px rgba(255, 255, 255, 0.2), inset -1px 1px 1px rgba(0, 0, 0, 0.2); + background-color: #dedede; + background: -moz-linear-gradient(135deg, #dedede, #fcfcfc); + background: -o-linear-gradient(135deg, #fcfcfc, #dedede); + background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede)); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); +} +.openerp ul.oe_form_status li.oe_active, .openerp ul.oe_form_status_clickable li.oe_active { + background-color: #729fcf; + background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); + background-image: -webkit-linear-gradient(top, #729fcf, #3465a4); + background-image: -moz-linear-gradient(top, #729fcf, #3465a4); + background-image: -ms-linear-gradient(top, #729fcf, #3465a4); + background-image: -o-linear-gradient(top, #729fcf, #3465a4); + background-image: linear-gradient(to bottom, #729fcf, #3465a4); +} +.openerp ul.oe_form_status li.oe_active .arrow span, .openerp ul.oe_form_status_clickable li.oe_active .arrow span { + background-color: #3465a4; + background: -moz-linear-gradient(135deg, #3465a4, #729fcf); + background: -o-linear-gradient(135deg, #729fcf, #3465a4); + background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4)); +} +.openerp ul.oe_form_status li.oe_active .label, .openerp ul.oe_form_status_clickable li.oe_active .label { + color: white; + text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4; +} +.openerp ul.oe_form_status_clickable li { + cursor: pointer; +} +.openerp ul.oe_form_status_clickable li:hover { + background-color: #e8e8e8; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); + background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); + background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); +} +.openerp ul.oe_form_status_clickable li:hover .label { + text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede; +} +.openerp ul.oe_form_status_clickable li:hover .arrow span { + background-color: #e8e8e8; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); + background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); + background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); +} +.openerp ul.oe_form_status_clickable li .label { + color: #7c7bad; +} +.openerp ul.oe_form_status_clickable li.oe_active:hover { + background-color: #4c85c2; + background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d)); + background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d); + background-image: -moz-linear-gradient(top, #4c85c2, #284d7d); + background-image: -ms-linear-gradient(top, #4c85c2, #284d7d); + background-image: -o-linear-gradient(top, #4c85c2, #284d7d); + background-image: linear-gradient(to bottom, #4c85c2, #284d7d); +} +.openerp ul.oe_form_status_clickable li.oe_active:hover .label { + text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4; +} +.openerp ul.oe_form_status_clickable li.oe_active:hover .arrow span { + background-color: #284d7d; + background: -moz-linear-gradient(135deg, #284d7d, #4c85c2); + background: -o-linear-gradient(135deg, #4c85c2, #284d7d); + background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d)); } .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; @@ -2832,16 +2745,6 @@ float: right; color: #333333; } -.openerp .oe_semantic_html li { - list-style-type: disc; - display: list-item; -} -.openerp .oe_semantic_html ul { - padding-left: 1em; -} -.openerp .oe_semantic_html p { - color: #4c4c4c !important; -} .kitten-mode-activated { background-image: url(http://placekitten.com/g/1365/769); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1f332756cf7..4bf122c6146 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -124,19 +124,6 @@ $sheet-max-width: 860px content: $icon-name color: $color -@mixin ul-html-override() - margin: 0 - padding: 0 - ul, ol, li - margin: 0 - padding: 0 - li - list-style-type: none - -@mixin semantic-html-override() - ul, ol - @include ul-html-override() - // }}} @media print @@ -200,10 +187,6 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 - .oe_semantic_html_override - @include semantic-html-override - ul.oe_semantic_html_override - @include ul-html-override // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button @@ -509,8 +492,6 @@ $sheet-max-width: 860px padding: 0 16px list-style: none zoom: 1 - @include ul-html-override - @include semantic-html-override .oe_notebook.ui-corner-all @include radius(0) .oe_notebook:before, .oe_notebook:after @@ -567,6 +548,8 @@ $sheet-max-width: 860px top: 26px left: 0 z-index: 1 + margin: 0 + padding: 0 border: 1px solid $tag-border background: white padding: 4px 0 @@ -582,6 +565,7 @@ $sheet-max-width: 860px float: none display: block position: relative + margin: 0 padding: 2px 8px > a white-space: nowrap @@ -730,7 +714,6 @@ $sheet-max-width: 860px text-align: left @include radius(8px) @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) - @include semantic-html-override h2 margin-top: 0 font-size: 18px @@ -795,7 +778,6 @@ $sheet-max-width: 860px width: 100% height: 31px @include vertical-gradient(#646060, #262626) - @include semantic-html-override .oe_topbar_item display: block padding: 5px 10px 7px @@ -846,7 +828,6 @@ $sheet-max-width: 860px border-right: 1px solid $tag-border text-shadow: 0 1px 1px white padding-bottom: 16px - @include semantic-html-override a.oe_logo width: 220px display: block @@ -897,6 +878,9 @@ $sheet-max-width: 860px padding: 0 margin: 0 > li + list-style-type: none + padding: 0 + margin: 0 float: left > a display: block @@ -926,7 +910,9 @@ $sheet-max-width: 860px display: inline-block li position: relative + margin: 0 padding: 1px 0 1px 20px !important + list-style-type: none a display: block color: #4c4c4c @@ -1012,14 +998,6 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed - ul - padding: 0 - margin-right: 0 - margin-top: 0 - margin-bottom: 0 - li - list-style-type: none - margin: 0 .oe_header_row //min-height: 26px //line-height: 26px @@ -1074,6 +1052,9 @@ $sheet-max-width: 860px .oe_pager_value float: left margin-right: 8px + ul.oe_pager_group + padding: 0 + margin: 0 .oe_pager_group float: left height: 24px @@ -1086,6 +1067,8 @@ $sheet-max-width: 860px height: 24px line-height: 24px padding: 0 + margin: 0 + list-style-type: none float: left border-right: 1px solid #ababab &:last-child @@ -1104,13 +1087,16 @@ $sheet-max-width: 860px // }}} // ViewManager.switches {{{ .oe_view_manager_switch - margin-left: 8px + padding: 0 + margin: 0 0 0 8px li - text-align: center + margin: 0 width: 24px height: 24px line-height: 16px padding: 0 + text-align: center + list-style-type: none a position: relative .oe_vm_switch_list:after, .oe_vm_switch_tree:after @@ -1571,72 +1557,6 @@ $sheet-max-width: 860px padding: 1px 0 .oe_form_group_cell div div padding: 1px 0 - ul.oe_form_steps, ul.oe_form_steps_clickable - display: inline-block - padding-right: 18px - li - display: inline-block - margin-right: -20px - @include vertical-gradient(#fcfcfc, #dedede) - &:first-child .label - border-left: 1px solid #cacaca - padding-left: 14px - &:last-child - border-right: 1px solid #cacaca - .label - padding-right: 14px - .arrow - display: none - .label - color: #4c4c4c - text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede - padding: 7px - display: inline-block - padding-left: 24px - margin: 0 - position: relative - .arrow - width: 17px - display: inline-block - vertical-align: top - overflow: hidden - margin-left: -5px - span - position: relative - width: 24px - height: 24px - display: inline-block - margin-left: -12px - margin-top: 3px - box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2) - @include skew-gradient(#fcfcfc, #dedede) - @include radius(3px) - @include transform(rotate(45deg)) - li.oe_active - @include vertical-gradient(#729fcf, #3465a4) - .arrow span - @include skew-gradient(#729fcf, #3465a4) - .label - color: white - text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 - ul.oe_form_steps_clickable - li - cursor: pointer - &:hover - @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) - .label - text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede - .arrow span - @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) - .label - color: $link-color - li.oe_active - &:hover - @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) - .label - text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 - .arrow span - @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) .oe_subtotal_footer width: 1% !important td.oe_form_group_cell @@ -1878,9 +1798,75 @@ $sheet-max-width: 860px margin-top: 10px // }}} // FormView.fieldstatus {{{ - .oe_form_field_status - @include semantic-html-override - @include ul-html-override + ul.oe_form_status, ul.oe_form_status_clickable + display: inline-block + margin: 0 + padding: 0 18px 0 0 + li + display: inline-block + list-style-type: none + margin: 0 -20px 0 0 + padding: 0 + @include vertical-gradient(#fcfcfc, #dedede) + &:first-child .label + border-left: 1px solid #cacaca + padding-left: 14px + &:last-child + border-right: 1px solid #cacaca + .label + padding-right: 14px + .arrow + display: none + .label + color: #4c4c4c + text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede + padding: 7px + display: inline-block + padding-left: 24px + margin: 0 + position: relative + .arrow + width: 17px + display: inline-block + vertical-align: top + overflow: hidden + margin-left: -5px + span + position: relative + width: 24px + height: 24px + display: inline-block + margin-left: -12px + margin-top: 3px + box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2) + @include skew-gradient(#fcfcfc, #dedede) + @include radius(3px) + @include transform(rotate(45deg)) + li.oe_active + @include vertical-gradient(#729fcf, #3465a4) + .arrow span + @include skew-gradient(#729fcf, #3465a4) + .label + color: white + text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 + ul.oe_form_status_clickable + li + cursor: pointer + &:hover + @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) + .label + text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede + .arrow span + @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) + .label + color: $link-color + li.oe_active + &:hover + @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .label + text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 + .arrow span + @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager @@ -2170,15 +2156,6 @@ $sheet-max-width: 860px float: right color: #333 // }}} - .oe_semantic_html // a style to use normal html - li - list-style-type: disc - display: list-item - ul - padding-left: 1em - p - color: #4C4C4C !important - // Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) -- cgit v1.2.3 From 559215872787079d38b2a0432b3655f7dedac6b8 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 12 Sep 2012 14:54:45 +0200 Subject: [IMP] Crop breadcrumb items bzr revid: fme@openerp.com-20120912125445-kuk7knes2a9ogzd5 --- 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 3c3be4bd2ea..679c3b32a18 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1239,6 +1239,13 @@ .openerp .oe_application > div { height: 100%; } +.openerp .oe_application .oe_breadcrumb_item { + display: inline-block; + max-width: 7em; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} .openerp .oe_view_manager .oe_view_manager_body { height: inherit; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4bf122c6146..7eff29d813e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -987,6 +987,12 @@ $sheet-max-width: 860px text-decoration: underline > div height: 100% + .oe_breadcrumb_item + display: inline-block + max-width: 7em + white-space: nowrap + overflow: hidden + text-overflow: ellipsis // }}} // ViewManager common {{{ .oe_view_manager -- cgit v1.2.3 From ecd3a8a5581922d77b94b55d8df5dfda730acf19 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 12 Sep 2012 15:22:15 +0200 Subject: [IMP] Do not overflow ellipsis on last breadcrumb item bzr revid: fme@openerp.com-20120912132215-qftamqpgekx0f3w9 --- 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 679c3b32a18..05cd43db716 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1239,7 +1239,7 @@ .openerp .oe_application > div { height: 100%; } -.openerp .oe_application .oe_breadcrumb_item { +.openerp .oe_application .oe_breadcrumb_item:not(:last-child) { display: inline-block; max-width: 7em; white-space: nowrap; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 7eff29d813e..bab3d7c6ad4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -987,7 +987,7 @@ $sheet-max-width: 860px text-decoration: underline > div height: 100% - .oe_breadcrumb_item + .oe_breadcrumb_item:not(:last-child) display: inline-block max-width: 7em white-space: nowrap -- cgit v1.2.3 From a71f5132843d94c852fe559ced88598a0c4fdd01 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 12 Sep 2012 17:39:01 +0200 Subject: [FIX] css login and kanban bzr revid: al@openerp.com-20120912153901-faxihm41n34hn294 --- addons/web/static/src/css/base.css | 5 +++-- addons/web/static/src/css/base.sass | 5 +++-- 2 files changed, 6 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 05cd43db716..e89e35cecf3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -792,9 +792,10 @@ font-size: 14px; height: 100%; } -.openerp .oe_login li { +.openerp .oe_login ul, .openerp .oe_login li { + margin: 0; list-style-type: none; - padding-bottom: 4px; + padding: 0 0 4px 0; } .openerp .oe_login button { float: right; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index bab3d7c6ad4..e00c1e8401c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -654,9 +654,10 @@ $sheet-max-width: 860px text-align: center font-size: 14px height: 100% - li + ul, li + margin: 0 list-style-type: none - padding-bottom: 4px + padding: 0 0 4px 0 button float: right display: inline-block -- cgit v1.2.3 From 5a5feab65b611c20fd42ef2ae91700311e37a4bd Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 12 Sep 2012 19:16:24 +0200 Subject: [IMP] clean CSS and multiiline M2O bzr revid: fp@tinyerp.com-20120912171624-wx9pfhi9qb3vmxs6 --- addons/web/static/src/css/base.css | 5 +++-- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 4 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 e89e35cecf3..b676173ddd8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,6 +25,7 @@ display: none !important; } } + .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -40,7 +41,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -243,7 +244,7 @@ border-radius: 0 0 2px 2px; } .openerp.ui-dialog .ui-dialog-buttonpane button { - margin: 0; + margin: 0 4px 0 0; } .openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: left; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e00c1e8401c..c8195506da0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -266,7 +266,7 @@ $sheet-max-width: 860px margin: 0 @include radius(0 0 2px 2px) button - margin: 0 + margin: 0 4px 0 0 .ui-dialog-buttonset float: left .ui-button -- cgit v1.2.3 From cd004c2c77e95cf3ab3c2889806b5ce54d107874 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 12 Sep 2012 20:02:58 +0200 Subject: [IMP] remove web mobile bzr revid: fp@tinyerp.com-20120912180258-gvmg8987f0stld0r --- addons/web/static/src/css/base.css | 5 +---- addons/web/static/src/css/base.sass | 4 +--- 2 files changed, 2 insertions(+), 7 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 b676173ddd8..16861a7853f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2467,7 +2467,7 @@ .openerp .oe_list.oe_list_editable.oe_editing .oe_m2o_cm_button { display: none; } -.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input { +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { height: 27px; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { @@ -2477,9 +2477,6 @@ border: 1px solid #aaaaff; margin: 0; } -.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { - height: 60px; -} .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input { text-align: right; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c8195506da0..e3cb661d580 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1937,14 +1937,12 @@ $sheet-max-width: 860px .oe_m2o_cm_button display: none .oe_form_field - input + input, textarea height: $row-height input, textarea @include radius(0) border: 1px solid #aaf margin: 0 - textarea - height: 60px &.oe_form_field_float,&.oe_form_view_integer input text-align: right -- cgit v1.2.3 From d98d41d236a9f7124675c28b473b7df3f2127b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Tue, 18 Sep 2012 18:17:51 +0200 Subject: [FIX] css fixes for editable list bzr revid: fva@openerp.com-20120918161751-fz73pig39zxm7hso --- addons/web/static/src/css/base.css | 22 ++++++++++++++-------- addons/web/static/src/css/base.sass | 18 +++++++++++++++++- 2 files changed, 31 insertions(+), 9 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 16861a7853f..dab079aba7a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,7 +25,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -41,7 +40,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -1154,7 +1153,7 @@ color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightGray; + border: 1px solid lightgrey; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1179,7 +1178,7 @@ transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - border-top: 1px solid lightGray; + border-top: 1px solid lightgrey; border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); @@ -1521,6 +1520,7 @@ font-size: 1px; letter-spacing: -1px; color: transparent; + font-weight: normal; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; @@ -2001,6 +2001,8 @@ .openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator { width: 108px; border-top: 1px solid #cacaca; + margin-top: 4px; + padding-top: 4px; font-weight: bold; font-size: 18px; } @@ -2043,7 +2045,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkGreen; + color: darkgreen; vertical-align: top; position: relative; top: -4px; @@ -2638,20 +2640,24 @@ } .openerp .oe_list_content td.oe_list_field_handle { width: 1em; + padding: 0 !important; cursor: ns-resize; } .openerp .oe_list_content td.oe_list_field_handle .oe_list_handle { font-size: 1px; letter-spacing: -1px; color: transparent; + font-weight: normal; + margin-right: 7px; } .openerp .oe_list_content td.oe_list_field_handle .oe_list_handle:before { - font: 21px "mnmliconsRegular"; - content: "ö"; - color: #404040; + font: 18px "entypoRegular"; + content: "}"; + color: #e0e0e0; } .openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle { display: none !important; + padding: 0 !important; } .openerp .oe_list_cannot_delete .oe_list_record_delete { display: none !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e3cb661d580..9d121457234 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -119,11 +119,22 @@ $sheet-max-width: 860px font-size: 1px letter-spacing: -1px color: transparent + font-weight: normal &:before font: 21px "mnmliconsRegular" content: $icon-name color: $color +@mixin text-to-entypo-icon($icon-name, $color: #404040, $size: 21px) + font-size: 1px + letter-spacing: -1px + color: transparent + font-weight: normal + &:before + font: $size "entypoRegular" + content: $icon-name + color: $color + // }}} @media print @@ -1574,6 +1585,8 @@ $sheet-max-width: 860px .oe_subtotal_footer_separator width: 108px border-top: 1px solid #cacaca + margin-top: 4px + padding-top: 4px font-weight: bold font-size: 18px label:after @@ -2068,13 +2081,16 @@ $sheet-max-width: 860px text-indent: -9001px td.oe_list_field_handle width: 1em + padding: 0 !important cursor: ns-resize .oe_list_handle - @include text-to-icon("ö") + @include text-to-entypo-icon("}",#E0E0E0,18px) + margin-right: 7px .oe_list_cannot_edit .oe_list_header_handle, .oe_list_field_handle display: none !important + padding: 0 !important .oe_list_cannot_delete .oe_list_record_delete display: none !important -- cgit v1.2.3 From c730c3cb784868ad5515e0e707939919d1af7e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Tue, 18 Sep 2012 18:25:32 +0200 Subject: [FIX] css header alignment bzr revid: fva@openerp.com-20120918162532-xte92rwm6jemy09f --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 5 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 dab079aba7a..10ee9dea2de 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1957,6 +1957,9 @@ background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); } +.openerp .oe_form header > span { + margin-left: 4px; +} .openerp .oe_form header ul { display: inline-block; float: right; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 9d121457234..1aa4726725c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1551,6 +1551,8 @@ $sheet-max-width: 860px border-bottom: 1px solid #cacaca padding-left: 2px @include vertical-gradient(#fcfcfc, #dedede) + > span + margin-left: 4px ul display: inline-block float: right -- cgit v1.2.3 From f4f7cfcb0c81a43d45eb30719ebc3ad8d120237d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Tue, 18 Sep 2012 19:01:53 +0200 Subject: [FIX] fixed taxes tags css bzr revid: fva@openerp.com-20120918170153-uojxm4qqwq3qfzff --- addons/web/static/src/css/base.css | 5 +++++ addons/web/static/src/css/base.sass | 5 +++++ 2 files changed, 10 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 10ee9dea2de..a1a6f5a15e7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -30,6 +30,11 @@ position: relative; } +.text-tag .text-button { + height: auto !important; + min-height: 16px; +} + .openerp { padding: 0; margin: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1aa4726725c..49a60a80e2a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -145,6 +145,11 @@ $sheet-max-width: 860px height: 100% position: relative +// jQueryUI css bug fixing +.text-tag .text-button + height: auto !important + min-height: 16px + .openerp // Global style {{{ padding: 0 -- cgit v1.2.3 From fd4f57e037ae7e38288f3625e1cccaae04b9edcd Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 19 Sep 2012 10:32:01 +0200 Subject: [IMP] note: tags in header for form view bzr revid: chm@openerp.com-20120919083201-q1vfazurar2kjcew --- addons/web/static/src/css/base.css | 7 ++++++- addons/web/static/src/css/base.sass | 8 +++++++- 2 files changed, 13 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 10ee9dea2de..a665105bc3a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -531,6 +531,11 @@ .openerp .oe_tags.oe_inline { min-width: 250px; } +.openerp .oe_form header .oe_tags { + margin:5px 0 0 5px; + width:400px; + padding-bottom:0; +} .openerp .oe_tags .text-wrap { width: 100% !important; } @@ -1914,7 +1919,7 @@ } .openerp .oe_form_nosheet > header { margin: -16px -16px 0 -16px; - padding: 8px; + padding: 0; } .openerp .oe_form_sheetbg { padding: 8px 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1aa4726725c..54e6fe18c7f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -470,6 +470,12 @@ $sheet-max-width: 860px text-decoration: none margin-bottom: 1px // }}} + .oe_form + header + .oe_tags + margin:5px 0 0 5px + width:400px + padding-bottom:0 // Tooltips {{{ &.oe_tooltip font-size: 12px @@ -1520,7 +1526,7 @@ $sheet-max-width: 860px margin: 16px > header margin: -16px -16px 0 -16px - padding: 8px + padding: 0 .oe_form_sheetbg padding: 8px 0 .oe_form_sheet_width -- cgit v1.2.3 From f139fc49ab799fdc57fe06611a84cc9aafee6c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 19 Sep 2012 11:13:04 +0200 Subject: [FIX] css bug #1051746 : input field layout problem in firefox and IE bzr revid: fva@openerp.com-20120919091304-k043t7483kfyu6ij --- 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 a1a6f5a15e7..28bcb85dc44 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2489,6 +2489,7 @@ } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input { text-align: right; + width: 100%; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime > span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date > span { width: 100%; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 49a60a80e2a..73a7c8d39e8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1966,6 +1966,7 @@ $sheet-max-width: 860px &.oe_form_field_float,&.oe_form_view_integer input text-align: right + width: 100% &.oe_form_field_datetime,&.oe_form_field_date > span width: 100% -- cgit v1.2.3 From 04b9db1bd793b4f128428bdef329c64cfe250f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 19 Sep 2012 11:45:42 +0200 Subject: [FIX] fixing buttons border css bzr revid: fva@openerp.com-20120919094542-697ow6nd986wws36 --- addons/web/static/src/css/base.css | 3 +-- addons/web/static/src/css/base.sass | 3 +-- 2 files changed, 2 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 28bcb85dc44..80663b882a0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -118,7 +118,7 @@ } .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; - border: 1px solid #ababab; + border: 1px solid rgba(0, 0, 0, 0.4); color: #4c4c4c; margin: 0; padding: 3px 12px; @@ -376,7 +376,6 @@ background: #dc5f59; } .openerp button.oe_highlight { - border: 1px solid #795151; background-color: #df3f3f; background-image: -webkit-gradient(linear, left top, left bottom, from(#df3f3f), to(#a21a1a)); background-image: -webkit-linear-gradient(top, #df3f3f, #a21a1a); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 73a7c8d39e8..e06db6d043e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -207,7 +207,7 @@ $sheet-max-width: 860px // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button display: inline-block - border: 1px solid #ababab + border: 1px solid rgba(0,0,0,0.4) color: #4c4c4c margin: 0 padding: 3px 12px @@ -378,7 +378,6 @@ $sheet-max-width: 860px color: white background: #DC5F59 button.oe_highlight - border: 1px solid #795151 @include vertical-gradient(#df3f3f, #a21a1a) @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset)) button.oe_highlight:hover -- cgit v1.2.3 From d76f02af51c7619047ff3ee230d7db7d17b1189c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Sep 2012 13:11:51 +0200 Subject: [FIX] text-ext z-index mess bzr revid: fme@openerp.com-20120919111151-ii1zu7egypmv1nsc --- addons/web/static/src/css/base.css | 8 ++++---- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 5 insertions(+), 5 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 28bcb85dc44..e1b70932905 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -659,7 +659,7 @@ position: absolute; top: 26px; left: 0; - z-index: 1; + z-index: 3; margin: 0; padding: 0; border: 1px solid #afafb6; @@ -1158,7 +1158,7 @@ color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightgrey; + border: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1183,7 +1183,7 @@ transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - border-top: 1px solid lightgrey; + border-top: 1px solid lightGray; border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); @@ -2053,7 +2053,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkgreen; + color: darkGreen; vertical-align: top; position: relative; top: -4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 73a7c8d39e8..930a14d1c8b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -563,7 +563,7 @@ $sheet-max-width: 860px position: absolute top: 26px left: 0 - z-index: 1 + z-index: 3 margin: 0 padding: 0 border: 1px solid $tag-border -- cgit v1.2.3 From e392d8a56a34cada1abc52563d78d8de9a68172d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Sep 2012 13:46:29 +0200 Subject: [FIX] Broken binary fields bzr revid: fme@openerp.com-20120919114629-wed3oo1rcw0bs5tu --- 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 e1b70932905..eab6d8f2a01 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2224,6 +2224,9 @@ .openerp .oe_form_editable .oe_form .oe_form_field_datetime { width: 11.5em !important; } +.openerp .oe_hidden_input_file { + position: relative; +} .openerp .oe_hidden_input_file input.oe_form_binary_file { z-index: 0; line-height: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 930a14d1c8b..f0786a35623 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1771,6 +1771,9 @@ $sheet-max-width: 860px * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image */ .oe_hidden_input_file + // Position: relative is used for the hidden input[type=file] + // Do not remove it anymore ! + position: relative input.oe_form_binary_file z-index: 0 line-height: 0 -- cgit v1.2.3 From cc733fd0c11151761e5c6b73e6251fd7887ec9d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 19 Sep 2012 14:56:16 +0200 Subject: [FIX] some css fixes in notes bzr revid: fva@openerp.com-20120919125616-lhmx1cjx58f7m8a8 --- addons/web/static/src/css/base.css | 47 +++++++++++++++++++++++++++++++++---- addons/web/static/src/css/base.sass | 33 ++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 9 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 80663b882a0..f6d281425b3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -647,7 +647,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: #404040; + color: rgba(0, 0, 0, 0.5); font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { @@ -1084,6 +1084,48 @@ .openerp .oe_user_menu .oe_dropdown_menu { right: -1px; } +.openerp .oe_about { + background-color: white; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp .oe_about a { + color: #7c7bad; +} +.openerp .oe_about a:hover { + text-decoration: underline; +} +.openerp .oe_about a:focus { + outline: none; +} +.openerp .oe_about .oe_logo { + margin-left: -6px; +} +.openerp .oe_about .oe_bottom { + position: absolute; + top: 50%; + left: 0; + right: 0; + bottom: 0; + text-shadow: 0 1px 1px #999999; + background-color: #b41616; + background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606)); + background-image: -webkit-linear-gradient(top, #b41616, #600606); + background-image: -moz-linear-gradient(top, #b41616, #600606); + background-image: -ms-linear-gradient(top, #b41616, #600606); + background-image: -o-linear-gradient(top, #b41616, #600606); + background-image: linear-gradient(to bottom, #b41616, #600606); + color: #eeeeee; + padding: 0 16px; + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp .oe_about .oe_bottom a { + color: #eeeeee; +} .openerp .oe_systray > div { float: left; padding: 0 4px 0 4px; @@ -2722,9 +2764,6 @@ .openerp .oe-treeview-table .treeview-tr.oe-treeview-first span, .openerp .oe-treeview-table .treeview-td.oe-treeview-first span { margin-left: 16px; } -.openerp .oe_trad_field.touched { - border: 1px solid green !important; -} .openerp .oe_layout_debugging .oe_form_group { outline: 2px dashed green; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e06db6d043e..85d7a030791 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -553,7 +553,7 @@ $sheet-max-width: 860px position: relative cursor: pointer .oe_dropdown_toggle - color: #404040 + color: rgba(0,0,0,0.5) font-weight: normal .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened display: block @@ -881,6 +881,33 @@ $sheet-max-width: 860px .oe_dropdown_menu right: -1px // }}} + // About openerp {{{ + .oe_about + background-color: white + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=) + @include radius(0 0 2px 2px) + a + color: $link-color + &:hover + text-decoration: underline + &:focus + outline: none + .oe_logo + margin-left: -6px + .oe_bottom + position: absolute + top: 50% + left: 0 + right: 0 + bottom: 0 + text-shadow: 0 1px 1px #999999 + @include vertical-gradient(#b41616, #600606) + color: #eee + padding: 0 16px + @include radius(0 0 2px 2px) + a + color: #eee + // }}} // Systray {{{ .oe_systray > div float: left @@ -2146,10 +2173,6 @@ $sheet-max-width: 860px .treeview-tr.oe-treeview-first span, .treeview-td.oe-treeview-first span margin-left: 16px // }}} - // Translation {{{ - .oe_trad_field.touched - border: 1px solid green !important - // }}} // Debugging stuff {{{ .oe_layout_debugging .oe_form_group -- cgit v1.2.3 From 441bfb5280198e46e1386d521594d925bc7a4e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Thu, 20 Sep 2012 13:49:53 +0200 Subject: [FIX] css: mouse cursor on links bzr revid: fva@openerp.com-20120920114953-q9uq5fk83uzl5jfw --- 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 f6d281425b3..af353ccba4e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -57,6 +57,7 @@ } .openerp a { text-decoration: none; + cursor: pointer !important; } .openerp table { padding: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 85d7a030791..972e3387883 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -171,6 +171,7 @@ $sheet-max-width: 860px // Tag reset {{{ a text-decoration: none + cursor: pointer !important table padding: 0 border-collapse: collapse -- cgit v1.2.3 From 494138c37efd78959b86826afa75712bbc98ea8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Thu, 20 Sep 2012 14:25:41 +0200 Subject: [FIX] tab indentation in base.sass bzr revid: fva@openerp.com-20120920122541-o4ylcfucbr3qj8fp --- addons/web/static/src/css/base.css | 16 ++++++++-------- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 10 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 1977bcd89e9..cd15ff19bed 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,21 +1,21 @@ /* -Syntax error: Inconsistent indentation: 1 tab was used for indentation, but the rest of the document was indented using 4 spaces. - on line 478 of web/trunk-css-fva/addons/web/static/src/css/base.sass +Syntax error: Inconsistent indentation: 3 tabs were used for indentation, but the rest of the document was indented using 4 spaces. + on line 480 of web/trunk-css-fva/addons/web/static/src/css/base.sass -473: .text-core .text-wrap .text-dropdown .text-list .text-suggestion em -474: font-style: italic 475: text-decoration: none 476: margin-bottom: 1px 477: // }}} -478: .oe_form -479: header +478: .oe_form +479: header 480: .oe_tags 481: margin:5px 0 0 5px 482: width:400px 483: padding-bottom:0 +484: // Tooltips {{{ +485: &.oe_tooltip Backtrace: -web/trunk-css-fva/addons/web/static/src/css/base.sass:478 +web/trunk-css-fva/addons/web/static/src/css/base.sass:480 /var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/engine.rb:424:in `tabulate' /var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/engine.rb:362:in `each_with_index' /var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/engine.rb:382:in `each' @@ -53,4 +53,4 @@ web/trunk-css-fva/addons/web/static/src/css/base.sass:478 body:before { white-space: pre; font-family: monospace; - content: "Syntax error: Inconsistent indentation: 1 tab was used for indentation, but the rest of the document was indented using 4 spaces.\A on line 478 of web/trunk-css-fva/addons/web/static/src/css/base.sass\A \A 473: .text-core .text-wrap .text-dropdown .text-list .text-suggestion em\A 474: font-style: italic\A 475: text-decoration: none\A 476: margin-bottom: 1px\A 477: // }}}\A 478: .oe_form\A 479: header\A 480: .oe_tags\A 481: margin:5px 0 0 5px\A 482: width:400px\A 483: padding-bottom:0"; } + content: "Syntax error: Inconsistent indentation: 3 tabs were used for indentation, but the rest of the document was indented using 4 spaces.\A on line 480 of web/trunk-css-fva/addons/web/static/src/css/base.sass\A \A 475: text-decoration: none\A 476: margin-bottom: 1px\A 477: // }}}\A 478: .oe_form\A 479: header\A 480: .oe_tags\A 481: margin:5px 0 0 5px\A 482: width:400px\A 483: padding-bottom:0\A 484: // Tooltips {{{\A 485: &.oe_tooltip"; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4e9c89c3f35..5a48c280307 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -475,8 +475,8 @@ $sheet-max-width: 860px text-decoration: none margin-bottom: 1px // }}} - .oe_form - header + .oe_form + header .oe_tags margin:5px 0 0 5px width:400px -- cgit v1.2.3 From 17f91152e7d30d3a10fb65024627537c5938d541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Thu, 20 Sep 2012 14:38:54 +0200 Subject: [SORRY] fixed my mistakes bzr revid: fva@openerp.com-20120920123854-jjiayal4tucqzq7a --- addons/web/static/src/css/base.css | 2925 ++++++++++++++++++++++++++++++++++- addons/web/static/src/css/base.sass | 8 +- 2 files changed, 2873 insertions(+), 60 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 cd15ff19bed..e80b8c49863 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,56 +1,2869 @@ -/* -Syntax error: Inconsistent indentation: 3 tabs were used for indentation, but the rest of the document was indented using 4 spaces. - on line 480 of web/trunk-css-fva/addons/web/static/src/css/base.sass - -475: text-decoration: none -476: margin-bottom: 1px -477: // }}} -478: .oe_form -479: header -480: .oe_tags -481: margin:5px 0 0 5px -482: width:400px -483: padding-bottom:0 -484: // Tooltips {{{ -485: &.oe_tooltip - -Backtrace: -web/trunk-css-fva/addons/web/static/src/css/base.sass:480 -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/engine.rb:424:in `tabulate' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/engine.rb:362:in `each_with_index' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/engine.rb:382:in `each' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/engine.rb:382:in `each_with_index' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/engine.rb:382:in `tabulate' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/engine.rb:345:in `_to_tree' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/engine.rb:315:in `_render' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/engine.rb:262:in `render' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/plugin/compiler.rb:340:in `update_stylesheet' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/plugin/compiler.rb:202:in `update_stylesheets' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/plugin/compiler.rb:200:in `each' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/plugin/compiler.rb:200:in `update_stylesheets' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/plugin/compiler.rb:298:in `watch' -/var/lib/gems/1.8/gems/sass-3.2.1/vendor/listen/lib/listen/multi_listener.rb:86:in `call' -/var/lib/gems/1.8/gems/sass-3.2.1/vendor/listen/lib/listen/multi_listener.rb:86:in `on_change' -/var/lib/gems/1.8/gems/sass-3.2.1/vendor/listen/lib/listen/multi_listener.rb:95:in `initialize_adapter' -/var/lib/gems/1.8/gems/sass-3.2.1/vendor/listen/lib/listen/adapters/polling.rb:55:in `call' -/var/lib/gems/1.8/gems/sass-3.2.1/vendor/listen/lib/listen/adapters/polling.rb:55:in `poll' -/var/lib/gems/1.8/gems/sass-3.2.1/vendor/listen/lib/listen/adapters/polling.rb:31:in `start' -/var/lib/gems/1.8/gems/sass-3.2.1/vendor/listen/lib/listen/adapters/polling.rb:31:in `initialize' -/var/lib/gems/1.8/gems/sass-3.2.1/vendor/listen/lib/listen/adapters/polling.rb:31:in `new' -/var/lib/gems/1.8/gems/sass-3.2.1/vendor/listen/lib/listen/adapters/polling.rb:31:in `start' -/var/lib/gems/1.8/gems/sass-3.2.1/vendor/listen/lib/listen/multi_listener.rb:44:in `start' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/plugin/compiler.rb:306:in `watch' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/plugin.rb:107:in `send' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/plugin.rb:107:in `method_missing' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/exec.rb:431:in `watch_or_update' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/exec.rb:302:in `process_result' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/exec.rb:41:in `parse' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/../lib/sass/../sass/exec.rb:21:in `parse!' -/var/lib/gems/1.8/gems/sass-3.2.1/bin/sass:8 -/usr/local/bin/sass:19:in `load' -/usr/local/bin/sass:19 -*/ -body:before { - white-space: pre; - font-family: monospace; - content: "Syntax error: Inconsistent indentation: 3 tabs were used for indentation, but the rest of the document was indented using 4 spaces.\A on line 480 of web/trunk-css-fva/addons/web/static/src/css/base.sass\A \A 475: text-decoration: none\A 476: margin-bottom: 1px\A 477: // }}}\A 478: .oe_form\A 479: header\A 480: .oe_tags\A 481: margin:5px 0 0 5px\A 482: width:400px\A 483: padding-bottom:0\A 484: // Tooltips {{{\A 485: &.oe_tooltip"; } +@charset "utf-8"; +@font-face { + font-family: "mnmliconsRegular"; + src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); + src: url("/web/static/src/font/mnmliconsv21-webfont.woff") format("woff"); + src: url("/web/static/src/font/mnmliconsv21-webfont.ttf") format("truetype"); + src: url("/web/static/src/font/mnmliconsv21-webfont.svg") format("svg") active; + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: "EntypoRegular"; + src: url("/web/static/src/font/entypo-webfont.eot") format("eot"); + src: url("/web/static/src/font/entypo-webfont.eot?#iefix") format("embedded-opentype"); + src: url("/web/static/src/font/entypo-webfont.woff") format("woff"); + src: url("/web/static/src/font/entypo-webfont.ttf") format("truetype"); + src: url("/web/static/src/font/entypo-webfont.svg") format("svg") active; + font-weight: normal; + font-style: normal; +} + +@media print { + .oe_topbar, .oe_leftbar, .oe_loading { + display: none !important; + } +} +.openerp.openerp_webclient_container { + height: 100%; + position: relative; +} + +.text-tag .text-button { + height: auto !important; + min-height: 16px; +} + +.openerp { + padding: 0; + margin: 0; + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; + color: #4c4c4c; + font-size: 13px; + background: white; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); + /* http://www.quirksmode.org/dom/inputfile.html + * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image + */ +} +.openerp :-moz-placeholder { + color: #afafb6 !important; + font-style: italic !important; +} +.openerp ::-webkit-input-placeholder { + color: #afafb6 !important; + font-style: italic !important; +} +.openerp a { + text-decoration: none; + cursor: pointer !important; +} +.openerp table { + padding: 0; + border-collapse: collapse; +} +.openerp thead { + font-weight: bold; + background-color: #f0f0f0; +} +.openerp thead th { + border-right: 1px dotted #afafb6; +} +.openerp thead th:last-child { + border-right: none; +} +.openerp th, .openerp td { + padding: 0; + text-align: left; +} +.openerp th { + font-weight: bold; + vertical-align: middle; +} +.openerp td { + vertical-align: top; +} +.openerp .zebra tbody tr:nth-child(odd) td { + background-color: #f0f0fa; + background-color: #f0f0fa; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); +} +.openerp .zebra tbody tr:hover td { + background-color: #eeeeee; + background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede)); + background-image: -webkit-linear-gradient(top, #eeeeee, #dedede); + background-image: -moz-linear-gradient(top, #eeeeee, #dedede); + background-image: -ms-linear-gradient(top, #eeeeee, #dedede); + background-image: -o-linear-gradient(top, #eeeeee, #dedede); + background-image: linear-gradient(to bottom, #eeeeee, #dedede); +} +.openerp input, .openerp textarea, .openerp select { + padding: 2px 4px; + border: 1px solid #cccccc; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background: white; +} +.openerp img { + vertical-align: middle; +} +.openerp h4 { + margin: 4px 0; +} +.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { + display: inline-block; + border: 1px solid rgba(0, 0, 0, 0.4); + color: #4c4c4c; + margin: 0; + padding: 3px 12px; + font-size: 13px; + text-align: center; + background-color: #efefef; + background-image: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8)); + background-image: -webkit-linear-gradient(top, #efefef, #d8d8d8); + background-image: -moz-linear-gradient(top, #efefef, #d8d8d8); + background-image: -ms-linear-gradient(top, #efefef, #d8d8d8); + background-image: -o-linear-gradient(top, #efefef, #d8d8d8); + background-image: linear-gradient(to bottom, #efefef, #d8d8d8); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); + -webkit-font-smoothing: antialiased; + outline: none; +} +.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover { + background-color: #f6f6f6; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); + background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -moz-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -ms-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); + cursor: pointer; + background-position: 0; +} +.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus { + border: 1px solid #80bfff; + background-position: 0; + background-color: #f6f6f6; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); + background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -moz-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -ms-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); + -moz-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; + -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; + box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; +} +.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active { + background-color: #e3e3e3; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)); + background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: -moz-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: -ms-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: -o-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: linear-gradient(to bottom, #e3e3e3, #f6f6f6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled { + background: #efefef !important; + border: 1px solid #d1d1d1 !important; + -moz-box-shadow: none !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; + color: #aaaaaa !important; + cursor: default; + text-shadow: 0 1px 1px white !important; +} +.openerp .ui-widget-content a { + color: #7c7bad; +} +.openerp .oe_bounce_container { + display: inline-block; +} +.openerp.ui-dialog { + display: none; + padding: 6px; + background-color: rgba(60, 60, 60, 0.7); + border: 1px solid; + border-color: #888888 #555555 #444444; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; + -moz-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6); + -webkit-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6); + box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; +} +.openerp.ui-dialog .ui-dialog-content { + padding: 0px; +} +.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane { + padding: 16px; +} +.openerp.ui-dialog .ui-dialog-titlebar { + border-bottom: 1px solid #cacaca; + -moz-border-radius: 2px 2px 0 0; + -webkit-border-radius: 2px 2px 0 0; + border-radius: 2px 2px 0 0; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); +} +.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title { + margin: 0; + padding: 0; +} +.openerp.ui-dialog .ui-widget-header { + border: none; +} +.openerp.ui-dialog .ui-dialog-content { + background: white; +} +.openerp.ui-dialog .ui-dialog-buttonpane { + border-top: 1px solid #e0e0e0; + background: #f5f7f9; + margin: 0; + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp.ui-dialog .ui-dialog-buttonpane button { + margin: 0 4px 0 0; +} +.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { + float: left; +} +.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { + margin-right: 4px; +} +.openerp.ui-dialog .ui-dialog-titlebar-close { + padding: 0; +} +.openerp.ui-dialog .ui-dialog-titlebar-close .ui-icon-closethick { + display: none; +} +.openerp.ui-dialog .ui-dialog-titlebar-close:before { + content: "×"; + font-size: 18px; + font-weight: bold; + line-height: 16px; + color: black; + text-shadow: 0 1px 0 white; + padding: 0; + cursor: pointer; + background: transparent; + border: 0; +} +.openerp.ui-dialog .ui-dialog-titlebar-close:before:hover { + color: black; + text-decoration: none; +} +.openerp.ui-dialog .oe_about { + background-color: white; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp.ui-dialog .oe_about a { + color: #7c7bad; +} +.openerp.ui-dialog .oe_about a:hover { + text-decoration: underline; +} +.openerp.ui-dialog .oe_about a:focus { + outline: none; +} +.openerp.ui-dialog .oe_about .oe_logo { + margin-left: -6px; +} +.openerp.ui-dialog .oe_about .oe_bottom { + position: absolute; + top: 50%; + left: 0; + right: 0; + bottom: 0; + text-shadow: 0 1px 1px #999999; + background-color: #b41616; + background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606)); + background-image: -webkit-linear-gradient(top, #b41616, #600606); + background-image: -moz-linear-gradient(top, #b41616, #600606); + background-image: -ms-linear-gradient(top, #b41616, #600606); + background-image: -o-linear-gradient(top, #b41616, #600606); + background-image: linear-gradient(to bottom, #b41616, #600606); + color: #eeeeee; + padding: 0 16px; + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp.ui-dialog .oe_about .oe_bottom a { + color: #eeeeee; +} +.openerp.ui-dialog.oe_act_window .ui-dialog-content { + padding: 0px; +} +.openerp .modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1040; + background-color: black; + filter: alpha(opacity=30); + opacity: 0.3; +} +.openerp .oe_i { + font-family: "mnmliconsRegular" !important; + font-size: 21px; + font-weight: 300 !important; +} +.openerp .oe_e { + font-family: "entypoRegular" !important; + font-size: 34px; + font-weight: 300 !important; +} +.openerp .oe_left { + float: left; + margin-right: 8px; +} +.openerp .oe_right { + float: right; + margin-left: 8px; +} +.openerp .oe_text_right { + text-align: right; +} +.openerp .oe_clear { + clear: both; +} +.openerp .oe_wait { + cursor: wait; +} +.openerp .oe_fade { + color: #888888; + font-weight: normal; +} +.openerp .oe_bold { + font-weight: bold; +} +.openerp .oe_inline { + width: auto !important; +} +.openerp .oe_highlight { + color: white; + background: #dc5f59; +} +.openerp button.oe_highlight { + background-color: #df3f3f; + background-image: -webkit-gradient(linear, left top, left bottom, from(#df3f3f), to(#a21a1a)); + background-image: -webkit-linear-gradient(top, #df3f3f, #a21a1a); + background-image: -moz-linear-gradient(top, #df3f3f, #a21a1a); + background-image: -ms-linear-gradient(top, #df3f3f, #a21a1a); + background-image: -o-linear-gradient(top, #df3f3f, #a21a1a); + background-image: linear-gradient(to bottom, #df3f3f, #a21a1a); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; +} +.openerp button.oe_highlight:hover { + background-color: #e25858; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e25858), to(#ab1b1b)); + background-image: -webkit-linear-gradient(top, #e25858, #ab1b1b); + background-image: -moz-linear-gradient(top, #e25858, #ab1b1b); + background-image: -ms-linear-gradient(top, #e25858, #ab1b1b); + background-image: -o-linear-gradient(top, #e25858, #ab1b1b); + background-image: linear-gradient(to bottom, #e25858, #ab1b1b); +} +.openerp button.oe_highlight:active { + background-color: #c52020; + background-image: -webkit-gradient(linear, left top, left bottom, from(#c52020), to(#d22323)); + background-image: -webkit-linear-gradient(top, #c52020, #d22323); + background-image: -moz-linear-gradient(top, #c52020, #d22323); + background-image: -ms-linear-gradient(top, #c52020, #d22323); + background-image: -o-linear-gradient(top, #c52020, #d22323); + background-image: linear-gradient(to bottom, #c52020, #d22323); +} +.openerp .oe_background_grey { + background: #eeeeee !important; +} +.openerp .oe_form_dirty .oe_highlight_on_dirty { + color: white; + background: #dc5f59; + font-weight: bold; +} +.openerp .oe_form_dirty button.oe_highlight_on_dirty { + background-color: #dc5f59; + background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); + background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); + background-image: -moz-linear-gradient(top, #dc5f59, #b33630); + background-image: -ms-linear-gradient(top, #dc5f59, #b33630); + background-image: -o-linear-gradient(top, #dc5f59, #b33630); + background-image: linear-gradient(to bottom, #dc5f59, #b33630); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp .oe_form_dirty button.oe_highlight_on_dirty:hover { + background: #ed6f6a; +} +.openerp .oe_title { + width: 50%; + float: left; +} +.openerp .oe_title:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +.openerp .oe_button_box { + width: 270px; + text-align: right; +} +.openerp .oe_button_box button { + margin: 4px; +} +.openerp .oe_avatar > img { + max-height: 90px; + max-width: 90px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + border: none; + margin-bottom: 10px; +} +.openerp .oe_avatar + div { + margin-left: 5px; +} +.openerp .oe_image_small > img { + max-width: 50px; + max-height: 50px; +} +.openerp .oe_image_medium > img { + max-width: 180px; + max-height: 180px; +} +.openerp .oe_button.oe_link { + border: none; + padding: 0; + margin: 0; + background: none; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp .oe_button.oe_link img { + display: none; +} +.openerp .oe_button.oe_link span { + border: none; + padding: 0; + margin: 0; + background: none; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + color: #7c7bad; + font-weight: bold; +} +.openerp .oe_button.oe_link span:hover { + text-decoration: underline; +} +.openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off { + color: #cccccc; + text-shadow: 0 0 2px black; + vertical-align: top; + position: relative; + top: -5px; +} +.openerp .oe_webclient .oe_star_on:hover, .openerp .oe_webclient .oe_star_off:hover { + text-decoration: none; +} +.openerp .oe_webclient .oe_star_on { + color: gold; +} +.openerp .oe_tag { + border: 1px solid #afafb6; + font-size: 11px; + padding: 2px 4px; + margin: 0 2px 2px 0; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background: #f0f0fa; + color: #4c4c4c; +} +.openerp .oe_tag_dark { + background: #7c7bad; + color: #eeeeee; +} +.openerp .oe_tags { + margin-bottom: 1px; +} +.openerp .oe_tags.oe_inline { + min-width: 250px; +} +.openerp .oe_tags .text-wrap { + width: 100% !important; +} +.openerp .oe_tags .text-wrap textarea { + width: 100% !important; +} +.openerp .oe_tags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em { + font-style: italic; + text-decoration: none; +} +.openerp .oe_form header .oe_tags { + margin: 5px 0 0 5px; + width: 400px; + padding-bottom: 0; +} +.openerp.oe_tooltip { + font-size: 12px; +} +.openerp.oe_tooltip .oe_tooltip_string { + color: #ffdd55; + font-weight: bold; + font-size: 13px; +} +.openerp.oe_tooltip .oe_tooltip_help { + white-space: pre-wrap; +} +.openerp.oe_tooltip .oe_tooltip_technical { + padding: 0 0 4px 0; + margin: 5px 0 0 15px; +} +.openerp.oe_tooltip .oe_tooltip_technical li { + list-style: circle; +} +.openerp.oe_tooltip .oe_tooltip_technical_title { + font-weight: bold; +} +.openerp.oe_tooltip .oe_tooltip_close { + margin: -5px 0 0 2px; + cursor: default; + float: right; + color: white; +} +.openerp.oe_tooltip .oe_tooltip_close:hover { + color: #999999; + cursor: pointer; +} +.openerp.oe_tooltip .oe_tooltip_message { + max-width: 310px; +} +.openerp .oe_notebook { + margin: 8px 0; + padding: 0 16px; + list-style: none; + zoom: 1; +} +.openerp .oe_notebook.ui-corner-all { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; +} +.openerp .oe_notebook:before, .openerp .oe_notebook:after { + display: table; + content: ""; + zoom: 1; +} +.openerp .oe_notebook:after { + clear: both; +} +.openerp .oe_notebook > li { + float: left; +} +.openerp .oe_notebook > li > a { + display: block; + color: #4c4c4c; +} +.openerp .oe_notebook { + border-color: #dddddd; + border-style: solid; + border-width: 0 0 1px; +} +.openerp .oe_notebook > li { + position: relative; +} +.openerp .oe_notebook > li > a { + padding: 0 12px; + margin-right: 2px; + line-height: 30px; + border: 1px solid transparent; + -moz-border-radius: 4px 4px 0 0; + -webkit-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.openerp .oe_notebook > li > a:hover { + text-decoration: none; + background-color: #eeeeee; + border-color: #eeeeee #eeeeee #dddddd; +} +.openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover { + background-color: white; + border: 1px solid #dddddd; + border-bottom-color: transparent; + cursor: default; +} +.openerp .oe_notebook_page { + padding: 0; +} +.openerp div.ui-tabs { + padding: 3px 0px 3px 0px; +} +.openerp .ui-tabs-hide { + display: none; +} +.openerp .oe_dropdown, .openerp .oe_dropdown_hover, .openerp .oe_dropdown_toggle { + position: relative; + cursor: pointer; +} +.openerp .oe_dropdown_toggle { + color: rgba(0, 0, 0, 0.5); + font-weight: normal; +} +.openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { + display: block; +} +.openerp .oe_dropdown_menu { + display: none; + position: absolute; + top: 26px; + left: 0; + z-index: 3; + margin: 0; + padding: 0; + border: 1px solid #afafb6; + background: white; + padding: 4px 0; + min-width: 140px; + text-align: left; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -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_dropdown_menu > li { + list-style-type: none; + float: none; + display: block; + position: relative; + margin: 0; + padding: 2px 8px; +} +.openerp .oe_dropdown_menu > li:hover { + background-color: #f0f0fa; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp .oe_dropdown_menu > li > a { + white-space: nowrap; + display: block; + color: #4c4c4c; + text-decoration: none; +} +.openerp .oe_dropdown_menu > li > a:hover { + text-decoration: none; +} +.openerp .oe_dropdown_arrow:after { + width: 0; + height: 0; + display: inline-block; + content: "&darr"; + text-indent: -99999px; + vertical-align: top; + margin-top: 8px; + margin-left: 4px; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #404040; + filter: alpha(opacity=50); + opacity: 0.5; +} +.openerp .oe_sidebar { + white-space: nowrap; +} +.openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment { + height: 20px; + cursor: pointer; + padding-left: 6px; + margin-top: 6px; +} +.openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment span { + font-weight: bold; +} +.openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment .oe_hidden_input_file { + width: 200px; +} +.openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment:hover { + background-color: #f0f0fa; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp .oe_sidebar .oe_dropdown_menu li .oe_sidebar_delete_item { + position: absolute; + top: 4px; + right: 4px; + display: none; + width: 12px; + height: 12px; + padding: 1px; + color: #8786b7; + line-height: 8px; + text-align: center; + font-weight: bold; + text-shadow: 0 1px 1px white; +} +.openerp .oe_sidebar .oe_dropdown_menu li .oe_sidebar_delete_item: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_sidebar .oe_dropdown_menu li:hover .oe_sidebar_delete_item { + display: inline-block; +} +.openerp .oe_loading { + display: none; + z-index: 100; + position: fixed; + top: 0; + right: 50%; + padding: 4px 12px; + background: #a61300; + color: white; + text-align: center; + border: 1px solid #990000; + border-top: none; + -moz-border-radius-bottomright: 8px; + -moz-border-radius-bottomleft: 8px; + border-bottom-right-radius: 8px; + border-bottom-left-radius: 8px; +} +.openerp .oe_notification { + z-index: 1050; +} +.openerp .oe_login { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); + text-align: center; + font-size: 14px; + height: 100%; +} +.openerp .oe_login ul, .openerp .oe_login li { + margin: 0; + list-style-type: none; + padding: 0 0 4px 0; +} +.openerp .oe_login button { + float: right; + display: inline-block; + cursor: pointer; + padding: 6px 16px; + border: 1px solid #222222; + color: white; + margin: 0; + background-color: #b92020; + background-image: -webkit-gradient(linear, left top, left bottom, from(#b92020), to(#600606)); + background-image: -webkit-linear-gradient(top, #b92020, #600606); + background-image: -moz-linear-gradient(top, #b92020, #600606); + background-image: -ms-linear-gradient(top, #b92020, #600606); + background-image: -o-linear-gradient(top, #b92020, #600606); + background-image: linear-gradient(to bottom, #b92020, #600606); + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; +} +.openerp .oe_login input, .openerp .oe_login select { + width: 252px; + font-family: "Lucida Grande", Helvetica, Verdana, Arial; + border: 1px solid #999999; + background: whitesmoke; + -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); + box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} +.openerp .oe_login input { + margin-bottom: 9px; + padding: 5px 6px; +} +.openerp .oe_login select { + padding: 1px; +} +.openerp .oe_login .oe_login_dbpane { + position: fixed; + top: 0; + right: 8px; + padding: 5px 10px; + color: #eeeeee; + border: solid 1px #333333; + background: #1e1e1e; + background: rgba(30, 30, 30, 0.94); + -moz-border-radius: 0 0 8px 8px; + -webkit-border-radius: 0 0 8px 8px; + border-radius: 0 0 8px 8px; +} +.openerp .oe_login .oe_login_dbpane input { + padding: 2px 4px; + margin: 4px 0; +} +.openerp .oe_login .oe_login_bottom { + position: absolute; + top: 50%; + left: 0; + right: 0; + bottom: 0; + text-shadow: 0 1px 1px #999999; + background-color: #b41616; + background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606)); + background-image: -webkit-linear-gradient(top, #b41616, #600606); + background-image: -moz-linear-gradient(top, #b41616, #600606); + background-image: -ms-linear-gradient(top, #b41616, #600606); + background-image: -o-linear-gradient(top, #b41616, #600606); + background-image: linear-gradient(to bottom, #b41616, #600606); +} +.openerp .oe_login .oe_login_pane { + position: absolute; + top: 50%; + left: 50%; + margin: -160px -166px; + border: solid 1px #333333; + background: #1e1e1e; + background: rgba(30, 30, 30, 0.94); + padding: 22px 32px; + color: #eeeeee; + text-align: left; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; + -moz-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); + -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); + box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); +} +.openerp .oe_login .oe_login_pane h2 { + margin-top: 0; + font-size: 18px; +} +.openerp .oe_login .oe_login_logo { + position: absolute; + top: -70px; + left: 0; + width: 100%; + margin: 0 auto; + text-align: center; +} +.openerp .oe_login .oe_login_footer { + position: absolute; + bottom: -40px; + left: 0; + width: 100%; + text-align: center; +} +.openerp .oe_login .oe_login_footer a { + color: #eeeeee; + margin: 0 8px; +} +.openerp .oe_login .oe_login_footer a:hover { + text-decoration: underline; +} +.openerp .oe_login .oe_login_footer span { + font-weight: bold; + font-size: 16px; +} +.openerp .oe_login .oe_login_error_message { + display: none; + background-color: #b41616; + color: #eeeeee; + padding: 14px 18px; + margin-top: 15px; + text-align: center; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8); +} +.openerp .oe_login_invalid .oe_login_error_message { + display: inline-block; +} +.openerp .oe_database_manager { + background: white; + color: black; + text-align: left; +} +.openerp .oe_database_manager .oe_database_manager_menu { + color: black; +} +.openerp .oe_webclient { + width: 100%; + height: 100%; + border-spacing: 0px; +} +.openerp .oe_content_full_screen .oe_application { + top: 0; + left: 0; +} +.openerp .oe_content_full_screen .oe_topbar, .openerp .oe_content_full_screen .oe_leftbar { + display: none; +} +.openerp .oe_topbar { + width: 100%; + height: 31px; + background-color: #646060; + background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); + background-image: -webkit-linear-gradient(top, #646060, #262626); + background-image: -moz-linear-gradient(top, #646060, #262626); + background-image: -ms-linear-gradient(top, #646060, #262626); + background-image: -o-linear-gradient(top, #646060, #262626); + background-image: linear-gradient(to bottom, #646060, #262626); +} +.openerp .oe_topbar .oe_topbar_item { + display: block; + padding: 5px 10px 7px; + line-height: 20px; + height: 20px; + color: #eeeeee; + vertical-align: top; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); +} +.openerp .oe_topbar .oe_topbar_item:hover { + background: #303030; + color: white; + -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; +} +.openerp .oe_topbar .oe_topbar_avatar { + width: 24px; + height: 24px; + margin: -2px 2px 0 0; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} +.openerp .oe_topbar .oe_topbar_avatar { + vertical-align: top; +} +.openerp .oe_topbar .oe_dropdown_arrow:after { + border-top: 4px solid white; +} +.openerp .oe_topbar .oe_dropdown_menu { + top: 32px; + background: #333333; + background: rgba(37, 37, 37, 0.9); + border-color: #999999; + border-color: rgba(0, 0, 0, 0.2); + border-style: solid; + border-width: 0 1px 1px; + -moz-border-radius: 0 0 6px 6px; + -webkit-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; +} +.openerp .oe_topbar .oe_dropdown_menu li { + float: none; + padding: 3px 12px; +} +.openerp .oe_topbar .oe_dropdown_menu li a { + color: #eeeeee; +} +.openerp .oe_topbar .oe_dropdown_menu li:hover { + background-color: #292929; + background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); + background-image: -webkit-linear-gradient(top, #292929, #191919); + background-image: -moz-linear-gradient(top, #292929, #191919); + background-image: -ms-linear-gradient(top, #292929, #191919); + background-image: -o-linear-gradient(top, #292929, #191919); + background-image: linear-gradient(to bottom, #292929, #191919); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp .oe_leftbar { + display: none; + width: 220px; + background: #f0eeee; + border-right: 1px solid #afafb6; + text-shadow: 0 1px 1px white; + padding-bottom: 16px; +} +.openerp a.oe_logo { + width: 220px; + display: block; + text-align: center; + height: 70px; + line-height: 70px; +} +.openerp a.oe_logo img { + height: 40px; + width: 157px; + margin: 14px 0; +} +.openerp .oe_footer { + position: fixed; + bottom: 0; + padding: 4px 0; + background: #f0eeee; + width: 220px; + text-align: center; +} +.openerp .oe_footer a { + font-weight: 800; + font-family: serif; + font-size: 16px; + color: black; +} +.openerp .oe_footer a span { + color: #c81010; + font-style: italic; +} +.openerp .oe_user_menu { + float: right; + padding: 0; + margin: 0; +} +.openerp .oe_user_menu li { + list-style-type: none; + float: left; +} +.openerp .oe_user_menu .oe_dropdown_menu { + right: -1px; +} +.openerp .oe_about { + background-color: white; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp .oe_about a { + color: #7c7bad; +} +.openerp .oe_about a:hover { + text-decoration: underline; +} +.openerp .oe_about a:focus { + outline: none; +} +.openerp .oe_about .oe_logo { + margin-left: -6px; +} +.openerp .oe_about .oe_bottom { + position: absolute; + top: 50%; + left: 0; + right: 0; + bottom: 0; + text-shadow: 0 1px 1px #999999; + background-color: #b41616; + background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606)); + background-image: -webkit-linear-gradient(top, #b41616, #600606); + background-image: -moz-linear-gradient(top, #b41616, #600606); + background-image: -ms-linear-gradient(top, #b41616, #600606); + background-image: -o-linear-gradient(top, #b41616, #600606); + background-image: linear-gradient(to bottom, #b41616, #600606); + color: #eeeeee; + padding: 0 16px; + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp .oe_about .oe_bottom a { + color: #eeeeee; +} +.openerp .oe_systray > div { + float: left; + padding: 0 4px 0 4px; +} +.openerp .oe_systray { + float: right; +} +.openerp .oe_menu { + float: left; + padding: 0; + margin: 0; +} +.openerp .oe_menu > li { + list-style-type: none; + padding: 0; + margin: 0; + float: left; +} +.openerp .oe_menu > li > a { + display: block; + padding: 5px 10px 7px; + line-height: 20px; + height: 20px; + color: #eeeeee; + vertical-align: top; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); +} +.openerp .oe_menu > li > a:hover { + background: #303030; + color: white; + -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; +} +.openerp .oe_menu > li > .oe_active { + background: #303030; + font-weight: bold; + color: white; + -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; +} +.openerp .oe_secondary_menu_section { + font-weight: bold; + margin-left: 8px; + color: #7c7bad; +} +.openerp .oe_secondary_submenu { + padding: 2px 0 8px 0; + margin: 0; + width: 100%; + display: inline-block; +} +.openerp .oe_secondary_submenu li { + position: relative; + margin: 0; + padding: 1px 0 1px 20px !important; + list-style-type: none; +} +.openerp .oe_secondary_submenu li a { + display: block; + color: #4c4c4c; + padding: 2px 4px 2px 0; +} +.openerp .oe_secondary_submenu li .oe_menu_label { + position: absolute; + top: 1px; + right: 1px; + font-size: 10px; + background: #7c7bad; + color: white; + padding: 2px 4px; + margin: 1px 6px 0 0; + border: 1px solid lightgrey; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); +} +.openerp .oe_secondary_submenu .oe_menu_counter { + float: right; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + margin: 1px; + padding: 1px 4px; + border: none; +} +.openerp .oe_secondary_submenu .oe_menu_counter:hover { + cursor: pointer; + -webkit-transform: scale(1.1); + -moz-transform: scale(1.1); + -ms-transform: scale(1.1); + -o-transform: scale(1.1); + transform: scale(1.1); +} +.openerp .oe_secondary_submenu .oe_active { + border-top: 1px solid lightgrey; + border-bottom: 1px solid #dedede; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); + background: #7c7bad; +} +.openerp .oe_secondary_submenu .oe_active a { + color: white; +} +.openerp .oe_secondary_submenu .oe_active .oe_menu_label { + background: #eeeeee; + color: #7c7bad; + text-shadow: 0 1px 1px white; + -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); +} +.openerp .oe_secondary_submenu .oe_active .oe_menu_counter { + background: #eeeeee; + color: #7c7bad; + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); +} +.openerp .oe_secondary_submenu .oe_menu_toggler:before { + width: 0; + height: 0; + display: inline-block; + content: "&darr"; + text-indent: -99999px; + vertical-align: top; + margin-left: -12px; + margin-top: 4px; + margin-right: 4px; + border-top: 4px solid transparent; + border-bottom: 4px solid transparent; + border-left: 4px solid #4c4c4c; + filter: alpha(opacity=50); + opacity: 0.5; +} +.openerp .oe_secondary_submenu .oe_menu_opened:before { + margin-top: 6px; + margin-left: -16px; + margin-right: 4px; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #4c4c4c; +} +.openerp .oe_application { + width: 100%; +} +.openerp .oe_application a { + color: #7c7bad; +} +.openerp .oe_application a:hover { + text-decoration: underline; +} +.openerp .oe_application > div { + height: 100%; +} +.openerp .oe_application .oe_breadcrumb_item:not(:last-child) { + display: inline-block; + max-width: 7em; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.openerp .oe_view_manager .oe_view_manager_body { + height: inherit; +} +.openerp .oe_view_manager .oe_view_manager_view_kanban { + height: inherit; +} +.openerp .oe_view_manager table.oe_view_manager_header { + width: 100%; + table-layout: fixed; +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { + clear: both; + text-shadow: 0 1px 1px white; +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_header_row:last-child td { + padding-top: 0; +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_header_row:first-child td { + padding-top: 8px; +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_sidebar { + margin: 0px auto; + text-align: center; +} +.openerp .oe_view_manager table.oe_view_manager_header td { + line-height: 26px; +} +.openerp .oe_view_manager table.oe_view_manager_header h2 { + font-size: 18px; + margin: 0; + float: left; +} +.openerp .oe_view_manager table.oe_view_manager_header h2 a { + color: #7c7bad; +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_dropdown_menu { + line-height: normal; +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group { + display: inline-block; + border: 1px solid #ababab; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group li { + float: left; + border-right: 1px solid #ababab; +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group li:last-child { + border: none; +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group a { + color: #4c4c4c; +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group a:hover { + text-decoration: none; +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group .active { + background: #999999; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group .active a { + color: white; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); +} +.openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_buttons { + white-space: nowrap; +} +.openerp .oe_view_manager .oe_view_manager_pager { + line-height: 26px; +} +.openerp .oe_view_manager .oe_view_manager_pager .oe_list_pager_single_page .oe_pager_group { + display: none; +} +.openerp .oe_view_manager .oe_pager_value { + float: left; + margin-right: 8px; +} +.openerp .oe_view_manager ul.oe_pager_group { + padding: 0; + margin: 0; +} +.openerp .oe_view_manager .oe_pager_group { + float: left; + height: 24px; + line-height: 24px; + display: inline-block; + border: 1px solid #ababab; + cursor: pointer; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} +.openerp .oe_view_manager .oe_pager_group li { + height: 24px; + line-height: 24px; + padding: 0; + margin: 0; + list-style-type: none; + float: left; + border-right: 1px solid #ababab; +} +.openerp .oe_view_manager .oe_pager_group li:last-child { + border: none; +} +.openerp .oe_view_manager .oe_pager_group a { + color: #4c4c4c; + padding: 0 8px; +} +.openerp .oe_view_manager .oe_pager_group a:hover { + text-decoration: none; +} +.openerp .oe_view_manager .oe_pager_group .active { + background: #999999; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; +} +.openerp .oe_view_manager .oe_pager_group .active a { + color: white; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); +} +.openerp .oe_view_manager .oe_view_manager_switch { + padding: 0; + margin: 0 0 0 8px; +} +.openerp .oe_view_manager .oe_view_manager_switch li { + margin: 0; + width: 24px; + height: 24px; + line-height: 16px; + padding: 0; + text-align: center; + list-style-type: none; +} +.openerp .oe_view_manager .oe_view_manager_switch li a { + position: relative; +} +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_list:after, .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_tree:after { + padding: 2px; + content: "i"; +} +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_form:after { + content: "m"; +} +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_graph:after { + font-family: "mnmliconsRegular" !important; + font-size: 21px; + font-weight: 300 !important; + content: "}"; + top: -2px; + position: relative; +} +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_gantt:after { + font-family: "mnmliconsRegular" !important; + font-size: 21px; + font-weight: 300 !important; + content: "y"; + top: -2px; + position: relative; +} +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_calendar:after { + content: "P"; +} +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_kanban:after { + content: "k"; +} +.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_diagram:after { + content: "f"; +} +.openerp .oe_view_manager_current { + height: 100%; +} +.openerp .oe_view_manager_current > .oe_view_manager_header { + border-top: 1px solid #cacaca; + border-bottom: 1px solid #cacaca; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); + -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); +} +.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row td { + padding: 8px; +} +.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row:first-child td { + padding-top: 8px; +} +.openerp .oe_view_manager_inline, .openerp .oe_view_manager_inlineview { + height: 100%; +} +.openerp .oe_view_manager_inline > .oe_view_manager_header, .openerp .oe_view_manager_inlineview > .oe_view_manager_header { + display: none; +} +.openerp .oe_popup_form > .oe_formview > .oe_form_pager { + display: none !important; +} +.openerp .oe_searchview { + cursor: text; + position: relative; + float: right; + padding: 1px 0; + line-height: 18px; + width: 400px; + border: 1px solid #ababab; + background: white; + -moz-border-radius: 13px; + -webkit-border-radius: 13px; + border-radius: 13px; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; +} +.openerp .oe_searchview input, .openerp .oe_searchview textarea { + padding: 3px; + height: 14px; + font-size: 12px; + line-height: 18px; +} +.openerp .oe_searchview.oe_focused { + border-color: #a6a6fe; + -moz-box-shadow: 0 1px 2px #a6a6fe inset; + -webkit-box-shadow: 0 1px 2px #a6a6fe inset; + box-shadow: 0 1px 2px #a6a6fe inset; +} +.openerp .oe_searchview .oe_searchview_clear { + cursor: pointer; + position: absolute; + top: 0; + right: 18px; + width: 15px; + height: 100%; + background: url(../img/search_reset.gif) center center no-repeat; +} +.openerp .oe_searchview .oe_searchview_unfold_drawer { + position: absolute; + top: 0; + right: 0; + height: 100%; + padding: 0 7px 0 4px; + color: #cccccc; + cursor: pointer; +} +.openerp .oe_searchview .oe_searchview_unfold_drawer:hover { + color: #999999; +} +.openerp .oe_searchview .oe_searchview_unfold_drawer:before { + position: absolute; + top: 10px; + right: 7px; + width: 0; + height: 0; + display: inline-block; + content: ""; + vertical-align: top; + border-top: 5px solid #4c4c4c; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + filter: alpha(opacity=50); + opacity: 0.5; +} +.openerp .oe_searchview .oe_searchview_search { + font-size: 1px; + letter-spacing: -1px; + color: transparent; + font-weight: normal; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; + position: absolute; + left: 3px; + top: 1px; + padding: 0; + border: none; + background: transparent; +} +.openerp .oe_searchview .oe_searchview_search:before { + font: 21px "mnmliconsRegular"; + content: "r"; + color: #a3a3a3; +} +.openerp .oe_searchview .oe_searchview_facets { + min-height: 22px; + margin-left: 15px; +} +.openerp .oe_searchview .oe_searchview_facets * { + vertical-align: top; + display: inline-block; + line-height: 17px; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet { + height: 18px; + margin: 1px 0; + font-size: 11px; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus { + outline: none; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input { + padding: 0 0 0 6px; + font-size: 12px; + height: 16px; + margin-top: 3px; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input:focus { + outline: none; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet { + position: relative; + cursor: pointer; + padding: 0; + -webkit-font-smoothing: auto; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus { + border-color: #a6a6fe; + -moz-box-shadow: 0 0 3px 1px #a6a6fe; + -webkit-box-shadow: 0 0 3px 1px #a6a6fe; + box-shadow: 0 0 3px 1px #a6a6fe; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_values { + background: #f0f0fa; + -moz-border-radius: 0 3px 3px 0; + -webkit-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value { + height: 18px; + padding: 0 4px; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category { + color: white; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category.oe_i { + font-size: 16px; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value { + border-left: 1px solid #afafb6; + text-shadow: 0 1px 1px white; + color: #4c4c4c; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value:last-child { + padding-right: 16px; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_remove { + position: absolute; + top: 3px; + right: 3px; + color: #8786b7; + line-height: 8px; + width: 12px; + height: 12px; + padding-top: 1px; + text-align: center; + font-weight: bold; + cursor: pointer; + text-shadow: 0 1px 1px white; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_remove:hover { + 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_open_drawer .oe_searchview_drawer { + display: block; +} +.openerp .oe_searchview .oe_searchview_drawer { + position: absolute; + z-index: 100; + 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 12px; + color: #7c7bad; + font-size: 13px; +} +.openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { + margin: 0; + 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%; +} +.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 0; +} +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom { + padding: 0 8px 8px 8px; +} +.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_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_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_view_nocontent { + padding: 15px; + margin-top: 0; + color: #777777; + font-size: 125%; + max-width: 700px; +} +.openerp .oe_view_nocontent .oe_view_nocontent_create { + background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 7px 0; + margin-top: 0; + padding-top: 35px; + min-height: 28px; + color: #4c4c4c; +} +.openerp .oe_view_nocontent > p { + padding-left: 95px; +} +.openerp .oe_view_nocontent .oe_empty_custom_dashboard { + background: transparent url(/web/static/src/img/graph_background.png) no-repeat 0 0; + margin-top: -15px; + padding: 100px 0 0 137px; + min-height: 327px; + margin-left: -15px; +} +.openerp .oe_formview { + background: white; +} +.openerp .oe_form_dropdown_section { + position: relative; + display: inline-block; +} +.openerp .oe_form_invalid input, .openerp .oe_form_invalid select, .openerp .oe_form_invalid textarea { + background-color: #ff6666 !important; + border: 1px solid #dd0000 !important; +} +.openerp .oe_view_manager_current .oe_form_editable .oe_highlight { + color: #404040; + background: none; +} +.openerp .oe_view_manager_current .oe_form_editable button.oe_highlight { + background-color: #efefef; + background-image: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8)); + background-image: -webkit-linear-gradient(top, #efefef, #d8d8d8); + background-image: -moz-linear-gradient(top, #efefef, #d8d8d8); + background-image: -ms-linear-gradient(top, #efefef, #d8d8d8); + background-image: -o-linear-gradient(top, #efefef, #d8d8d8); + background-image: linear-gradient(to bottom, #efefef, #d8d8d8); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; +} +.openerp .oe_view_manager_current .oe_form_editable button.oe_highlight:active { + background-color: #e3e3e3; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)); + background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: -moz-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: -ms-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: -o-linear-gradient(top, #e3e3e3, #f6f6f6); + background-image: linear-gradient(to bottom, #e3e3e3, #f6f6f6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp .oe_view_manager_current .oe_form_editable button.oe_highlight:hover { + background-color: #f6f6f6; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); + background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -moz-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -ms-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; +} +.openerp .oe_form_invisible { + display: none !important; +} +.openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty { + display: none !important; +} +.openerp .oe_form_readonly .oe_form .oe_form_field_date { + width: auto; +} +.openerp .oe_form_nosheet { + margin: 16px; +} +.openerp .oe_form_nosheet > header { + margin: -16px -16px 0 -16px; + padding: 0; +} +.openerp .oe_form_sheetbg { + padding: 8px 0; +} +.openerp .oe_form_sheet_width { + min-width: 650px; + max-width: 860px; + margin: 0 auto; +} +.openerp .oe_form_sheet { + background: white; + min-height: 330px; + padding: 16px; +} +.openerp .oe_application .oe_form_sheetbg { + background: url(/web/static/src/img/form_sheetbg.png); + border-bottom: 1px solid #dddddd; +} +.openerp .oe_application .oe_form_sheet { + border: 1px solid #afafb6; + -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); +} +.openerp .oe_application .oe_form_sheet .ui-tabs { + margin: 0 -16px; +} +.openerp .oe_application .oe_form_sheet .oe_notebook_page { + padding: 0 16px; +} +.openerp .oe_form header { + position: relative; + border-bottom: 1px solid #cacaca; + padding-left: 2px; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); +} +.openerp .oe_form header > span { + margin-left: 4px; +} +.openerp .oe_form header ul { + display: inline-block; + float: right; +} +.openerp .oe_form header .oe_form_button { + margin: 3px 2px 1px; +} +.openerp .oe_form div.oe_chatter { + min-width: 650px; + max-width: 860px; + margin: 0 auto; + padding: 16px 0 48px; +} +.openerp .oe_form .oe_grey { + color: #aaaaaa; + max-width: 650px; + margin: 0 0 10px 0; +} +.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { + color: #aaaaaa; + max-width: 650px; +} +.openerp .oe_form div.oe_form_configuration label { + min-width: 150px; +} +.openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label { + padding: 1px 0; +} +.openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div { + padding: 1px 0; +} +.openerp .oe_form .oe_subtotal_footer { + width: 1% !important; +} +.openerp .oe_form .oe_subtotal_footer td.oe_form_group_cell { + text-align: right; + padding: 0 !important; +} +.openerp .oe_form .oe_subtotal_footer td.oe_form_group_cell_label { + border-right: none; +} +.openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator { + width: 108px; + border-top: 1px solid #cacaca; + margin-top: 4px; + padding-top: 4px; + font-weight: bold; + font-size: 18px; +} +.openerp .oe_form .oe_subtotal_footer label:after { + content: ":"; +} +.openerp .oe_form .oe_subtotal_footer label.oe_subtotal_footer_separator { + font-weight: bold !important; + padding: 2px 11px 2px 0px !important; +} +.openerp .oe_form .oe_subtotal_footer label.oe_form_label_help { + font-weight: normal; +} +.openerp .oe_form .oe_form_button { + margin: 2px; +} +.openerp .oe_form td.oe_form_group_cell_label { + border-right: 1px solid #dddddd; + padding: 2px 0px; +} +.openerp .oe_form td.oe_form_group_cell_label label { + line-height: 18px; + display: block; + min-width: 140px; +} +.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { + padding: 2px 0 2px 8px; +} +.openerp .oe_form .oe_form_group { + width: 100%; + margin: 9px 0 9px 0; +} +.openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_right { + padding-left: 20px; +} +.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { + font-weight: bold; + white-space: nowrap; + padding-right: 8px; +} +.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { + font-size: 80%; + color: darkgreen; + vertical-align: top; + position: relative; + top: -4px; + padding: 0 2px; +} +.openerp .oe_horizontal_border { + border-bottom: 1px solid black; +} +.openerp .oe_horizontal_separator { + font-weight: bold; + font-size: 20px; + margin: 15px 0px 10px 0px; + color: #7c7bad; +} +.openerp .oe_horizontal_separator:empty { + height: 5px; +} +.openerp .oe_vertical_separator { + border-left: 1px solid #666666; + padding: 0 4px 0 4px; +} +.openerp .oe_form_field_progressbar { + display: inline-block; + min-width: 70px; +} +.openerp .oe_form_field_progressbar.ui-progressbar { + height: 22px; + font-size: 10px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; + border: 1px solid #999999; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background: white; + min-width: 50px; +} +.openerp .oe_form_field_progressbar.ui-progressbar span { + position: absolute; + margin-left: 10px; + font-weight: bold; +} +.openerp .oe_form_field_progressbar.ui-progressbar .ui-widget-header { + background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; +} +.openerp .oe_form .oe_form_field_text { + width: 100%; +} +.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: 100%; +} +.openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea { + width: 500px; +} +.openerp .oe_form h1, .openerp .oe_form h2, .openerp .oe_form h3, .openerp .oe_form h4, .openerp .oe_form h5, .openerp .oe_form h6 { + margin: 0 0 4px 0; +} +.openerp .oe_form h1 input, .openerp .oe_form h2 input, .openerp .oe_form h3 input, .openerp .oe_form h4 input, .openerp .oe_form h5 input, .openerp .oe_form h6 input { + height: inherit !important; + font-size: inherit; +} +.openerp .oe_form .oe_form_field { + width: 100%; + display: inline-block; + padding: 2px 2px 2px 0px; +} +.openerp .oe_form .oe_form_field input { + margin: 0px; +} +.openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select { + height: 22px; + padding-top: 2px; +} +.openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select, .openerp .oe_form textarea { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; + background: white; + min-width: 60px; + color: #1f1f1f; +} +.openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] { + background: #e5e5e5 !important; + color: #666666; +} +.openerp .oe_form textarea[disabled] { + border: none; + border-left: 8px solid #eeeeee; + padding-left: 8px; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + -moz-border-radius: 0px; + -webkit-border-radius: 0px; + border-radius: 0px; +} +.openerp .oe_form .oe_form_field_url button img { + vertical-align: top; +} +.openerp .oe_form .oe_form_field_date, +.openerp .oe_form .oe_form_field_datetime { + white-space: nowrap; +} +.openerp .oe_form .oe_form_field_boolean { + padding-top: 4px; + width: auto; +} +.openerp .oe_form .oe_datepicker_container { + display: none; +} +.openerp .oe_form .oe_datepicker_root { + display: inline-block; +} +.openerp .oe_form .oe_form_required input, .openerp .oe_form .oe_form_required select, .openerp .oe_form .oe_form_required textarea { + background-color: #d2d2ff !important; +} +.openerp .oe_form .oe_form_invalid input, .openerp .oe_form .oe_form_invalid select, .openerp .oe_form .oe_form_invalid textarea { + background-color: #ff6666 !important; + border: 1px solid #dd0000 !important; +} +.openerp .oe_form .oe_input_icon { + cursor: pointer; + margin: 3px 0 0 -21px; + vertical-align: top; +} +.openerp .oe_form .oe_input_icon_disabled { + position: absolute; + cursor: default; + opacity: 0.5; + filter: alpha(opacity=50); + right: 5px; + top: 3px; +} +.openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button { + display: none; +} +.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button { + float: right; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; + 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; +} +.openerp .oe_form_editable .oe_form .oe_form_field_integer { + width: 6em !important; +} +.openerp .oe_form_editable .oe_form .oe_form_field_float { + width: 7em !important; +} +.openerp .oe_form_editable .oe_form .oe_form_field_date { + width: 7.5em !important; +} +.openerp .oe_form_editable .oe_form .oe_form_field_datetime { + width: 11.5em !important; +} +.openerp .oe_hidden_input_file { + position: relative; +} +.openerp .oe_hidden_input_file input.oe_form_binary_file { + z-index: 0; + line-height: 0; + font-size: 12px; + position: absolute; + top: 1px; + left: 0; + right: 0; + opacity: 0; + filter: alpha(opacity=0); + -ms-filter: "alpha(opacity=0)"; + margin: 0; + padding: 0; +} +.openerp .oe_form .oe_form_field_image { + padding: 0; + position: relative; + display: inline-block; + width: auto; + vertical-align: top; +} +.openerp .oe_form .oe_form_field_image .oe_form_field_image_controls { + position: absolute; + top: 1px; + padding: 4px; + width: 100%; + display: none; + text-align: center; + color: #eeeeee; + background: rgba(37, 37, 37, 0.9); + -moz-border-radius: 3px 3px 0 0; + -webkit-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; +} +.openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls { + display: block; +} +.openerp .oe_form_field_many2one td:first-child { + position: relative; +} +.openerp .oe_form_field_many2one span.oe_m2o_drop_down_button { + position: absolute; + top: 2px; + right: 0px; +} +.openerp .oe_form_field_many2one .oe_m2o_cm_button { + line-height: 14px; + float: right; + padding-left: 2px; +} +.openerp.ui-autocomplete li.oe_m2o_dropdown_option a { + font-style: italic; + padding-left: 2em; +} +.openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option { + margin-top: 10px; +} +.openerp ul.oe_form_status, .openerp ul.oe_form_status_clickable { + display: inline-block; + margin: 0; + padding: 0 18px 0 0; +} +.openerp ul.oe_form_status li, .openerp ul.oe_form_status_clickable li { + display: inline-block; + list-style-type: none; + margin: 0 -20px 0 0; + padding: 0; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); +} +.openerp ul.oe_form_status li:first-child .label, .openerp ul.oe_form_status_clickable li:first-child .label { + border-left: 1px solid #cacaca; + padding-left: 14px; +} +.openerp ul.oe_form_status li:last-child, .openerp ul.oe_form_status_clickable li:last-child { + border-right: 1px solid #cacaca; +} +.openerp ul.oe_form_status li:last-child .label, .openerp ul.oe_form_status_clickable li:last-child .label { + padding-right: 14px; +} +.openerp ul.oe_form_status li:last-child .arrow, .openerp ul.oe_form_status_clickable li:last-child .arrow { + display: none; +} +.openerp ul.oe_form_status li .label, .openerp ul.oe_form_status_clickable li .label { + color: #4c4c4c; + text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede; + padding: 7px; + display: inline-block; + padding-left: 24px; + margin: 0; + position: relative; +} +.openerp ul.oe_form_status li .arrow, .openerp ul.oe_form_status_clickable li .arrow { + width: 17px; + display: inline-block; + vertical-align: top; + overflow: hidden; + margin-left: -5px; +} +.openerp ul.oe_form_status li .arrow span, .openerp ul.oe_form_status_clickable li .arrow span { + position: relative; + width: 24px; + height: 24px; + display: inline-block; + margin-left: -12px; + margin-top: 3px; + box-shadow: -1px 1px 2px rgba(255, 255, 255, 0.2), inset -1px 1px 1px rgba(0, 0, 0, 0.2); + background-color: #dedede; + background: -moz-linear-gradient(135deg, #dedede, #fcfcfc); + background: -o-linear-gradient(135deg, #fcfcfc, #dedede); + background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede)); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); +} +.openerp ul.oe_form_status li.oe_active, .openerp ul.oe_form_status_clickable li.oe_active { + background-color: #729fcf; + background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); + background-image: -webkit-linear-gradient(top, #729fcf, #3465a4); + background-image: -moz-linear-gradient(top, #729fcf, #3465a4); + background-image: -ms-linear-gradient(top, #729fcf, #3465a4); + background-image: -o-linear-gradient(top, #729fcf, #3465a4); + background-image: linear-gradient(to bottom, #729fcf, #3465a4); +} +.openerp ul.oe_form_status li.oe_active .arrow span, .openerp ul.oe_form_status_clickable li.oe_active .arrow span { + background-color: #3465a4; + background: -moz-linear-gradient(135deg, #3465a4, #729fcf); + background: -o-linear-gradient(135deg, #729fcf, #3465a4); + background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4)); +} +.openerp ul.oe_form_status li.oe_active .label, .openerp ul.oe_form_status_clickable li.oe_active .label { + color: white; + text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4; +} +.openerp ul.oe_form_status_clickable li { + cursor: pointer; +} +.openerp ul.oe_form_status_clickable li:hover { + background-color: #e8e8e8; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); + background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); + background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); +} +.openerp ul.oe_form_status_clickable li:hover .label { + text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede; +} +.openerp ul.oe_form_status_clickable li:hover .arrow span { + background-color: #e8e8e8; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); + background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); + background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); +} +.openerp ul.oe_form_status_clickable li .label { + color: #7c7bad; +} +.openerp ul.oe_form_status_clickable li.oe_active:hover { + background-color: #4c85c2; + background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d)); + background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d); + background-image: -moz-linear-gradient(top, #4c85c2, #284d7d); + background-image: -ms-linear-gradient(top, #4c85c2, #284d7d); + background-image: -o-linear-gradient(top, #4c85c2, #284d7d); + background-image: linear-gradient(to bottom, #4c85c2, #284d7d); +} +.openerp ul.oe_form_status_clickable li.oe_active:hover .label { + text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4; +} +.openerp ul.oe_form_status_clickable li.oe_active:hover .arrow span { + background-color: #284d7d; + background: -moz-linear-gradient(135deg, #284d7d, #4c85c2); + background: -o-linear-gradient(135deg, #4c85c2, #284d7d); + background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d)); +} +.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { + display: none; +} +.openerp .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page, .openerp .oe_form_field_many2many > .oe_view_manager .oe_list_pager_single_page { + display: none !important; +} +.openerp .oe_form_field_one2many .oe_form_field_one2many_list_row_add, .openerp .oe_form_field_many2many .oe_form_field_one2many_list_row_add { + font-weight: bold; +} +.openerp .oe_form_field_one2many .oe_list_content > thead, .openerp .oe_form_field_many2many .oe_list_content > thead { + border-bottom: 1px; +} +.openerp .oe_form_field_one2many .oe_list_content > tbody tr:nth-child(odd), .openerp .oe_form_field_many2many .oe_list_content > tbody tr:nth-child(odd) { + background: transparent; +} +.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save, .openerp .oe_form_field_many2many .oe_list .oe_list_edit_row_save { + background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat; +} +.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save:before, .openerp .oe_form_field_many2many .oe_list .oe_list_edit_row_save:before { + visibility: hidden; +} +.openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top, .openerp .oe_form_field_many2many > .oe_view_manager .oe_header_row_top { + display: none; +} +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td { + padding: 0px 8px; + line-height: 16px; +} +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_i, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td .oe_i { + font-size: 13px; +} +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group { + height: auto; + line-height: 16px; +} +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group li, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group li { + height: auto; + line-height: 16px; +} +.openerp .oe_form_field_one2many .oe_list_buttons.oe_editing .oe_list_save, .openerp .oe_form_field_many2many .oe_list_buttons.oe_editing .oe_list_save { + visibility: hidden; +} +.openerp .oe_form_editable .oe_list_editable .oe_list_content td.oe_required { + background-color: #d2d2ff; +} +.openerp .oe_form_editable .oe_list_editable .oe_list_content td.oe_readonly { + background-color: #eeeeee; +} +.openerp .oe_list_editable .oe_list_content td.oe_list_field_cell { + padding: 4px 6px 3px 6px; +} +.openerp .oe_list.oe_list_editable td.oe_list_record_delete { + position: absolute; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_m2o_drop_down_button { + top: 5px; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_m2o_cm_button { + display: none; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { + height: 27px; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; + border: 1px solid #aaaaff; + margin: 0; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input { + text-align: right; + width: 100%; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime > span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date > span { + width: 100%; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master { + width: 100% !important; +} +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field .oe_form_field_float, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field .oe_form_view_integer, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date { + min-width: 0 !important; + max-width: none !important; +} +.openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { + display: none; +} +.openerp .oe_list_buttons .oe_alternative { + visibility: hidden; +} +.openerp .oe_list_buttons .oe_list_save, .openerp .oe_list_buttons .oe_list_discard { + display: none; +} +.openerp .oe_list_buttons.oe_editing .oe_list_add { + display: none; +} +.openerp .oe_list_buttons.oe_editing .oe_list_save { + display: inline-block; +} +.openerp .oe_list_buttons.oe_editing .oe_list_discard { + display: inline; +} +.openerp .oe_list_buttons.oe_editing .oe_alternative { + visibility: visible; +} +.openerp .oe_list { + position: relative; +} +.openerp .oe_list .oe_form .oe_form_nosheet { + margin: 0; + padding: 0; + border: none; +} +.openerp .oe_list .oe_form .oe_form_field { + width: auto; + position: absolute; + margin: 0 !important; + padding: 0; +} +.openerp .oe_list .oe_list_content .oe_group_header { + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); +} +.openerp .oe_list_content { + width: 100%; +} +.openerp .oe_list_content td:first-child:after, .openerp .oe_list_content th:first-child:after { + border-width: 0; +} +.openerp .oe_list_content td.oe_number { + text-align: right !important; + max-width: 100px; +} +.openerp .oe_list_content > thead { + border-bottom: 2px solid #cacaca; + background: #eeeeee; + vertical-align: top; +} +.openerp .oe_list_content > thead th { + position: relative; +} +.openerp .oe_list_content td, .openerp .oe_list_content th { + padding: 3px 6px; + line-height: 18px; +} +.openerp .oe_list_content th:after { + position: absolute; + right: 6px; + content: ""; + margin-top: 7px; + border-width: 0 4px 4px; + border-style: solid; + border-color: black transparent; + visibility: hidden; +} +.openerp .oe_list_content th.sortup:after { + visibility: visible; + filter: alpha(opacity=60); + opacity: 0.6; +} +.openerp .oe_list_content th.sortdown:after { + border-bottom: none; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid black; + visibility: visible; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + filter: alpha(opacity=60); + opacity: 0.6; +} +.openerp .oe_list_content > tbody { + cursor: pointer; +} +.openerp .oe_list_content > tbody > tr { + height: 27px; + border-top: 1px solid #dddddd; +} +.openerp .oe_list_content > tbody > tr > td.oe_list_field_cell { + padding: 3px 6px; + white-space: pre-line; +} +.openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button { + border: none; + background: transparent; + padding: 0; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child { + width: 17px; +} +.openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child:after, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child:after { + border-width: 0; +} +.openerp .oe_list_content > tbody > tr:nth-child(odd) { + background-color: #f0f0fa; + background-color: #f0f0fa; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); +} +.openerp .oe_list_content > tfoot { + border-top: 2px solid #cacaca; + border-bottom: 1px solid #cacaca; + background: #eeeeee; + font-weight: bold; +} +.openerp .oe_list_content .numeric { + text-align: right; + width: 82px; +} +.openerp .oe_list_content .numeric input { + text-align: right; +} +.openerp .oe_list_content th.oe_list_header_handle { + font-size: 1px; + overflow: hidden; + text-indent: -9001px; +} +.openerp .oe_list_content td.oe_list_field_handle { + width: 1em; + padding: 0 !important; + cursor: ns-resize; +} +.openerp .oe_list_content td.oe_list_field_handle .oe_list_handle { + font-size: 1px; + letter-spacing: -1px; + color: transparent; + font-weight: normal; + margin-right: 7px; +} +.openerp .oe_list_content td.oe_list_field_handle .oe_list_handle:before { + font: 18px "entypoRegular"; + content: "}"; + color: #e0e0e0; +} +.openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle { + display: none !important; + padding: 0 !important; +} +.openerp .oe_list_cannot_delete .oe_list_record_delete { + display: none !important; +} +.openerp .tree_header { + background-color: #f0f0f0; + 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%; + 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; +} +.openerp .oe_layout_debugging .oe_form_group { + outline: 2px dashed green; +} +.openerp .oe_layout_debugging .oe_form_group_cell { + outline: 1px solid blue; +} +.openerp .oe_layout_debugging .oe_form_group:hover, .openerp .oe_layout_debugging .oe_form_group_cell:hover { + outline-color: red; +} +.openerp .oe_layout_debugging .oe_form_group_row_incomplete > td:last-child:after { + content: "[Incomplete Row]"; + background: red; + padding: 2px; + font-weight: bold; + color: white; + float: right; +} +.openerp .oe_layout_debugging .oe_form_group_row_incomplete.oe_form_group_row_newline > td:last-child:after { + content: "[newline]"; +} +.openerp .oe_debug_view { + float: left; +} +.openerp .oe_debug_view_log { + font-size: 95%; +} +.openerp .oe_debug_view_log label { + display: block; + width: 49%; + text-align: right; + float: left; + font-weight: bold; + color: #000099; +} +.openerp .oe_debug_view_log span { + display: block; + width: 49%; + float: right; + color: #333333; +} + +.kitten-mode-activated { + background-image: url(http://placekitten.com/g/1365/769); + background-size: cover; + background-attachment: fixed; +} +.kitten-mode-activated > * { + opacity: 0.7; +} + +div.ui-widget-overlay { + background: black; + filter: alpha(opacity=30); + opacity: 0.3; +} + +.ui-widget { + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; + color: #4c4c4c; + font-size: 13px; +} + +.ui-menu { + padding: 2px 0; + -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); + margin-top: 4px; + border: 1px solid #afafb6; +} +.ui-menu .ui-menu-item { + width: 100%; + padding: 0; +} +.ui-menu .ui-menu-item a { + padding: 1px 16px; +} +.ui-menu .ui-menu-item a.ui-corner-all { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; +} +.ui-menu .ui-menu-item a.ui-state-active { + background: #f0f0fa; +} +.ui-menu .ui-menu-item a.ui-state-hover, .ui-menu .ui-menu-item a.ui-state-active { + background: #7c7bad; +} + +.ui-corner-all { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5a48c280307..dd0af89abd2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -477,10 +477,10 @@ $sheet-max-width: 860px // }}} .oe_form header - .oe_tags - margin:5px 0 0 5px - width:400px - padding-bottom:0 + .oe_tags + margin: 5px 0 0 5px + width: 400px + padding-bottom: 0 // Tooltips {{{ &.oe_tooltip font-size: 12px -- cgit v1.2.3 From cf6d39b95dad952e8e8921b87024c0853ce6d12f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Thu, 20 Sep 2012 17:49:26 +0200 Subject: [IMP] fixed header overflow, made form lighter bzr revid: fva@openerp.com-20120920154926-47viarlirvbnelky --- addons/web/static/src/css/base.css | 12 ++++++------ addons/web/static/src/css/base.sass | 10 ++++++---- 2 files changed, 12 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 e80b8c49863..5c43be5b75f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1969,7 +1969,7 @@ padding: 0; } .openerp .oe_form_sheetbg { - padding: 8px 0; + padding: 16px 0; } .openerp .oe_form_sheet_width { min-width: 650px; @@ -1986,10 +1986,10 @@ border-bottom: 1px solid #dddddd; } .openerp .oe_application .oe_form_sheet { - border: 1px solid #afafb6; - -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + border: 1px solid #c8c8d3; + -moz-box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15); + -webkit-box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15); + box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15); } .openerp .oe_application .oe_form_sheet .ui-tabs { margin: 0 -16px; @@ -2343,7 +2343,7 @@ .openerp ul.oe_form_status li, .openerp ul.oe_form_status_clickable li { display: inline-block; list-style-type: none; - margin: 0 -20px 0 0; + margin: 0 -18px 0 0; padding: 0; background-color: #fcfcfc; 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 dd0af89abd2..ffcb8c83cc7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -113,6 +113,7 @@ $sheet-max-width: 860px @keyframes #{$name} @content + // Transforms the (readable) text of an inline element into an mmlicons icon, // allows for actual readable text in-code (and in readers?) with iconic looks @mixin text-to-icon($icon-name, $color: #404040) @@ -1560,7 +1561,7 @@ $sheet-max-width: 860px margin: -16px -16px 0 -16px padding: 0 .oe_form_sheetbg - padding: 8px 0 + padding: 16px 0 .oe_form_sheet_width min-width: 650px max-width: $sheet-max-width @@ -1575,8 +1576,8 @@ $sheet-max-width: 860px background: url(/web/static/src/img/form_sheetbg.png) border-bottom: 1px solid #ddd .oe_form_sheet - border: 1px solid $tag-border - @include box-shadow(0 0 10px rgba(0,0,0,0.3)) + border: 1px solid #c8c8d3 //$tag-border + @include box-shadow(0 4px 20px rgba(0,0,0,0.15)) .ui-tabs margin: 0 -16px .oe_notebook_page @@ -1868,7 +1869,8 @@ $sheet-max-width: 860px li display: inline-block list-style-type: none - margin: 0 -20px 0 0 + // It is probably a bad idea to modify this margin + margin: 0 -18px 0 0 padding: 0 @include vertical-gradient(#fcfcfc, #dedede) &:first-child .label -- cgit v1.2.3 From 549c99e6eaf7829f8cd2308978f5dfbc71b1fd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Thu, 20 Sep 2012 18:22:05 +0200 Subject: [FIX] basic css of embeded html bzr revid: fva@openerp.com-20120920162205-9w05atal8hu10smu --- addons/web/static/src/css/base.css | 8 ++++++++ addons/web/static/src/css/base.sass | 8 ++++++++ 2 files changed, 16 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 5c43be5b75f..1ec0d534607 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2259,6 +2259,14 @@ position: relative; overflow: hidden; } +.openerp .oe_form .oe_form_field_html { + position: relative; + width: 600px; + margin-left: 130px; + margin-top: 32px; + margin-bottom: 32px; + text-align: justify; +} .openerp .oe_form_editable .oe_form .oe_form_field_integer { width: 6em !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ffcb8c83cc7..fc65f260db9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1789,6 +1789,14 @@ $sheet-max-width: 860px > div position: relative overflow: hidden + .oe_form_field_html + position: relative + width: 600px + margin-left: 130px + margin-top: 32px + margin-bottom: 32px + text-align: justify + .oe_form_editable .oe_form .oe_form_field_integer -- cgit v1.2.3 From 6e7f1423aeff0a30e61c2387eb0f95ab5c09a4c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Fri, 21 Sep 2012 13:45:28 +0200 Subject: [FIX] moved some css to the right place bzr revid: fva@openerp.com-20120921114528-1xsa0kapr5e6qq9o --- addons/web/static/src/css/base.css | 10 +++++----- addons/web/static/src/css/base.sass | 10 ++++------ 2 files changed, 9 insertions(+), 11 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 1ec0d534607..58ccf16aec0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -546,11 +546,6 @@ font-style: italic; text-decoration: none; } -.openerp .oe_form header .oe_tags { - margin: 5px 0 0 5px; - width: 400px; - padding-bottom: 0; -} .openerp.oe_tooltip { font-size: 12px; } @@ -2019,6 +2014,11 @@ .openerp .oe_form header .oe_form_button { margin: 3px 2px 1px; } +.openerp .oe_form header .oe_tags { + margin: 5px 0 0 5px; + width: 400px; + padding-bottom: 0; +} .openerp .oe_form div.oe_chatter { min-width: 650px; max-width: 860px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fc65f260db9..7b0b5e45662 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -476,12 +476,6 @@ $sheet-max-width: 860px text-decoration: none margin-bottom: 1px // }}} - .oe_form - header - .oe_tags - margin: 5px 0 0 5px - width: 400px - padding-bottom: 0 // Tooltips {{{ &.oe_tooltip font-size: 12px @@ -1597,6 +1591,10 @@ $sheet-max-width: 860px float: right .oe_form_button margin: 3px 2px 1px + .oe_tags + margin: 5px 0 0 5px + width: 400px + padding-bottom: 0 div.oe_chatter min-width: 650px max-width: $sheet-max-width -- cgit v1.2.3 From 2d39da345b591f4c6a7f4c6665260489cf5057cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Fri, 21 Sep 2012 16:09:32 +0200 Subject: [FIX] fixed overflow of tooltips. regrouped all menu css in one category (WIP) bzr revid: fva@openerp.com-20120921140932-epqji1wznvkd6mh1 --- addons/web/static/src/css/base.css | 201 ++++++++++++++++++------------------ addons/web/static/src/css/base.sass | 163 ++++++++++++++--------------- 2 files changed, 181 insertions(+), 183 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 58ccf16aec0..496f84e8c17 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -962,7 +962,8 @@ } .openerp .oe_topbar { width: 100%; - height: 31px; + height: 32px; + background-color: #414141; background-color: #646060; background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); background-image: -webkit-linear-gradient(top, #646060, #262626); @@ -1035,105 +1036,6 @@ -webkit-box-shadow: none; box-shadow: none; } -.openerp .oe_leftbar { - display: none; - width: 220px; - background: #f0eeee; - border-right: 1px solid #afafb6; - text-shadow: 0 1px 1px white; - padding-bottom: 16px; -} -.openerp a.oe_logo { - width: 220px; - display: block; - text-align: center; - height: 70px; - line-height: 70px; -} -.openerp a.oe_logo img { - height: 40px; - width: 157px; - margin: 14px 0; -} -.openerp .oe_footer { - position: fixed; - bottom: 0; - padding: 4px 0; - background: #f0eeee; - width: 220px; - text-align: center; -} -.openerp .oe_footer a { - font-weight: 800; - font-family: serif; - font-size: 16px; - color: black; -} -.openerp .oe_footer a span { - color: #c81010; - font-style: italic; -} -.openerp .oe_user_menu { - float: right; - padding: 0; - margin: 0; -} -.openerp .oe_user_menu li { - list-style-type: none; - float: left; -} -.openerp .oe_user_menu .oe_dropdown_menu { - right: -1px; -} -.openerp .oe_about { - background-color: white; - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); - -moz-border-radius: 0 0 2px 2px; - -webkit-border-radius: 0 0 2px 2px; - border-radius: 0 0 2px 2px; -} -.openerp .oe_about a { - color: #7c7bad; -} -.openerp .oe_about a:hover { - text-decoration: underline; -} -.openerp .oe_about a:focus { - outline: none; -} -.openerp .oe_about .oe_logo { - margin-left: -6px; -} -.openerp .oe_about .oe_bottom { - position: absolute; - top: 50%; - left: 0; - right: 0; - bottom: 0; - text-shadow: 0 1px 1px #999999; - background-color: #b41616; - background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606)); - background-image: -webkit-linear-gradient(top, #b41616, #600606); - background-image: -moz-linear-gradient(top, #b41616, #600606); - background-image: -ms-linear-gradient(top, #b41616, #600606); - background-image: -o-linear-gradient(top, #b41616, #600606); - background-image: linear-gradient(to bottom, #b41616, #600606); - color: #eeeeee; - padding: 0 16px; - -moz-border-radius: 0 0 2px 2px; - -webkit-border-radius: 0 0 2px 2px; - border-radius: 0 0 2px 2px; -} -.openerp .oe_about .oe_bottom a { - color: #eeeeee; -} -.openerp .oe_systray > div { - float: left; - padding: 0 4px 0 4px; -} -.openerp .oe_systray { - float: right; -} .openerp .oe_menu { float: left; padding: 0; @@ -1275,6 +1177,105 @@ border-right: 4px solid transparent; border-top: 4px solid #4c4c4c; } +.openerp .oe_user_menu { + float: right; + padding: 0; + margin: 0; +} +.openerp .oe_user_menu li { + list-style-type: none; + float: left; +} +.openerp .oe_user_menu .oe_dropdown_menu { + right: -1px; +} +.openerp .oe_systray > div { + float: left; + padding: 0 4px 0 4px; +} +.openerp .oe_systray { + float: right; +} +.openerp .oe_leftbar { + display: none; + width: 220px; + background: #f0eeee; + border-right: 1px solid #afafb6; + text-shadow: 0 1px 1px white; + padding-bottom: 16px; +} +.openerp a.oe_logo { + width: 220px; + display: block; + text-align: center; + height: 70px; + line-height: 70px; +} +.openerp a.oe_logo img { + height: 40px; + width: 157px; + margin: 14px 0; +} +.openerp .oe_footer { + position: fixed; + bottom: 0; + padding: 4px 0; + background: #f0eeee; + width: 220px; + text-align: center; +} +.openerp .oe_footer a { + font-weight: 800; + font-family: serif; + font-size: 16px; + color: black; +} +.openerp .oe_footer a span { + color: #c81010; + font-style: italic; +} +.openerp .oe_about { + background-color: white; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp .oe_about a { + color: #7c7bad; +} +.openerp .oe_about a:hover { + text-decoration: underline; +} +.openerp .oe_about a:focus { + outline: none; +} +.openerp .oe_about .oe_logo { + margin-left: -6px; +} +.openerp .oe_about .oe_bottom { + position: absolute; + top: 50%; + left: 0; + right: 0; + bottom: 0; + text-shadow: 0 1px 1px #999999; + background-color: #b41616; + background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606)); + background-image: -webkit-linear-gradient(top, #b41616, #600606); + background-image: -moz-linear-gradient(top, #b41616, #600606); + background-image: -ms-linear-gradient(top, #b41616, #600606); + background-image: -o-linear-gradient(top, #b41616, #600606); + background-image: linear-gradient(to bottom, #b41616, #600606); + color: #eeeeee; + padding: 0 16px; + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp .oe_about .oe_bottom a { + color: #eeeeee; +} .openerp .oe_application { width: 100%; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 7b0b5e45662..c1d721115da 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -791,10 +791,11 @@ $sheet-max-width: 860px .oe_topbar, .oe_leftbar display: none // }}} - // WebClient.topbar {{{ + // Top Menu {{{ .oe_topbar width: 100% - height: 31px + height: 32px + background-color: #414141 @include vertical-gradient(#646060, #262626) .oe_topbar_item display: block @@ -837,87 +838,6 @@ $sheet-max-width: 860px @include vertical-gradient(#292929, #191919) @include box-shadow(none) - // }}} - // Webclient.leftbar {{{ - .oe_leftbar - display: none - width: 220px - background: #f0eeee - border-right: 1px solid $tag-border - text-shadow: 0 1px 1px white - padding-bottom: 16px - a.oe_logo - width: 220px - display: block - text-align: center - height: 70px - line-height: 70px - img - height: 40px - width: 157px - margin: 14px 0 - .oe_footer - position: fixed - bottom: 0 - padding: 4px 0 - background: #f0eeee - width: 220px - text-align: center - a - font-weight: 800 - font-family: serif - font-size: 16px - color: black - span - color: #c81010 - font-style: italic - // }}} - // UserMenu {{{ - .oe_user_menu - float: right - padding: 0 - margin: 0 - li - list-style-type: none - float: left - .oe_dropdown_menu - right: -1px - // }}} - // About openerp {{{ - .oe_about - background-color: white - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=) - @include radius(0 0 2px 2px) - a - color: $link-color - &:hover - text-decoration: underline - &:focus - outline: none - .oe_logo - margin-left: -6px - .oe_bottom - position: absolute - top: 50% - left: 0 - right: 0 - bottom: 0 - text-shadow: 0 1px 1px #999999 - @include vertical-gradient(#b41616, #600606) - color: #eee - padding: 0 16px - @include radius(0 0 2px 2px) - a - color: #eee - // }}} - // Systray {{{ - .oe_systray > div - float: left - padding: 0 4px 0 4px - .oe_systray - float: right - // }}} - // Menu {{{ .oe_menu float: left padding: 0 @@ -1022,6 +942,83 @@ $sheet-max-width: 860px border-left: 4px solid transparent border-right: 4px solid transparent border-top: 4px solid #4c4c4c + + .oe_user_menu + float: right + padding: 0 + margin: 0 + li + list-style-type: none + float: left + .oe_dropdown_menu + right: -1px + + .oe_systray > div + float: left + padding: 0 4px 0 4px + .oe_systray + float: right + // }}} + // Webclient.leftbar {{{ + .oe_leftbar + display: none + width: 220px + background: #f0eeee + border-right: 1px solid $tag-border + text-shadow: 0 1px 1px white + padding-bottom: 16px + a.oe_logo + width: 220px + display: block + text-align: center + height: 70px + line-height: 70px + img + height: 40px + width: 157px + margin: 14px 0 + .oe_footer + position: fixed + bottom: 0 + padding: 4px 0 + background: #f0eeee + width: 220px + text-align: center + a + font-weight: 800 + font-family: serif + font-size: 16px + color: black + span + color: #c81010 + font-style: italic + // }}} + // About openerp {{{ + .oe_about + background-color: white + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=) + @include radius(0 0 2px 2px) + a + color: $link-color + &:hover + text-decoration: underline + &:focus + outline: none + .oe_logo + margin-left: -6px + .oe_bottom + position: absolute + top: 50% + left: 0 + right: 0 + bottom: 0 + text-shadow: 0 1px 1px #999999 + @include vertical-gradient(#b41616, #600606) + color: #eee + padding: 0 16px + @include radius(0 0 2px 2px) + a + color: #eee // }}} // ActionManager {{{ .oe_application -- cgit v1.2.3 From e0fb9355a9e3983a276165ee293f71b98b88f225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Tue, 25 Sep 2012 18:26:28 +0200 Subject: [IMP] the top menu is now the same as on the website bzr revid: fva@openerp.com-20120925162628-62e5ki5it2pj3ijl --- addons/web/static/src/css/base.css | 159 ++++++++++++++++++++---------------- addons/web/static/src/css/base.sass | 138 ++++++++++++++++++------------- 2 files changed, 167 insertions(+), 130 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 496f84e8c17..a5edb871028 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -711,7 +711,7 @@ text-indent: -99999px; vertical-align: top; margin-top: 8px; - margin-left: 4px; + margin-left: 3px; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 4px solid #404040; @@ -977,16 +977,23 @@ padding: 5px 10px 7px; line-height: 20px; height: 20px; + text-decoration: none; color: #eeeeee; vertical-align: top; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + -webkit-transition: all 0.2s ease-out; + -moz-transition: all 0.2s ease-out; + -ms-transition: all 0.2s ease-out; + -o-transition: all 0.2s ease-out; + transition: all 0.2s ease-out; } .openerp .oe_topbar .oe_topbar_item:hover { - background: #303030; + background: rgba(0, 0, 0, 0.2); + text-shadow: black 0px 0px 3px; color: white; - -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; } .openerp .oe_topbar .oe_topbar_avatar { width: 24px; @@ -1040,36 +1047,103 @@ float: left; padding: 0; margin: 0; + font-size: 13px; } .openerp .oe_menu > li { list-style-type: none; padding: 0; margin: 0; float: left; + display: block; + color: #eeeeee; } .openerp .oe_menu > li > a { display: block; padding: 5px 10px 7px; line-height: 20px; height: 20px; + text-decoration: none; color: #eeeeee; vertical-align: top; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + -webkit-transition: all 0.2s ease-out; + -moz-transition: all 0.2s ease-out; + -ms-transition: all 0.2s ease-out; + -o-transition: all 0.2s ease-out; + transition: all 0.2s ease-out; } .openerp .oe_menu > li > a:hover { - background: #303030; + background: rgba(0, 0, 0, 0.2); + text-shadow: black 0px 0px 3px; color: white; - -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; } .openerp .oe_menu > li > .oe_active { - background: #303030; + background: rgba(0, 0, 0, 0.2); + text-shadow: black 0px 0px 3px; font-weight: bold; - color: white; - -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; +} +.openerp .oe_user_menu { + float: right; + padding: 0; + margin: 0; +} +.openerp .oe_user_menu li { + list-style-type: none; + float: left; +} +.openerp .oe_user_menu .oe_dropdown_menu { + right: -1px; +} +.openerp .oe_systray > div { + float: left; + padding: 0 4px 0 4px; +} +.openerp .oe_systray { + float: right; +} +.openerp .oe_leftbar { + display: none; + width: 220px; + background: #f0eeee; + border-right: 1px solid #afafb6; + text-shadow: 0 1px 1px white; + padding-bottom: 16px; +} +.openerp a.oe_logo { + width: 220px; + display: block; + text-align: center; + height: 70px; + line-height: 70px; +} +.openerp a.oe_logo img { + height: 40px; + width: 157px; + margin: 14px 0; +} +.openerp .oe_footer { + position: fixed; + bottom: 0; + padding: 4px 0; + background: #f0eeee; + width: 220px; + text-align: center; +} +.openerp .oe_footer a { + font-weight: 800; + font-family: serif; + font-size: 16px; + color: black; +} +.openerp .oe_footer a span { + color: #c81010; + font-style: italic; } .openerp .oe_secondary_menu_section { font-weight: bold; @@ -1177,63 +1251,6 @@ border-right: 4px solid transparent; border-top: 4px solid #4c4c4c; } -.openerp .oe_user_menu { - float: right; - padding: 0; - margin: 0; -} -.openerp .oe_user_menu li { - list-style-type: none; - float: left; -} -.openerp .oe_user_menu .oe_dropdown_menu { - right: -1px; -} -.openerp .oe_systray > div { - float: left; - padding: 0 4px 0 4px; -} -.openerp .oe_systray { - float: right; -} -.openerp .oe_leftbar { - display: none; - width: 220px; - background: #f0eeee; - border-right: 1px solid #afafb6; - text-shadow: 0 1px 1px white; - padding-bottom: 16px; -} -.openerp a.oe_logo { - width: 220px; - display: block; - text-align: center; - height: 70px; - line-height: 70px; -} -.openerp a.oe_logo img { - height: 40px; - width: 157px; - margin: 14px 0; -} -.openerp .oe_footer { - position: fixed; - bottom: 0; - padding: 4px 0; - background: #f0eeee; - width: 220px; - text-align: center; -} -.openerp .oe_footer a { - font-weight: 800; - font-family: serif; - font-size: 16px; - color: black; -} -.openerp .oe_footer a span { - color: #c81010; - font-style: italic; -} .openerp .oe_about { background-color: white; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c1d721115da..84ec0ee218c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -599,7 +599,8 @@ $sheet-max-width: 860px text-indent: -99999px vertical-align: top margin-top: 8px - margin-left: 4px + //margin-left set at 3px to avoid a strange overflow + margin-left: 3px border-left: 4px solid transparent border-right: 4px solid transparent border-top: 4px solid#404040 @@ -792,6 +793,7 @@ $sheet-max-width: 860px display: none // }}} // Top Menu {{{ + .oe_topbar width: 100% height: 32px @@ -802,13 +804,16 @@ $sheet-max-width: 860px padding: 5px 10px 7px line-height: 20px height: 20px + text-decoration: none color: #eee vertical-align: top text-shadow: 0 1px 1px rgba(0,0,0,0.2) - &:hover - background: #303030 + @include transition(all 0.2s ease-out) + &:hover, + background: rgba(0,0,0,0.2) + text-shadow: black 0px 0px 3px color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + @include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset) .oe_topbar_avatar width: 24px @@ -838,32 +843,96 @@ $sheet-max-width: 860px @include vertical-gradient(#292929, #191919) @include box-shadow(none) + // oe menu is the list of the buttons on the left side of the bar. + // So why aren't the buttons oe_topbar_items ? This sad state of affairs + // is a leftover from an uncomplete refactoring when the left and top menu + // were merged. You are welcome to refactor and clean this up .oe_menu float: left padding: 0 margin: 0 + font-size: 13px > li list-style-type: none padding: 0 margin: 0 float: left + display: block + color: #eeeeee > a display: block padding: 5px 10px 7px line-height: 20px height: 20px + text-decoration: none color: #eee vertical-align: top text-shadow: 0 1px 1px rgba(0,0,0,0.2) - &:hover - background: #303030 + @include transition(all 0.2s ease-out) + &:hover, + background: rgba(0,0,0,0.2) + text-shadow: black 0px 0px 3px color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + @include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset) > .oe_active - background: #303030 + background: rgba(0,0,0,0.2) + text-shadow: black 0px 0px 3px font-weight: bold - color: white - @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + @include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset) + + .oe_user_menu + float: right + padding: 0 + margin: 0 + li + list-style-type: none + float: left + .oe_dropdown_menu + right: -1px + + .oe_systray > div + float: left + padding: 0 4px 0 4px + .oe_systray + float: right + + // }}} + // Webclient.leftbar {{{ + .oe_leftbar + display: none + width: 220px + background: #f0eeee + border-right: 1px solid $tag-border + text-shadow: 0 1px 1px white + padding-bottom: 16px + a.oe_logo + width: 220px + display: block + text-align: center + height: 70px + line-height: 70px + img + height: 40px + width: 157px + margin: 14px 0 + .oe_footer + position: fixed + bottom: 0 + padding: 4px 0 + background: #f0eeee + width: 220px + text-align: center + a + font-weight: 800 + font-family: serif + font-size: 16px + color: black + span + color: #c81010 + font-style: italic + // }}} + // Webclient.leftbar items {{{ + .oe_secondary_menu_section font-weight: bold margin-left: 8px @@ -943,55 +1012,6 @@ $sheet-max-width: 860px border-right: 4px solid transparent border-top: 4px solid #4c4c4c - .oe_user_menu - float: right - padding: 0 - margin: 0 - li - list-style-type: none - float: left - .oe_dropdown_menu - right: -1px - - .oe_systray > div - float: left - padding: 0 4px 0 4px - .oe_systray - float: right - // }}} - // Webclient.leftbar {{{ - .oe_leftbar - display: none - width: 220px - background: #f0eeee - border-right: 1px solid $tag-border - text-shadow: 0 1px 1px white - padding-bottom: 16px - a.oe_logo - width: 220px - display: block - text-align: center - height: 70px - line-height: 70px - img - height: 40px - width: 157px - margin: 14px 0 - .oe_footer - position: fixed - bottom: 0 - padding: 4px 0 - background: #f0eeee - width: 220px - text-align: center - a - font-weight: 800 - font-family: serif - font-size: 16px - color: black - span - color: #c81010 - font-style: italic // }}} // About openerp {{{ .oe_about -- cgit v1.2.3 From 92c6ff7ce6ba8fe919c049ba0ada648467cd1170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Thu, 27 Sep 2012 15:17:06 +0200 Subject: [FIX] various small css fixes for kanban and tree view bzr revid: fva@openerp.com-20120927131706-81d0sqqeaiy7c4c2 --- addons/web/static/src/css/base.css | 28 ++++++++++++++++++---------- addons/web/static/src/css/base.sass | 29 +++++++++++++++++++---------- 2 files changed, 37 insertions(+), 20 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 a5edb871028..18db06c44a1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1489,7 +1489,6 @@ height: 100%; } .openerp .oe_view_manager_current > .oe_view_manager_header { - border-top: 1px solid #cacaca; border-bottom: 1px solid #cacaca; background-color: #fcfcfc; background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); @@ -2207,6 +2206,9 @@ min-width: 60px; color: #1f1f1f; } +.openerp .oe_form textarea { + height: 32px; +} .openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] { background: #e5e5e5 !important; color: #666666; @@ -2763,27 +2765,33 @@ width: 100%; background-color: white; border-spacing: 0; + color: #4c4c4c; } .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 { +.openerp .oe-treeview-table td { cursor: pointer; - border-right: 1px dotted #afafb6; - vertical-align: top; + vertical-align: middle; text-align: left; - border-bottom: 1px solid #cfcccc; -} -.openerp .oe-treeview-table tr:hover { - background-color: #e0e0f8; + vertical-align: middle; + height: 20px; + padding-left: 4px; + padding-right: 4px; + border-right: 1px solid #e7e7e7; } -.openerp .oe-treeview-table .oe-number { +.openerp .oe-treeview-table td.oe_number { text-align: right !important; } +.openerp .oe-treeview-table tr { + border-bottom: 1px solid #d6d6d6; +} +.openerp .oe-treeview-table tr:hover { + background-color: #e7e7e7; +} .openerp .oe-treeview-table span { font-size: 90%; font-weight: normal; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 84ec0ee218c..851d0c3f9c9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1059,7 +1059,7 @@ $sheet-max-width: 860px // ViewManager common {{{ .oe_view_manager .oe_view_manager_body - height: inherit + height: inherit .oe_view_manager_view_kanban height: inherit @@ -1197,7 +1197,6 @@ $sheet-max-width: 860px .oe_view_manager_current height: 100% > .oe_view_manager_header - border-top: 1px solid #cacaca 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))) @@ -1751,6 +1750,8 @@ $sheet-max-width: 860px background: white min-width: 60px color: #1f1f1f + textarea + height: 32px input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled] background: #E5E5E5 !important color: #666 @@ -2180,22 +2181,29 @@ $sheet-max-width: 860px width: 100% background-color: white border-spacing: 0 + color: #4c4c4c th padding: 10px - color: #4c4c4c font-weight: bold background-color: #f0f0f0 border-bottom: 2px solid #cacaca - .treeview-tr, .treeview-td + + td cursor: pointer - border-right: 1px dotted $tag-border - vertical-align: top + vertical-align: middle text-align: left - border-bottom: 1px solid #cfcccc - tr:hover - background-color: #e0e0f8 - .oe-number + vertical-align: middle + height: 20px + padding-left: 4px + padding-right: 4px + border-right: 1px solid #e7e7e7 + + td.oe_number text-align: right !important + tr + border-bottom: 1px solid #d6d6d6 + &:hover + background-color: #e7e7e7 span font-size: 90% font-weight: normal @@ -2207,6 +2215,7 @@ $sheet-max-width: 860px background-image: url(/web/static/src/img/collapse.gif) .treeview-tr.oe-treeview-first span, .treeview-td.oe-treeview-first span margin-left: 16px + // }}} // Debugging stuff {{{ .oe_layout_debugging -- cgit v1.2.3