From f908f447591035f328c5f9f4c85923e1201c6773 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 13 Nov 2012 13:30:47 +0100 Subject: [FIX] remove min-width on number form fields when inside an editable list view otherwise it refused to fit in small cells also remove !important specifications which are just a bloody fucking pain every single time, they're just a shit hack over doing things correctly in the first place, to hell with these things. lp bug: https://launchpad.net/bugs/1046180 fixed bzr revid: xmo@openerp.com-20121113123047-jspflyhfb8gei24r --- addons/web/static/src/css/base.sass | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f911929e159..07f5c3eb666 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1837,13 +1837,13 @@ $sheet-padding: 16px .oe_form_editable .oe_form .oe_form_field_integer input - width: 6em !important + width: 6em .oe_form_field_float input - width: 7em !important + width: 7em .oe_form_field_date input - width: 7.5em !important + width: 7.5em .oe_form_field_datetime input - width: 11.5em !important + width: 11.5em // }}} // FormView.fields_binary {{{ /* http://www.quirksmode.org/dom/inputfile.html @@ -2043,24 +2043,21 @@ $sheet-padding: 16px .oe_m2o_cm_button display: none .oe_form_field + min-width: 0 + max-width: none input, textarea height: $row-height - input, textarea @include radius(0) border: 1px solid #aaf margin: 0 + min-width: 0 &.oe_form_field_float,&.oe_form_view_integer input text-align: right width: 100% !important &.oe_form_field_datetime,&.oe_form_field_date - > span - width: 100% !important 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 .oe_list_group_name white-space: nowrap // }}} -- cgit v1.2.3 From 9fcde051685d49dc6e1cc7fc6c9b90c8efe5974b Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 13 Nov 2012 14:18:06 +0100 Subject: [FIX] clicking on checkbox (boolean field) of list view should correctly trigger whatever the row action is replaced @disabled checkboxes for boolean fields by @readonly + alpha (50%), as disabled input do not generate *any* event. Not default action (of course) but not e.g. a click either, whether delegated or bound directly on the element, there's no way at all to see if e.g. a user has clicked on a disabled checkbox or radio. lp bug: https://launchpad.net/bugs/1013569 fixed bzr revid: xmo@openerp.com-20121113131806-7fhog1f96gxnjr67 --- addons/web/static/src/css/base.sass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 07f5c3eb666..e201bf94b9b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2165,6 +2165,8 @@ $sheet-padding: 16px width: 17px &:after border-width: 0 + > td.oe_list_field_boolean input + @include opacity() > tr:nth-child(odd) background-color: #f0f0fa @include vertical-gradient(#f0f0fa, #eeeef6) -- cgit v1.2.3 From bd0e4d6a422a112dabe96b07ebee3ff4459820e0 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 13 Nov 2012 15:39:53 +0100 Subject: [MEH] vertical alignments bzr revid: xmo@openerp.com-20121113143953-4rvozux8uurv16d4 --- addons/web/static/src/css/base.sass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e201bf94b9b..5e11ab56e04 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2041,7 +2041,9 @@ $sheet-padding: 16px .oe_m2o_drop_down_button top: 5px .oe_m2o_cm_button - display: none + line-height: 19px + .oe_input_icon + margin-top: 5px .oe_form_field min-width: 0 max-width: none -- cgit v1.2.3 From a36748ebe44704aefc66a67920e3b437c288b6e4 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 14 Nov 2012 13:51:34 +0100 Subject: [FIX] disable min-width on select fields when inside editable list row bzr revid: xmo@openerp.com-20121114125134-ojiupdhudxjtz6y5 --- addons/web/static/src/css/base.sass | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5e11ab56e04..19d8d8a0d81 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2052,6 +2052,7 @@ $sheet-padding: 16px @include radius(0) border: 1px solid #aaf margin: 0 + input, textarea, select min-width: 0 &.oe_form_field_float,&.oe_form_view_integer input -- cgit v1.2.3 From 9f89256ef350d158b2ccb52e22480475ea454ff6 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 14 Nov 2012 11:55:54 +0100 Subject: [IMP] css to make the m2o nicer bzr revid: nicolas.vanhoren@openerp.com-20121114105554-ps21uqbrbremmjxb --- addons/web/static/src/css/base.sass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 19d8d8a0d81..26abdb8a4f1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1899,6 +1899,8 @@ $sheet-padding: 16px line-height: 14px float: right padding-left: 2px + input + padding-right: 13px &.ui-autocomplete li.oe_m2o_dropdown_option a font-style: italic -- cgit v1.2.3 From 923f75eeef2e3b40b0697eaa8d95004b30fb3310 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 14 Nov 2012 16:07:17 +0100 Subject: [MEH] hardcode min-width for date fields in list view bzr revid: xmo@openerp.com-20121114150717-sdf6ut4hbappaf8x --- addons/web/static/src/css/base.sass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 26abdb8a4f1..586bca407d0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2121,6 +2121,8 @@ $sheet-padding: 16px td.oe_number text-align: right !important max-width: 100px + td.oe_list_field_date, th.oe_list_header_date + min-width: 6em > thead border-bottom: 2px solid #cacaca background: #eee -- cgit v1.2.3 From 79e1118c165a197eb7056a7bbe3751537068a3fe Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 15 Nov 2012 18:36:14 +0100 Subject: [IMP] Clean base.sass folding sections bzr revid: fme@openerp.com-20121115173614-o5pchmm889yxz5cy --- addons/web/static/src/css/base.sass | 151 ++++++++++++++++++------------------ 1 file changed, 75 insertions(+), 76 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 586bca407d0..7669af0ee2c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -140,18 +140,6 @@ $sheet-padding: 16px // }}} -@media print - .oe_topbar, .oe_leftbar, .oe_loading - display: none !important - -.openerp.openerp_webclient_container - height: 100% - -// jQueryUI css bug fixing -.text-tag .text-button - height: auto !important - min-height: 16px - .openerp // Global style {{{ padding: 0 @@ -161,6 +149,8 @@ $sheet-padding: 16px font-size: 13px background: white text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5) + &.openerp_webclient_container + height: 100% // }}} //Placeholder style{{{ \:-moz-placeholder @@ -254,6 +244,11 @@ $sheet-padding: 16px .oe_bounce_container display: inline-block + // Bug lp:1051746 + .text-tag .text-button + height: auto !important + min-height: 16px + // bug noted in jquery ui CSS doesn't seem to occur in IE9, // so remove position:relative .ui-tabs @@ -1886,6 +1881,64 @@ $sheet-padding: 16px @include box-sizing(border) &:hover .oe_form_field_image_controls display: block + .oe_fileupload + display: inline-block + clear: both + width: 100% + .oe_add + float: left + position: relative + width: 100% + left: +2px + top: +7px + button + display: inline + height: 24px + font-size: 12px + line-height: 12px + vertical-align: middle + button.oe_attach + width: 24px + overflow: hidden + width: 24px + overflow: hidden + background: transparent + color: #7C7BAD + box-shadow: none + border: none + text-shadow: none + .oe_e + position: relative + top: -1px + left: -9px + input.oe_form_binary_file + display: inline-block + margin-left: -5px + height: 28px + width: 52px + margin-top: -26px + .oe_attach_label + color: #7C7BAD + margin-left: -3px + .oe_attachments + margin-bottom: 4px + margin-right: 0px + font-size: 12px + border-radius: 2px + border: solid 1px rgba(124,123,173,0.14) + .oe_attachment + padding: 2px + padding-left: 4px + padding-right: 4px + .oe_e + font-size: 23px + margin-top: -5px + .oe_e:hover + text-decoration: none + .oe_attachment:nth-child(odd) + background: white + .oe_attachment:nth-child(even) + background: #F4F5FA // }}} // FormView.many2one {{{ .oe_form_field_many2one @@ -2288,67 +2341,6 @@ $sheet-padding: 16px float: right color: #333 // }}} - -.openerp - .oe_fileupload - display: inline-block - clear: both - width: 100% - .oe_add - float: left - position: relative - width: 100% - left: +2px - top: +7px - button - display: inline - height: 24px - font-size: 12px - line-height: 12px - vertical-align: middle - button.oe_attach - width: 24px - overflow: hidden - width: 24px - overflow: hidden - background: transparent - color: #7C7BAD - box-shadow: none - border: none - text-shadow: none - .oe_e - position: relative - top: -1px - left: -9px - input.oe_form_binary_file - display: inline-block - margin-left: -5px - height: 28px - width: 52px - margin-top: -26px - .oe_attach_label - color: #7C7BAD - margin-left: -3px - .oe_attachments - margin-bottom: 4px - margin-right: 0px - font-size: 12px - border-radius: 2px - border: solid 1px rgba(124,123,173,0.14) - .oe_attachment - padding: 2px - padding-left: 4px - padding-right: 4px - .oe_e - font-size: 23px - margin-top: -5px - .oe_e:hover - text-decoration: none - .oe_attachment:nth-child(odd) - background: white - .oe_attachment:nth-child(even) - background: #F4F5FA - // Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) @@ -2358,11 +2350,13 @@ $sheet-padding: 16px opacity: 0.70 // }}} +// jQueryUI top level {{{ // The jQuery-ui overlay and Autocomplete are outside the .openerp div, please don't add indentation !!! div.ui-widget-overlay background: black @include opacity(0.3) - +// TODO: I think only the overlay is problematic, the other top level widgets should use $.fn.openerpClass() +// eg: $el.autocomplete().openerpClass(); .ui-widget font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif color: #4c4c4c @@ -2389,11 +2383,14 @@ div.ui-widget-overlay .ui-corner-all @include radius(3px) +// }}} +// @media print {{{ @media print .openerp - .oe_header_row, ul.oe_header, div.oe_mail_thread_action, .oe_mail_recthread_actions, .oe_button_box, .oe_form button, button.oe_invite, .oe_form header, .openerp .oe_notebook > li.ui-state-default - display: none + .oe_header_row, ul.oe_header, div.oe_mail_thread_action, .oe_mail_recthread_actions, .oe_button_box, .oe_form button, button.oe_invite, .oe_form header, .openerp .oe_notebook > li.ui-state-default, .oe_topbar, .oe_leftbar, .oe_loading + // We use !important here because jQuery adds @style = display: block on elements when using $.fn.show() + display: none !important .oe_list_content button, input[type=checkbox] visibility: hidden @@ -2419,5 +2416,7 @@ div.ui-widget-overlay background: none .openerp div.oe_mail_wall overflow: hidden !important +// }}} + // 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 2b7bfe4ecd1a1f631c197f2dea0bdc73565ba56c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 15 Nov 2012 18:51:46 +0100 Subject: [IMP] openerp logo img border 0 for IE Can't merge nwi's branch right now so I do the bare minimum that hurts eyes bzr revid: fme@openerp.com-20121115175146-5zn97xz8w3m5l5rx --- addons/web/static/src/css/base.sass | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 7669af0ee2c..c5fcb8008a5 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -923,6 +923,7 @@ $sheet-padding: 16px height: 40px width: 157px margin: 14px 0 + border: 0 .oe_footer position: fixed bottom: 0 -- cgit v1.2.3