From 188d42650009a5a4672b847158b481a43e7e5056 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Fri, 6 Dec 2013 10:57:56 +0530 Subject: [IMP]Add sass changes. bzr revid: bth@tinyerp.com-20131206052756-bqizhcsf2jwjn05k --- addons/web/static/src/css/base.sass | 6 ++++++ 1 file changed, 6 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 e9a51370192..cf72a287549 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -534,6 +534,7 @@ $sheet-padding: 16px // Tooltips {{{ &.oe_tooltip font-size: 12px + background-color: transparent .oe_tooltip_string color: #FD5 font-weight: bold @@ -557,6 +558,11 @@ $sheet-padding: 16px cursor: pointer .oe_tooltip_message max-width: 310px + .tooltip-inner + text-align: left !important + .tooltip.bottom .tooltip-arrow + left: 12% !important + margin-top: 0.5px // }}} // Notebook {{{ .oe_notebook -- cgit v1.2.3 From 40a4a06d068c639b873e3936efb58159f1dd7709 Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (Open ERP)" Date: Tue, 17 Dec 2013 13:01:58 +0530 Subject: [IMP]improved css for tooltip bottom, bottom arrow, text alignment. bzr revid: kch@tinyerp.com-20131217073158-zjy4wbxenchxk2ax --- addons/web/static/src/css/base.sass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index cf72a287549..541a7f66d88 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -558,11 +558,6 @@ $sheet-padding: 16px cursor: pointer .oe_tooltip_message max-width: 310px - .tooltip-inner - text-align: left !important - .tooltip.bottom .tooltip-arrow - left: 12% !important - margin-top: 0.5px // }}} // Notebook {{{ .oe_notebook @@ -2770,6 +2765,13 @@ div.ui-widget-overlay background-color: #7c7bad // End of customize +// Customize bootstrap3 for tooltip +.tooltip-inner + text-align: left +.tooltip.bottom .tooltip-arrow + left: 35% +// End of customize + // Customize for global tags button, body line-height: normal -- cgit v1.2.3 From 3fcd2e2440a7a5e87f7451453decf1462000ea35 Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (Open ERP)" Date: Tue, 17 Dec 2013 15:05:46 +0530 Subject: [IMP]Improved code for set tooltip placement on top or bottom on the basis of display area. bzr revid: kch@tinyerp.com-20131217093546-49lg5i0rm1kx9oli --- addons/web/static/src/css/base.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 541a7f66d88..e74fae44206 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2767,9 +2767,9 @@ div.ui-widget-overlay // Customize bootstrap3 for tooltip .tooltip-inner - text-align: left + text-align: left !important .tooltip.bottom .tooltip-arrow - left: 35% + left: 35% !important // End of customize // Customize for global tags -- cgit v1.2.3 From e6112472cede1ee52497e8f91541fbaf8d5a7531 Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (Open ERP)" Date: Tue, 17 Dec 2013 15:11:57 +0530 Subject: [FIX]css issue. bzr revid: kch@tinyerp.com-20131217094157-i45wv6xs1uz38kin --- addons/web/static/src/css/base.sass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e74fae44206..549b89e2b21 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2768,8 +2768,9 @@ div.ui-widget-overlay // Customize bootstrap3 for tooltip .tooltip-inner text-align: left !important + max-width: 250px .tooltip.bottom .tooltip-arrow - left: 35% !important + left: 50% // End of customize // Customize for global tags -- cgit v1.2.3 From 00362f60c987eb0ca44dc65902f4f9a0960af90a Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (Open ERP)" Date: Wed, 18 Dec 2013 13:04:40 +0530 Subject: [IMP]customize bootstrap tooltip classes. bzr revid: kch@tinyerp.com-20131218073440-c7sfdn0jfw0cw83n --- addons/web/static/src/css/base.sass | 68 +++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 33 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 549b89e2b21..941ce32231c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -531,34 +531,6 @@ $sheet-padding: 16px text-decoration: none margin-bottom: 1px // }}} - // Tooltips {{{ - &.oe_tooltip - font-size: 12px - background-color: transparent - .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 - .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 margin: 8px 0 @@ -2766,11 +2738,41 @@ div.ui-widget-overlay // End of customize // Customize bootstrap3 for tooltip -.tooltip-inner - text-align: left !important - max-width: 250px -.tooltip.bottom .tooltip-arrow - left: 50% +.tooltip + padding: 0 + margin: 0 + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif + color: #4c4c4c + font-size: 12px + background: white + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5) + background-color: transparent + .tooltip-inner + text-align: left !important + max-width: 250px + .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 + .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 // End of customize // Customize for global tags -- cgit v1.2.3 From 2f0b59be37c2878aa3efcaa075a972eb80300469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 20 Mar 2014 18:39:07 +0100 Subject: [IMP] list_view: allow displaying string-based buttons in list view and not only img-based buttons. bzr revid: tde@openerp.com-20140320173907-5b02atnispbznqmj --- addons/web/static/src/css/base.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 38a47eed1c5..b08427e0832 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2312,7 +2312,7 @@ $sheet-padding: 16px padding: 3px 6px white-space: pre-line > td, > th - > button + > button.btn_img border: none background: transparent padding: 0 -- cgit v1.2.3 From 254985f4179220190e3f592a06d7897b92a928d4 Mon Sep 17 00:00:00 2001 From: Amit Vora Date: Tue, 1 Apr 2014 13:03:09 +0530 Subject: [FIX] Fixed the generic issue of radio button align. bzr revid: avo@tinyerp.com-20140401073309-3e0ynl5z1q92hfm8 --- addons/web/static/src/css/base.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 38a47eed1c5..e8103b4bc53 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -514,7 +514,7 @@ $sheet-padding: 16px display: inline-block height: 12px width: 12px - vertical-align: bottom + vertical-align: top border-radius: 10px margin: 1px 0 &.oe_form_invalid -- cgit v1.2.3 From a43998c41f05f58f6fc053fa6824b527debb2068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 8 Apr 2014 13:31:07 +0200 Subject: [IMP] web: stat buttons: some CSS fixes + added barchart button that display a barchart. Whoo. bzr revid: tde@openerp.com-20140408113107-y9zstny6a0ybi38l --- addons/web/static/src/css/base.sass | 6 ++++++ 1 file changed, 6 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 65f22a89481..c8121749194 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -461,9 +461,15 @@ $sheet-padding: 16px padding: 0px 3px width: 37px text-align: center + .oe_form_field_percent_pie + width: 42px + .oe_form_field_bar_chart + width: 42px svg width: 38px height: 38px + display: inline + vertical-align: middle .oe_avatar > img max-height: 90px -- cgit v1.2.3 From e95ca69113bf3b37c82c3e2cab7e6636592c9508 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 10 Apr 2014 12:06:31 +0200 Subject: [REF]add bootstrap modal window based, cleaned, refactored from trunk-ui-to-boostrap-modal branch bzr revid: csn@openerp.com-20140410100631-5v6a71oi5wyunbda --- addons/web/static/src/css/base.sass | 127 ++++++------------------------------ 1 file changed, 19 insertions(+), 108 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 ca77310b0d9..335e04f2424 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -218,7 +218,7 @@ $sheet-padding: 16px font-size: inherit // }}} // Button style {{{ - a.button:link, a.button:visited, button, .oe_button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button + a.button:link, a.button:visited, button, .oe_button, input[type='submit'] display: inline-block border: 1px solid rgba(0,0,0,0.4) color: #4c4c4c @@ -233,18 +233,18 @@ $sheet-padding: 16px -webkit-font-smoothing: antialiased outline: none - a.button:hover, button:hover,.oe_button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover + a.button:hover, button:hover,.oe_button:hover, input[type='submit']:hover @include vertical-gradient(#f6f6f6, #e3e3e3) cursor: pointer background-position: 0 - a.button:focus, button:focus, .oe_button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus + a.button:focus, button:focus, .oe_button:focus, input[type='submit']: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, .oe_button:active, .oe_button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active + a.button:active, a.button.active, button:active, .oe_button:active, .oe_button.active, input[type='submit']:active, input[type='submit'].active @include vertical-gradient(#e3e3e3, #f6f6f6) @include box-shadow(none) @@ -272,105 +272,6 @@ $sheet-padding: 16px .ui-tabs position: static - // Modal box - &.ui-dialog - display: none - height: auto !important - padding: 6px - //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-content - padding: 0 - .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane - padding: 16px - .ui-dialog-titlebar - border-top: none - border-left: none - border-right: none - border-bottom: 1px solid #cacaca - @include radius(2px 2px 0 0) - @include vertical-gradient(#FCFCFC, #DEDEDE) - .ui-dialog-title - margin: 0 - padding: 0 - .ui-dialog-content - background: white - width: auto !important - .ui-dialog-buttonpane - border-top: 1px solid #e0e0e0 - background: #f5f7f9 - margin: 0 - @include radius(0 0 2px 2px) - button - margin: 0 4px 0 0 - .ui-dialog-buttonset - float: left - .ui-button - margin-right: 4px - .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 - .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 - - &.ui-dialog.oe_act_window - .ui-dialog-content - padding: 0px - - .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 @@ -1031,10 +932,8 @@ $sheet-padding: 16px 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 @@ -2765,9 +2664,6 @@ body.oe_single_form > .arrow span background-color: #729fcf !important - // jquery ui for ie - .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8') // }}} // @media print {{{ @@ -2812,6 +2708,21 @@ body.oe_single_form height: 18px // End hack}}} +// Customized modal according bootstrap3 +.modal + .modal-header + button.close + border: none + background: none + padding: 1px + height: 18px + font-size: 20px + .modal-footer + text-align: left + &.oe_act_window + .modal-body + padding: 0 + input[type="radio"], input[type="checkbox"] margin-right: 4px margin-left: 4px -- cgit v1.2.3 From 964e94f8a800661020af8082c719b19c4cdddd86 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 10 Apr 2014 14:11:22 +0200 Subject: [FIX]forgot to open a dialog bzr revid: csn@openerp.com-20140410121122-y0a8l1hzd01af8bn --- addons/web/static/src/css/base.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 335e04f2424..fbf86cca678 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2719,8 +2719,8 @@ body.oe_single_form font-size: 20px .modal-footer text-align: left - &.oe_act_window - .modal-body + .oe_act_window + &.modal-body padding: 0 input[type="radio"], input[type="checkbox"] -- cgit v1.2.3 From 049539809d4d1e4d37eac4b59d08d10c39c731f7 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 10 Apr 2014 17:19:40 +0200 Subject: [FIX]modal strict to bootstrap: no resize and only use 3 size, large-medium-small instead of changing width of modal bzr revid: csn@openerp.com-20140410151940-w0m1ljjqgo0eysgp --- addons/web/static/src/css/base.sass | 3 --- 1 file changed, 3 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fbf86cca678..f70fee5583f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -931,9 +931,6 @@ $sheet-padding: 16px .oe_logo margin-left: -6px .oe_bottom - position: absolute - left: 0 - right: 0 text-shadow: 0 1px 1px #999999 @include vertical-gradient(#b41616, #600606) color: #eee -- cgit v1.2.3 From c8607c8b818b4554c01294f5c05bc5d20f226f82 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 11 Apr 2014 14:27:53 +0200 Subject: [FIX]few cosmetic of code bzr revid: csn@openerp.com-20140411122753-qzxb29uwkw89mrxs --- addons/web/static/src/css/base.sass | 18 ++++++++---------- 1 file changed, 8 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 f70fee5583f..882d0489c04 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2707,18 +2707,16 @@ body.oe_single_form // Customized modal according bootstrap3 .modal - .modal-header - button.close - border: none - background: none - padding: 1px - height: 18px - font-size: 20px + .modal-header button.close + border: none + background: none + padding: 1px + height: 18px + font-size: 20px .modal-footer text-align: left - .oe_act_window - &.modal-body - padding: 0 + .oe_act_window.modal-body + padding: 0 input[type="radio"], input[type="checkbox"] margin-right: 4px -- cgit v1.2.3 From 7990c39127bf7204769ae93a257b00c583a221ac Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Wed, 16 Apr 2014 17:15:43 +0200 Subject: [FIX]modal: button were not showing in calendar bzr revid: csn@openerp.com-20140416151543-im41f9rpqj6ll742 --- 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 d3153ee5d62..a98948117f6 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2720,6 +2720,8 @@ body.oe_single_form font-size: 20px .modal-footer text-align: left + .oe_button + margin: 0 4px 0 0 .oe_act_window.modal-body padding: 0 -- cgit v1.2.3 From 8ee8b7bde68a550e2950df75754ad387c8ae13b1 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Wed, 23 Apr 2014 11:14:14 +0200 Subject: [FIX]problem with header dropdown buttons css bzr revid: csn@openerp.com-20140423091414-llv3t70gi59orbh0 --- addons/web/static/src/css/base.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 84758c062cb..d83b09bc897 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1550,7 +1550,7 @@ $sheet-padding: 16px // FormView.header {{{ .oe_form > :not(.oe_form_nosheet) header padding-left: 2px - ul:not(.oe_tooltip_technical) + ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu) display: inline-block float: right .oe_button -- cgit v1.2.3