From 2719a64debdacb942d469533f07f1694d520a4e3 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 15 Mar 2012 15:16:22 +0100 Subject: [ADD] Add bzr revid: fme@openerp.com-20120315141622-pby363816gv4td0k --- addons/web/static/src/css/base.sass | 18 ++++++++++++++++-- 1 file changed, 16 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 56a735c98fd..246b621ba68 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -85,7 +85,7 @@ $colour4: #8a89ba left: 0 .topbar, .leftbar display: none - // }} + // }}} // Topbar {{{ .oe_topbar @@ -322,7 +322,21 @@ $colour4: #8a89ba @include box-shadow(none) // }}} -.openerp + // FormView Widgets {{{ + .oe_horizontal_separator + font-weight: bold + border-bottom: 1px solid #666 + margin: 3px 4px 3px 1px + height: 17px + font-size: 95% + .oe_horizontal_separator:empty + height: 5px + .oe_vertical_separator + border-left: 1px solid #666 + padding: 0 4px 0 4px + // }}} + + .openerp // Transitional overrides for old styles {{{ // }}} -- cgit v1.2.3 From cade2c3f162a184a463a6ffd5c1e42e9b15a9a86 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 19 Mar 2012 11:29:04 +0100 Subject: [FIX] Fixed labels and stuff bzr revid: fme@openerp.com-20120319102904-gcnls0j3rl25asq5 --- 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 246b621ba68..a5ad8fd7ad1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -334,7 +334,9 @@ $colour4: #8a89ba .oe_vertical_separator border-left: 1px solid #666 padding: 0 4px 0 4px - // }}} + .oe_form_label_help, .oe_form_label + white-space: nowrap + // }}} .openerp // Transitional overrides for old styles {{{ -- cgit v1.2.3 From c9efa250289d902fbef2a49683c63a1d2146aa62 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 19 Mar 2012 16:43:18 +0100 Subject: [IMP] Label styling bzr revid: fme@openerp.com-20120319154318-cb175upodl1gj2f8 --- 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 a5ad8fd7ad1..b67af4c14aa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -334,7 +334,7 @@ $colour4: #8a89ba .oe_vertical_separator border-left: 1px solid #666 padding: 0 4px 0 4px - .oe_form_label_help, .oe_form_label + .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap // }}} -- cgit v1.2.3 From a399b1d8cc2709dfd0d3368d21d4a5b66715492a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 20 Mar 2012 09:39:28 +0100 Subject: [IMP] Buttons styling bzr revid: fme@openerp.com-20120320083928-52plnhxvoam51ag5 --- addons/web/static/src/css/base.sass | 3 +++ 1 file changed, 3 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 b67af4c14aa..e406f4bce73 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -336,6 +336,9 @@ $colour4: #8a89ba padding: 0 4px 0 4px .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap + .oe_form_group_cell + .oe_form_button + width: 100% // }}} .openerp -- cgit v1.2.3 From 4049900363ec964218c50f2d958d511d52ed5099 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 20 Mar 2012 09:44:01 +0100 Subject: [IMP] Missing part in previous commit bzr revid: fme@openerp.com-20120320084401-2lus5x82yf3r1viu --- 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 e406f4bce73..fe9408c18a1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -339,6 +339,7 @@ $colour4: #8a89ba .oe_form_group_cell .oe_form_button width: 100% + white-space: nowrap // }}} .openerp -- cgit v1.2.3 From d76e8be574e4c73d3bcfc0d7802340ac253737f6 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 20 Mar 2012 12:01:15 +0100 Subject: [ADD] Debug layout. bzr revid: fme@openerp.com-20120320110115-1v4ypw9t06s7l9rb --- addons/web/static/src/css/base.sass | 21 +++++++++++++++++++++ 1 file changed, 21 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 fe9408c18a1..9a77d14558e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -340,6 +340,27 @@ $colour4: #8a89ba .oe_form_button width: 100% white-space: nowrap + .oe_form_group_cell + position: relative + .oe_field_char, .oe_form_field_selection select + width: 99% + .oe_form_field_selection select + min-width: 90px + .oe_layout_debugging + .oe_form_group + border: 1px solid red + .oe_form_group_cell + border: 1px solid blue + .oe_layout_debug_cell + position: absolute + color: white + bottom: 0 + left: 0 + background: green + .oe_layout_debug_cell + display: block + .oe_layout_debug_cell + display: none // }}} .openerp -- cgit v1.2.3 From 64f940f212f0a797a0e92fa2c9862e68e93ea5a3 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 20 Mar 2012 13:06:21 +0100 Subject: [FIX] Fix layouting width issue bzr revid: fme@openerp.com-20120320120621-jk4ojmz925veym1v --- 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 9a77d14558e..746bc5d32b4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -351,6 +351,7 @@ $colour4: #8a89ba border: 1px solid red .oe_form_group_cell border: 1px solid blue + padding-bottom: 1em .oe_layout_debug_cell position: absolute color: white -- cgit v1.2.3 From aec5e471d12d481614e5cc953c545086c1712b2c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 21 Mar 2012 17:30:11 +0100 Subject: [ADD] Added temporary css rule for m2o bzr revid: fme@openerp.com-20120321163011-c716doaws4fupjqk --- addons/web/static/src/css/base.sass | 13 ++++++++++--- 1 file changed, 10 insertions(+), 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 746bc5d32b4..4b97afe1839 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -364,9 +364,16 @@ $colour4: #8a89ba display: none // }}} - .openerp - // Transitional overrides for old styles {{{ - // }}} +// Transitional overrides for old styles {{{ +.openerp + .oe_form_field_many2one + td:first + 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 64bb386f65c612914c02bd7f6fb095664e717323 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 22 Mar 2012 14:35:44 +0100 Subject: Changed the layout to only have 1 scrollbar on the right bzr revid: mit@openerp.com-20120322133544-g0codu01ahygaii6 --- addons/web/static/src/css/base.sass | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 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 4b97afe1839..5a14bc87dbb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -64,18 +64,16 @@ $colour4: #8a89ba // WebClient {{{ .oe_webclient - position: absolute - top: 0 - bottom: 0 - left: 0 - right: 0 - .oe_application position: absolute - top: 32px + top: 33px bottom: 0 - left: 206px + left: 222px right: 0 + a + color: $colour4 + &:hover + text-decoration: underline // }}} // Fullscreen mode {{{ @@ -132,19 +130,19 @@ $colour4: #8a89ba // }}} // Leftbar {{{ - .oe_leftbar - width: 205px + .oe_leftbarbg + position: fixed + width: 220px + top: 0 + left: 0 height: 100% background: #f0eeee border-right: 1px solid #afafb6 - overflow: auto + z-index: -1 + .oe_leftbar + float: left + width: 221px text-shadow: 0 1px 1px white - - .oe_footer - position: absolute - width: 205px - text-align: center - bottom: 8px a.oe_logo display: block text-align: center @@ -155,10 +153,12 @@ $colour4: #8a89ba width: 157px margin: 14px 0 .oe_footer - position: absolute - width: 205px + position: fixed + bottom: 0 + padding: 4px 0 + background: #f0eeee + width: 220px text-align: center - bottom: 8px a font-weight: 800 font-family: serif -- cgit v1.2.3 From d4ec427f0168d57777b61fec4c941ea874ffcc02 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 22 Mar 2012 21:46:34 +0100 Subject: [FIX] Fixed css bzr revid: fme@openerp.com-20120322204634-8o3o81oton9a4fqj --- addons/web/static/src/css/base.sass | 17 ----------------- 1 file changed, 17 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 5a14bc87dbb..22c987ca0f2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -323,29 +323,12 @@ $colour4: #8a89ba // }}} // FormView Widgets {{{ - .oe_horizontal_separator - font-weight: bold - border-bottom: 1px solid #666 - margin: 3px 4px 3px 1px - height: 17px - font-size: 95% - .oe_horizontal_separator:empty - height: 5px - .oe_vertical_separator - border-left: 1px solid #666 - padding: 0 4px 0 4px .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap .oe_form_group_cell .oe_form_button width: 100% white-space: nowrap - .oe_form_group_cell - position: relative - .oe_field_char, .oe_form_field_selection select - width: 99% - .oe_form_field_selection select - min-width: 90px .oe_layout_debugging .oe_form_group border: 1px solid red -- cgit v1.2.3 From eb1e0aee5d75d386abe9a2a5d08c9b149d21945b Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 23 Mar 2012 16:40:13 +0100 Subject: [imp] put back required notification in m2o for debugging purpose bzr revid: nicolas.vanhoren@openerp.com-20120323154013-40cllmyetz2k4moh --- addons/web/static/src/css/base.sass | 4 ++++ 1 file changed, 4 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 22c987ca0f2..4e66e0a147f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -356,6 +356,10 @@ $colour4: #8a89ba position: absolute top: 3px right: 2px + &.required input + background: #D2D2FF + &.required.invalid input + background: #F66 // }}} // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" -- cgit v1.2.3 From 6d90ea0966b658d665d421dae10eb21fe943461f Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 26 Mar 2012 11:33:47 +0200 Subject: [FIX] Fixed layout debugging bzr revid: fme@openerp.com-20120326093347-dop01vdrwf7dok0b --- addons/web/static/src/css/base.sass | 9 ++++----- 1 file changed, 4 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 4e66e0a147f..cb677837b99 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -331,16 +331,15 @@ $colour4: #8a89ba white-space: nowrap .oe_layout_debugging .oe_form_group - border: 1px solid red + border: 2px dashed red .oe_form_group_cell border: 1px solid blue padding-bottom: 1em .oe_layout_debug_cell - position: absolute color: white - bottom: 0 - left: 0 - background: green + background: #696 + font-size: 80% + text-align: center .oe_layout_debug_cell display: block .oe_layout_debug_cell -- cgit v1.2.3 From 0c9cae3f6a468d515125ae7feb8f01f5d66eba71 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 26 Mar 2012 14:29:50 +0200 Subject: [FIX] Fixed some styling issues bzr revid: fme@openerp.com-20120326122950-m7s3t27dz1qmi8bc --- addons/web/static/src/css/base.sass | 6 +----- 1 file changed, 1 insertion(+), 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 cb677837b99..a1cc267ff89 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -349,16 +349,12 @@ $colour4: #8a89ba // Transitional overrides for old styles {{{ .openerp .oe_form_field_many2one - td:first + td:first-child position: relative span.oe-m2o-drop-down-button position: absolute top: 3px right: 2px - &.required input - background: #D2D2FF - &.required.invalid input - background: #F66 // }}} // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" -- cgit v1.2.3 From c21f00ab815898892db68621a752882f137ecaa7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 26 Mar 2012 16:50:17 +0200 Subject: [FIX] greatly simplify widgets-rendering routine of search view (basically remove all the rendering part), add basic drawer behavior bzr revid: xmo@openerp.com-20120326145017-g1ydm1k93hipy2j5 --- addons/web/static/src/css/base.sass | 70 ++++++++++++++++++++++++++++++++++++- 1 file changed, 69 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 56a735c98fd..c4015fcf791 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,4 +1,5 @@ // Variables {{{ +$section-title-color: #8786b7 $colour4: #8a89ba //$colour4: #d14836 // }}} @@ -29,7 +30,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 @@ -46,6 +47,12 @@ $colour4: #8a89ba -webkit-background-clip: $clip -moz-background-clip: $clip background-clip: $clip + +@mixin unscrew-box + -moz-box-sizing: border-box + -webkit-box-sizing: border-box + box-sizing: border-box + // }}} .openerp2 @@ -322,6 +329,67 @@ $colour4: #8a89ba @include box-shadow(none) // }}} + // Search View {{{ + .oe_searchview + position: relative + + .VS-search + .VS-search-inner + margin-right: 40px + + .VS-icon-cancel + right: 24px + + .oe_vs_unfold_drawer + position: absolute + top: 0 + right: 0 + height: 100% + line-height: 28px + padding: 0 7px 0 4px + color: #ccc + cursor: pointer + &:before + content: "▼" + + &.oe_searchview_open_drawer + .oe_searchview_drawer + display: table + + .oe_searchview_drawer + position: absolute + top: 100% + right: 0 + background-color: white + width: 432px + display: none + border: 1px solid #ccc + + > div + @include unscrew-box + display: table-cell + width: 50% + + h3 + margin: 2px 4px 2px 8px + color: $section-title-color + + ul + margin: 0 12px 3px + padding: 0 + list-style: none + + li + list-style: none + padding: 3px 6px + height: 14px + color: inherit + cursor: pointer + + &:hover + background-color: #f0f0fa + // }}} + .openerp // Transitional overrides for old styles {{{ // }}} -- cgit v1.2.3 From 995e4ed5df81fcee7276d2d4fe07170156cadc69 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 27 Mar 2012 15:33:15 +0200 Subject: [ADD] Add some styling to form bzr revid: fme@openerp.com-20120327133315-hjp7zvrguhh909n7 --- addons/web/static/src/css/base.sass | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 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 a1cc267ff89..35ea08ac887 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -322,9 +322,17 @@ $colour4: #8a89ba @include box-shadow(none) // }}} - // FormView Widgets {{{ - .oe_form_label_help[for], .oe_form_label[for] - white-space: nowrap + // FormView Layout {{{ + .oe_form + border: 1px solid black + margin: 5% + padding: 10px + .oe_form_status + background: #ccc + .oe_form_status_left + float: left + .oe_form_status_right + float: right .oe_form_group_cell .oe_form_button width: 100% @@ -345,6 +353,10 @@ $colour4: #8a89ba .oe_layout_debug_cell display: none // }}} + // FormView Widgets {{{ + .oe_form_label_help[for], .oe_form_label[for] + white-space: nowrap + // }}} // Transitional overrides for old styles {{{ .openerp -- cgit v1.2.3 From cd7ac077fd1e164b9474df136d5f8f28d5a8fce3 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 27 Mar 2012 16:34:41 +0200 Subject: [ADD] Add some generic classes bzr revid: fme@openerp.com-20120327143441-bs4z79ywhi50cfbb --- addons/web/static/src/css/base.sass | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 35ea08ac887..0f731d167fe 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -322,6 +322,14 @@ $colour4: #8a89ba @include box-shadow(none) // }}} + // Generic classes {{{ + .oe_left + float: left + .oe_right + float: right + .oe_clear + clear: both + // }}} // FormView Layout {{{ .oe_form border: 1px solid black @@ -329,10 +337,6 @@ $colour4: #8a89ba padding: 10px .oe_form_status background: #ccc - .oe_form_status_left - float: left - .oe_form_status_right - float: right .oe_form_group_cell .oe_form_button width: 100% -- cgit v1.2.3 From d6d9e2602de2a7467fad2e2cbb3eb4e2208aae33 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 28 Mar 2012 00:20:41 +0200 Subject: sane table based layouting for oe_main bzr revid: al@openerp.com-20120327222041-kum3fp8nopnnbcdp --- addons/web/static/src/css/base.sass | 67 ++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 39 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 0f731d167fe..5dead080904 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,8 +1,8 @@ + // Variables {{{ $colour4: #8a89ba //$colour4: #d14836 // }}} - // Mixins {{{ @mixin vertical-gradient($startColor: #555, $endColor: #333) background-color: $startColor @@ -61,21 +61,14 @@ $colour4: #8a89ba a text-decoration: none // }}} - - // WebClient {{{ - .oe_webclient - .oe_application - position: absolute - top: 33px - bottom: 0 - left: 222px - right: 0 - a - color: $colour4 - &:hover - text-decoration: underline + // Generic classes {{{ + .oe_left + float: left + .oe_right + float: right + .oe_clear + clear: both // }}} - // Fullscreen mode {{{ .oe_content_full_screen .oe_application @@ -84,7 +77,11 @@ $colour4: #8a89ba .topbar, .leftbar display: none // }}} - + // Webclient {{{ + .oe_webclient + width: 100% + height: 100% + // }}} // Topbar {{{ .oe_topbar width: 100% @@ -128,20 +125,17 @@ $colour4: #8a89ba .oe_topbar_avatar vertical-align: top // }}} - - // Leftbar {{{ - .oe_leftbarbg - position: fixed - width: 220px - top: 0 - left: 0 + // Main {{{ + .oe_main + width: 100% height: 100% - background: #f0eeee - border-right: 1px solid #afafb6 - z-index: -1 + border-spacing: 0px + // }}} + // Leftbar {{{ .oe_leftbar - float: left width: 221px + background: #f0eeee + border-right: 1px solid #afafb6 text-shadow: 0 1px 1px white a.oe_logo display: block @@ -168,7 +162,13 @@ $colour4: #8a89ba color: #c81010 font-style: italic // }}} - + // Application {{{ + .oe_application + a + color: $colour4 + &:hover + text-decoration: underline + // }}} // Menu {{{ .oe_menu float: left @@ -259,7 +259,6 @@ $colour4: #8a89ba border-right: 4px solid transparent border-top: 4px solid #4c4c4c // }}} - // UserMenu {{{ .oe_user_menu float: right @@ -321,15 +320,6 @@ $colour4: #8a89ba @include vertical-gradient(#292929, #191919) @include box-shadow(none) // }}} - - // Generic classes {{{ - .oe_left - float: left - .oe_right - float: right - .oe_clear - clear: both - // }}} // FormView Layout {{{ .oe_form border: 1px solid black @@ -361,7 +351,6 @@ $colour4: #8a89ba .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap // }}} - // Transitional overrides for old styles {{{ .openerp .oe_form_field_many2one -- cgit v1.2.3 From 11fc6edd1b7770a2596ab055cb77857f3a8714d7 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 28 Mar 2012 12:41:18 +0200 Subject: [FIX] oe_form class should be root of form_view. Form Page layout is renamed to oe_form_page bzr revid: fme@openerp.com-20120328104118-gjzgatblytqjtrkg --- 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 d8251e501fe..389c88006f7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -336,7 +336,7 @@ $colour4: #8a89ba @include box-shadow(none) // }}} // FormView Layout {{{ - .oe_form + .oe_form_page border: 1px solid black margin: 5% padding: 10px -- cgit v1.2.3 From 4f3ed6b677a4af16d16604f39f647749dc9804a8 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 28 Mar 2012 15:17:35 +0200 Subject: css part1 bzr revid: al@openerp.com-20120328131735-2c7raapt12f5jb3x --- addons/web/static/src/css/base.sass | 275 ++++++++++++++++++++++++++---------- 1 file changed, 198 insertions(+), 77 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 389c88006f7..7e2ae5441e3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -49,7 +49,7 @@ $colour4: #8a89ba // }}} .openerp2 - // Common styles {{{ + // Global style {{{ padding: 0 margin: 0 font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif @@ -60,6 +60,73 @@ $colour4: #8a89ba a text-decoration: none + + // buttons + a.button:link, a.button:visited, button, input[type='submit'] + display: inline-block + border: 1px solid #ababab + color: #404040 + margin: 0 + padding: 4px 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: 90px + @include vertical-gradient($colour4, darken($colour4, 3%)) + + button.unfollow + display: none + color: white + width: 90px + @include vertical-gradient(#dc5f59, #b33630) + + + // }}} // Generic classes {{{ .oe_left @@ -125,11 +192,66 @@ $colour4: #8a89ba .oe_topbar_avatar vertical-align: top // }}} - // Main {{{ - .oe_main - width: 100% - height: 100% - border-spacing: 0px + // TopBarUserMenu {{{ + .oe_user_menu + float: right + padding: 0 + margin: 0 + li + list-style-type: none + float: left + .oe_dropdown + position: relative + + .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_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 + 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) // }}} // Leftbar {{{ .oe_leftbar @@ -162,13 +284,6 @@ $colour4: #8a89ba color: #c81010 font-style: italic // }}} - // Application {{{ - .oe_application - a - color: $colour4 - &:hover - text-decoration: underline - // }}} // Menu {{{ .oe_menu float: left @@ -273,75 +388,77 @@ $colour4: #8a89ba border-right: 4px solid transparent border-top: 4px solid #4c4c4c // }}} - // UserMenu {{{ - .oe_dropdown - position: relative - - .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_user_menu - float: right - padding: 0 - margin: 0 - li - list-style-type: none - float: left - - .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 - 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) + // Main {{{ + .oe_main + width: 100% + height: 100% + border-spacing: 0px + // }}} + // Application to rename into action {{{ + .oe_application + a + color: $colour4 + &:hover + text-decoration: underline // }}} // FormView Layout {{{ - .oe_form_page + .oe_form_form border: 1px solid black margin: 5% padding: 10px - .oe_form_status - background: #ccc + .oe_form_topbar + border-bottom: 1px solid #cacaca + @include vertical-gradient(#fcfcfc, #dedede) + padding: 0 8px + line-height: 30px + button + font-size: 12px + height: 24px + line-height: 24px + vertical-align: top + padding: 0 10px + margin: 3px 0 + span.i + line-height: 20px + height: 24px + ul + height: 30px + 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 + list-style-type: none + float: left + vertical-align: top + 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 + 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 + .oe_form_steps_active + font-weight: bold + color: #b33630 + .oe_form_group_cell .oe_form_button width: 100% @@ -361,11 +478,15 @@ $colour4: #8a89ba display: block .oe_layout_debug_cell display: none + + + // }}} // FormView Widgets {{{ .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap // }}} + // Transitional overrides for old styles {{{ .openerp .oe_form_field_many2one -- cgit v1.2.3 From c2f7961915ae46d52a898e615e9cfb72504ee5fd Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 28 Mar 2012 16:37:20 +0200 Subject: css part2 bzr revid: al@openerp.com-20120328143720-tcgbovoukqsyerxc --- addons/web/static/src/css/base.sass | 38 ++++++++++++++++++++++++++++++++----- 1 file changed, 33 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 7e2ae5441e3..9a0ab5692c6 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -402,10 +402,9 @@ $colour4: #8a89ba text-decoration: underline // }}} // FormView Layout {{{ - .oe_form_form - border: 1px solid black - margin: 5% - padding: 10px + .oe_form + label + font-weight: bold .oe_form_topbar border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) @@ -458,8 +457,37 @@ $colour4: #8a89ba .oe_form_steps_active font-weight: bold color: #b33630 - + .oe_form_sheetbg + background: url(/web/static/src/img/form_sheetbg.png) + padding: 8px + border-bottom: 1px solid #ddd + .oe_form_sheet_width + min-width: 650px + max-width: 880px + margin: 0 auto + .oe_form_sheet + padding-top: 8px + background: white + min-height: 420px + border: 1px solid #afafb6 + @include box-shadow(0 0 10px rgba(0,0,0,0.3)) + //.avatar + // max-height: 52px + //.contacts + // li + // float: left + // width: 33% + // margin-bottom: 4px + // .avatar + // height: 40px + // width: 40px + // border: 1px solid + // border-color: #e5e5e5 #dbdbdb #d2d2d2 + // .data + // padding: 2px + // line-height: 18px .oe_form_group_cell + line-height: 18px .oe_form_button width: 100% white-space: nowrap -- cgit v1.2.3 From 3f797c566d941e88024a3a4c7d7bec50dbe95d1d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 28 Mar 2012 16:44:42 +0200 Subject: [IMP] styling of faceted search view to better match mit design bzr revid: xmo@openerp.com-20120328144442-lk2b78kbz9r1wmds --- addons/web/static/src/css/base.sass | 75 ++++++++++++++++++++++++++++++++++++- 1 file changed, 73 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 c4015fcf791..cfc69f67883 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,5 +1,7 @@ // Variables {{{ $section-title-color: #8786b7 +$facets-border: #afafb6 +$facets-border-selected: #a6a6fe $colour4: #8a89ba //$colour4: #d14836 // }}} @@ -334,8 +336,77 @@ $colour4: #8a89ba position: relative .VS-search + .VS-search-box + min-height: 0 + border-width: 1px + padding: 1px 0 + + .VS-icon + top: 5px + + .VS-icon-search + left: 5px + .VS-search-inner - margin-right: 40px + margin: 0 40px 0 17px + font-size: 13px + + input + font-size: inherit + line-height: inherit + height: auto + padding: 0 + + .VS-input-width-tester + font-size: inherit + padding: 0 + + .search_input + margin-left: 0 + height: 20px + input, .VS-input-width-tester + padding: 0 2px + height: inherit + margin: 0 + + .search_facet + padding: 0 + margin: 0 + border: 1px solid $facets-border + @include radius(3px) + background: #f0f0fa + height: 18px + + &.is_selected + border-color: $facets-border-selected + + .category + margin-left: 0 + .VS-icon-cancel + // don't change the icon on selection + @include opacity(1.0) + background-position: center 0 + + .category + padding: 0 4px 0 14px + color: white + background: #8786b7 + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) + font-weight: normal + text-transform: none + height: 18px + line-height: 18px + font-size: inherit + + .search_facet_input_container + border-left: 1px solid $facets-border + height: 18px + line-height: 18px + padding: 0 4px + + .search_facet_remove + left: 1px + top: 3px .VS-icon-cancel right: 24px @@ -345,7 +416,7 @@ $colour4: #8a89ba top: 0 right: 0 height: 100% - line-height: 28px + line-height: 23px padding: 0 7px 0 4px color: #ccc cursor: pointer -- cgit v1.2.3 From 0e5e0d2d9b9da6de76161fa7d28c87f45dd09aa5 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 28 Mar 2012 18:09:27 +0200 Subject: css part3 bzr revid: al@openerp.com-20120328160927-m603b9q679lcg1tn --- 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 9a0ab5692c6..b637472bee9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -486,6 +486,8 @@ $colour4: #8a89ba // .data // padding: 2px // line-height: 18px + .oe_form_header + padding: 4px 16px .oe_form_group_cell line-height: 18px .oe_form_button -- cgit v1.2.3 From 948c888afb15746a78887f966c654792509b2286 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 29 Mar 2012 16:31:13 +0200 Subject: [IMP] Extend table to the whole chrome bzr revid: fme@openerp.com-20120329143113-fhpks1tol8lso09s --- addons/web/static/src/css/base.sass | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 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 b637472bee9..ca2d5ee2e29 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -191,18 +191,6 @@ $colour4: #8a89ba @include radius(4px) .oe_topbar_avatar vertical-align: top - // }}} - // TopBarUserMenu {{{ - .oe_user_menu - float: right - padding: 0 - margin: 0 - li - list-style-type: none - float: left - .oe_dropdown - position: relative - .oe_dropdown_toggle:after width: 0 height: 0 @@ -216,7 +204,17 @@ $colour4: #8a89ba border-right: 4px solid transparent border-top: 4px solid white @include opacity(0.5) - + // }}} + // TopBarUserMenu {{{ + .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 @@ -255,11 +253,12 @@ $colour4: #8a89ba // }}} // Leftbar {{{ .oe_leftbar - width: 221px + width: 220px background: #f0eeee border-right: 1px solid #afafb6 text-shadow: 0 1px 1px white a.oe_logo + width: 220px display: block text-align: center height: 70px @@ -396,6 +395,7 @@ $colour4: #8a89ba // }}} // Application to rename into action {{{ .oe_application + width: 100% a color: $colour4 &:hover -- cgit v1.2.3 From 656824a64274861694b3ed1abd988faf27512840 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 30 Mar 2012 17:21:30 +0200 Subject: css kanban part1 bzr revid: mit@openerp.com-20120330152130-l0qyrll1xawz03g4 --- addons/web/static/src/css/base.sass | 94 ++++++++++++++++++++++++++++++++++--- 1 file changed, 87 insertions(+), 7 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 ca2d5ee2e29..86b1442663d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -124,7 +124,49 @@ $colour4: #8a89ba color: white width: 90px @include vertical-gradient(#dc5f59, #b33630) - + + // Tag reset {{{ + 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 + line-height: 18px + 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 + margin: 0 + padding: 0 + + li + list-style-type: none + // }}} // }}} @@ -289,7 +331,6 @@ $colour4: #8a89ba padding: 0 margin: 0 li - list-style-type: none float: left a display: block @@ -334,7 +375,6 @@ $colour4: #8a89ba li position: relative padding: 1px 0 1px 16px - list-style-type: none a display: block color: #4c4c4c @@ -430,7 +470,6 @@ $colour4: #8a89ba li padding: 0 margin: 0 - list-style-type: none float: left vertical-align: top border-right: 1px solid #cacaca @@ -512,9 +551,50 @@ $colour4: #8a89ba // }}} - // FormView Widgets {{{ - .oe_form_label_help[for], .oe_form_label[for] - white-space: nowrap + // Kanban view {{{ + .oe_kanban_group_title + margin: 1px 1px 4px + font-size: 15px + font-weight: bold + text-shadow: 0 1px 0 white + .oe_kanban_column, .oe_kanban_group_header + width: 240px + vertical-align: top + padding: 6px 7px 6px 6px + background: #f0eeee + border-left: 1px solid #f0f8f8 + border-right: 1px solid #b9b9b9 + .oe_kanban_record + position: relative + display: block + min-height: 50px + background: white + border: 1px solid #d8d8d8 + border-bottom-color: #b9b9b9 + padding: 6px + margin: 6px 0 + display: block + @include radius(4px) + &:last-child + margin-bottom: 0 + &:hover + @include box-shadow(0 0 3px rgba(0,0,0,0.6)) + .oe_kanban_title + font-weight: bold + margin: 2px 4px + .oe_kanban_gravatar + width: 20px + height: 20px + @include radius(3px) + @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) + // }}} + + // Application to rename into action {{{ + .oe_application + a + color: $colour4 + &:hover + text-decoration: underline // }}} // Transitional overrides for old styles {{{ -- cgit v1.2.3 From 93e70362e59b42936242be9c7fbc034843bd34b9 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 30 Mar 2012 17:42:27 +0200 Subject: [ADD] groundworks for advanced search * Possible to add an advanced search domain * Looks like shit * The facet itself uses a hardcoded name * Quite a few hacks bzr revid: xmo@openerp.com-20120330154227-gw1640rbb3rs9x5m --- addons/web/static/src/css/base.sass | 78 ++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 22 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 6ecacb5fc67..18a73210e7f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -436,44 +436,78 @@ $colour4: #8a89ba color: #ccc cursor: pointer &:before - content: "▼" + content: "▾" &.oe_searchview_open_drawer .oe_searchview_drawer - display: table + display: block .oe_searchview_drawer position: absolute top: 100% right: 0 background-color: white - width: 432px + width: 500px display: none border: 1px solid #ccc - > div - @include unscrew-box - display: table-cell - width: 50% + .oe_searchview_filters + display: table + width: 100% - h3 - margin: 2px 4px 2px 8px - color: $section-title-color + > div + @include unscrew-box + display: table-cell + width: 50% - ul - margin: 0 12px 3px - padding: 0 - list-style: none + h3 + margin: 2px 4px 2px 8px + color: $section-title-color - li - list-style: none - padding: 3px 6px - height: 14px - color: inherit - cursor: pointer + ul + margin: 0 12px 3px + padding: 0 + list-style: none + + li + list-style: none + padding: 3px 6px + height: 14px + color: inherit + cursor: pointer + + &:hover + background-color: #f0f0fa + + .oe_searchview_advanced + h4 + border-top: 1px solid #ccc + margin: 5px 0 3px + cursor: pointer + + h4:before + content: "▸ " + + div + display: none + + button.oe_add_condition:before + content: "⊞ " + button.oe_apply:before + content: "⚡ " + + ul + list-style: none + padding: 0 + li + list-style: none + margin: 0 - &:hover - background-color: #f0f0fa + &.oe_opened + h4:before + content: "▾ " + div + display: block // }}} .openerp -- cgit v1.2.3 From a5aa1bc1a7c7f5aeee290ccb5e5fdec9cd28a00c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 1 Apr 2012 23:55:07 +0200 Subject: notebook styling bzr revid: al@openerp.com-20120401215507-yxxvpphhm788fq8f --- addons/web/static/src/css/base.sass | 40 ++++++++++++++++++++++++++++++++++++- 1 file changed, 39 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 ca2d5ee2e29..d1d59a88f69 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -509,7 +509,44 @@ $colour4: #8a89ba .oe_layout_debug_cell display: none - + .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 // }}} // FormView Widgets {{{ @@ -530,3 +567,4 @@ $colour4: #8a89ba // 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 ab3d43e55e943e4f041555f8c385cf734af6c1d0 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 2 Apr 2012 15:04:43 +0200 Subject: tabs hide bzr revid: al@openerp.com-20120402130443-f4dpgmz5co87ejd1 --- addons/web/static/src/css/base.sass | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 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 d1d59a88f69..6593f922a68 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -508,7 +508,14 @@ $colour4: #8a89ba display: block .oe_layout_debug_cell display: none + // }}} + + // FormView Widgets {{{ + .oe_form_label_help[for], .oe_form_label[for] + white-space: nowrap + // }}} + // FormView Notebook {{{ .oe_form_notebook margin: 8px 0 padding: 0 8px @@ -547,12 +554,10 @@ $colour4: #8a89ba border: 1px solid #ddd border-bottom-color: transparent cursor: default + .ui-tabs-hide + display: none // }}} - // FormView Widgets {{{ - .oe_form_label_help[for], .oe_form_label[for] - white-space: nowrap - // }}} // Transitional overrides for old styles {{{ .openerp -- cgit v1.2.3 From 037793e811b16c8b316dc23dc87a4e832e8482e1 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 2 Apr 2012 17:56:50 +0200 Subject: Styling of sidebar dropdown menu bzr revid: mit@openerp.com-20120402155650-6wuiymgslior2vfz --- addons/web/static/src/css/base.sass | 53 +++++++++++++++++++++++++++++++++++++ 1 file changed, 53 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 2214394ca4c..ab1c3c0ec99 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -587,6 +587,59 @@ $colour4: #8a89ba border-bottom-color: transparent cursor: default + + .oe_form_dropdown_section + position: relative + display: inline-block + margin-right: 4px + + .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 + width: 120px + overflow-x: hidden + z-index: 900 + background: white + @include radius(3px) + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + li + 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 + &:hover + text-decoration: none + @include vertical-gradient(#f0f0fa, #eeeef6) + @include box-shadow(none) + // }}} // Kanban view {{{ .oe_kanban_group_title -- cgit v1.2.3 From 013c5255f53cefd382a1ccb38ec56dc724ac467c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 3 Apr 2012 09:41:22 +0200 Subject: [IMP] use pointer cursor on readonly facet values (instead of text) bzr revid: xmo@openerp.com-20120403074122-3kwoijz9952hcxfw --- 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 18a73210e7f..c4ce3364c3a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -418,6 +418,7 @@ $colour4: #8a89ba height: 18px line-height: 18px padding: 0 4px + cursor: pointer .search_facet_remove left: 1px -- cgit v1.2.3 From 9ec3559e006bba6881542c6aff297933149a7b8e Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 3 Apr 2012 09:55:23 +0200 Subject: [IMP] clearer selection of facets (add some box shadow) bzr revid: xmo@openerp.com-20120403075523-gzxqklvjhx1ikjlt --- addons/web/static/src/css/base.sass | 7 ++++--- 1 file changed, 4 insertions(+), 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 c4ce3364c3a..5757d4f5ab4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -354,7 +354,7 @@ $colour4: #8a89ba .VS-search-box min-height: 0 border-width: 1px - padding: 1px 0 + padding: 0 .VS-icon top: 5px @@ -378,7 +378,7 @@ $colour4: #8a89ba .search_input margin-left: 0 - height: 20px + height: 22px input, .VS-input-width-tester padding: 0 2px height: inherit @@ -386,7 +386,7 @@ $colour4: #8a89ba .search_facet padding: 0 - margin: 0 + margin: 1px 0 border: 1px solid $facets-border @include radius(3px) background: #f0f0fa @@ -394,6 +394,7 @@ $colour4: #8a89ba &.is_selected border-color: $facets-border-selected + @include box-shadow(0 0 3px 1px $facets-border-selected) .category margin-left: 0 -- cgit v1.2.3 From e9f4fc98cc98dab4ca1fdab2f6d9697485934beb Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 3 Apr 2012 16:15:53 +0200 Subject: [ADD] display unhelpful message when a list view search yields no result bzr revid: xmo@openerp.com-20120403141553-hrv006vdkv70zyfu --- addons/web/static/src/css/base.sass | 14 ++++++++++++++ 1 file changed, 14 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 c31f501c499..ecc45f5f538 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -337,6 +337,20 @@ $colour4: #8a89ba @include box-shadow(none) // }}} + + // ListView {{{ + .oe-listview + .oe_listview_nocontent + > img + float: left + margin-right: 1.5em + > div + // don't encroach on my arrow + overflow: hidden + font-size: 150% + width: 60ex + // }}} + .openerp // Transitional overrides for old styles {{{ // }}} -- cgit v1.2.3 From bf51fd87daab316a9aa6054af279f96e23a72e8d Mon Sep 17 00:00:00 2001 From: kjo <> Date: Thu, 5 Apr 2012 15:42:54 +0530 Subject: [IMP]generated css using compiler sass bzr revid: sbh@tinyerp.com-20120405101254-35rtolfp7gjypaqg --- addons/web/static/src/css/base.sass | 20 ++++++++++++++++++++ 1 file changed, 20 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 c31f501c499..fda9e10a0f0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -238,6 +238,16 @@ $colour4: #8a89ba 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 + float: right + background: #eeeeee + color: #8a89ba + font-weight: bold + border-width: 1px + padding-top: 2px + padding-right: 4px + padding-left: 4px + border-radius: 2px .oe_active background: $colour4 border-top: 1px solid lightGray @@ -251,6 +261,16 @@ $colour4: #8a89ba color: $colour4 text-shadow: 0 1px 1px white @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2)) + .oe_menu_counter + float: right + background: #eeeeee + color: #8a89ba + font-weight: bold + border-width: 1px + padding-top: 2px + padding-right: 4px + padding-left: 4px + border-radius: 2px .oe_menu_toggler:before width: 0 height: 0 -- cgit v1.2.3 From 00d70016c95d7c30cfb3c00d10c5164e01491631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 5 Apr 2012 18:11:48 +0200 Subject: [IMP] Improved css to match more closely MIT design. bzr revid: tde@openerp.com-20120405161148-wh0vpgwalmkxffjw --- addons/web/static/src/css/base.sass | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 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 fda9e10a0f0..ba29a42b197 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -238,16 +238,16 @@ $colour4: #8a89ba 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 - float: right - background: #eeeeee - color: #8a89ba - font-weight: bold - border-width: 1px - padding-top: 2px - padding-right: 4px - padding-left: 4px - border-radius: 2px + .oe_menu_counter + float: right + background: #8a89ba + color: #eee + font-size: 12px + border: 1px solid lightgray + padding: 0px 4px 0px 4px + text-shadow: 0 1px 1px rgba(0,0,0,0.2) + margin: 0px + @include radius(4px) .oe_active background: $colour4 border-top: 1px solid lightGray @@ -262,15 +262,8 @@ $colour4: #8a89ba text-shadow: 0 1px 1px white @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2)) .oe_menu_counter - float: right - background: #eeeeee + background: #eee color: #8a89ba - font-weight: bold - border-width: 1px - padding-top: 2px - padding-right: 4px - padding-left: 4px - border-radius: 2px .oe_menu_toggler:before width: 0 height: 0 -- cgit v1.2.3 From 34700ec4aa7129a728f5984919e3c276a69441c3 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 7 Apr 2012 15:44:59 +0200 Subject: MERGE (manual from mit branch) bzr revid: al@openerp.com-20120407134459-ep6brxjvxetnchy1 --- addons/web/static/src/css/base.sass | 249 +++++++++++++++++++++++++++++++++++- 1 file changed, 247 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 2b5c2b007f9..a5bcbd2aa5a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,3 +1,13 @@ +@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 // Variables {{{ $section-title-color: #8786b7 @@ -32,7 +42,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 @@ -58,6 +68,14 @@ $colour4: #8a89ba // }}} .openerp2 + + // Global style {{{ + .oe_i + font-family: "mnmliconsRegular" !important + font-size: 21px + font-weight: 300 !important + // }}} + // Global style {{{ padding: 0 margin: 0 @@ -66,7 +84,7 @@ $colour4: #8a89ba font-size: 13px background: white position: relative - + height: 100% a text-decoration: none @@ -455,6 +473,10 @@ $colour4: #8a89ba height: 100% border-spacing: 0px // }}} + // Main {{{ + .view-manager-main-table + width: 100% + // }}} // Application to rename into action {{{ .oe_application width: 100% @@ -463,6 +485,177 @@ $colour4: #8a89ba &:hover text-decoration: underline // }}} + + + // Content Header {{{ + .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 + 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) + // }}} + + + + // FormView Layout {{{ + .searcharea + position: relative + float: right + .toggle-button + position: absolute + top: 10px + right: 8px + width: 0 + height: 0 + display: inline-block + content: "&darr" + vertical-align: top + border-top: 5px solid #4c4c4c + border-left: 5px solid transparent + border-right: 5px solid transparent + @include opacity(0.5) + &:hover + @include opacity(0.8) + .searchmenu + display: none + position: absolute + top: 30px + right: 7px + border: 1px solid #afafb6 + width: 432px + overflow-x: hidden + z-index: 900 + background: white + @include radius(5px) + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + .dropdown-menu + input + width: 120px + input + width: 25px + .toggle:before + margin-left: 0 + margin-top: 9px + .open:before + margin-top: 14px + .menu + &:last-child + margin-bottom: 0 + li + padding-left: 12px + margin-right: 8px + .custom-filters + a:hover:after + content: 'd' + font-family: "mnmliconsRegular" !important + font-size: 18px + font-weight: 300 !important + float: right + margin-top: -1px + a + height: 14px + line-height: 14px + padding: 3px 6px + color: #4c4c4c + &:hover + text-decoration: none + @include vertical-gradient(#f0f0fa, #eeeef6) + p + margin-left: 12px + input, textarea + height: 14px + padding: 2px + font-size: 11px + line-height: 18px + border: 1px solid #ccc + @include radius(3px) + .column + width: 48% + .full-column + margin: 8px 0 + padding: 4px + + input.searchbox + width: 410px + border: 1px solid #ababab + margin-top: 0 + margin-bottom: 0 + padding: 4px 19px + font-size: 13px + background: url('/web/static/src/img/search.png') no-repeat 5px + background-color: white + @include radius(13px) + @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset) + + .search-clear + position: absolute + top: 7px + right: 24px + width: 12px + height: 12px + cursor: pointer + display: none + // }}} + // FormView Layout {{{ .oe_form label @@ -672,6 +865,58 @@ $colour4: #8a89ba @include vertical-gradient(#f0f0fa, #eeeef6) @include box-shadow(none) + // List view {{{ + .oe-listview-content + width: 100% + thead, tfoot + border-bottom: 2px solid #cacaca + background: #eee + tfoot + border-top: 1px solid #cacaca + border-top: 2px solid #cacaca + border-bottom: 1px solid #cacaca + font-weight: bold + tbody + cursor: pointer + background: white + thead + vertical-align: top + td:first-child, th:first-child + width: 17px + &:after + border-width: 0 + tbody tr:nth-child(odd) td, tbody tr:nth-child(odd) th + background-color: #f0f0fa + @include vertical-gradient(#f0f0fa, #eeeef6) + tbody tr:hover td, tbody tr:hover th + @include vertical-gradient(#eee, #dedede) + td, th + padding: 3px 6px + line-height: 18px + .numeric + text-align: right + width: 82px + input + text-align: right + //thead th:after + //content: "" + //float: right + //margin-top: 7px + //border-width: 0 4px 4px + //border-style: solid + //border-color: #000 transparent + //visibility: hidden + table .sortdown:after, table .sortdown:hover:after + visibility: visible + @include opacity(0.6) + table .sortup: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) // }}} // Kanban view {{{ .oe_kanban_group_title -- cgit v1.2.3 From f1ffb6227ed402b4ea8523ee93a56f5ea8c60856 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 7 Apr 2012 16:00:06 +0200 Subject: sass reorg part1, dont include base_old bzr revid: al@openerp.com-20120407140006-6ali9prtrii9806a --- addons/web/static/src/css/base.sass | 826 +++++++++++++++++------------------- 1 file changed, 401 insertions(+), 425 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 a5bcbd2aa5a..aa796154929 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,5 +1,12 @@ @charset "utf-8" +// Variables {{{ +$section-title-color: #8786b7 +$facets-border: #afafb6 +$facets-border-selected: #a6a6fe +$colour4: #8a89ba +// }}} +// Mixins {{{ @font-face font-family: 'mnmliconsRegular' src: url('/web/static/src/font/mnmliconsv21-webfont.eot') format('eot') @@ -9,14 +16,6 @@ font-weight: normal font-style: normal -// Variables {{{ -$section-title-color: #8786b7 -$facets-border: #afafb6 -$facets-border-selected: #a6a6fe -$colour4: #8a89ba -//$colour4: #d14836 -// }}} -// Mixins {{{ @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 */ @@ -68,14 +67,6 @@ $colour4: #8a89ba // }}} .openerp2 - - // Global style {{{ - .oe_i - font-family: "mnmliconsRegular" !important - font-size: 21px - font-weight: 300 !important - // }}} - // Global style {{{ padding: 0 margin: 0 @@ -85,10 +76,65 @@ $colour4: #8a89ba background: white position: relative height: 100% + a text-decoration: none + // }}} + // Tag reset {{{ + 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 + line-height: 18px + 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) - // buttons + .numeric + text-align: right + width: 82px + input + text-align: right + ul, li + margin: 0 + padding: 0 + + li + list-style-type: none + // }}} + // Generic classes {{{ + .oe_i + font-family: "mnmliconsRegular" !important + font-size: 21px + font-weight: 300 !important + .oe_left + float: left + .oe_right + float: right + .oe_clear + clear: both + // }}} + // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'] display: inline-block border: 1px solid #ababab @@ -152,58 +198,6 @@ $colour4: #8a89ba width: 90px @include vertical-gradient(#dc5f59, #b33630) - // Tag reset {{{ - 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 - line-height: 18px - 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 - margin: 0 - padding: 0 - - li - list-style-type: none - // }}} - - - // }}} - // Generic classes {{{ - .oe_left - float: left - .oe_right - float: right - .oe_clear - clear: both // }}} // Fullscreen mode {{{ .oe_content_full_screen @@ -472,12 +466,10 @@ $colour4: #8a89ba width: 100% height: 100% border-spacing: 0px - // }}} - // Main {{{ .view-manager-main-table width: 100% // }}} - // Application to rename into action {{{ + // ActionManager {{{ .oe_application width: 100% a @@ -485,123 +477,283 @@ $colour4: #8a89ba &:hover text-decoration: underline // }}} + // SearchView {{{ + .oe_searchview + position: relative + .VS-search + .VS-search-box + min-height: 0 + border-width: 1px + padding: 0 - // Content Header {{{ - .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 - 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) - // }}} + .VS-icon + top: 5px + .VS-icon-search + left: 5px + .VS-search-inner + margin: 0 40px 0 17px + font-size: 13px - // FormView Layout {{{ - .searcharea - position: relative - float: right - .toggle-button - position: absolute - top: 10px - right: 8px - width: 0 - height: 0 - display: inline-block - content: "&darr" - vertical-align: top - border-top: 5px solid #4c4c4c - border-left: 5px solid transparent - border-right: 5px solid transparent - @include opacity(0.5) - &:hover - @include opacity(0.8) - .searchmenu - display: none - position: absolute - top: 30px - right: 7px - border: 1px solid #afafb6 - width: 432px - overflow-x: hidden - z-index: 900 - background: white - @include radius(5px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - .dropdown-menu input - width: 120px - input - width: 25px - .toggle:before - margin-left: 0 - margin-top: 9px - .open:before - margin-top: 14px - .menu - &:last-child - margin-bottom: 0 - li - padding-left: 12px + font-size: inherit + line-height: inherit + height: auto + padding: 0 + + .VS-input-width-tester + font-size: inherit + padding: 0 + + .search_input + margin-left: 0 + height: 22px + input, .VS-input-width-tester + padding: 0 2px + height: inherit + margin: 0 + + .search_facet + padding: 0 + margin: 1px 0 + border: 1px solid $facets-border + @include radius(3px) + background: #f0f0fa + height: 18px + + &.is_selected + border-color: $facets-border-selected + @include box-shadow(0 0 3px 1px $facets-border-selected) + + .category + margin-left: 0 + .VS-icon-cancel + // don't change the icon on selection + @include opacity(1.0) + background-position: center 0 + + .category + padding: 0 4px 0 14px + color: white + background: #8786b7 + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) + font-weight: normal + text-transform: none + height: 18px + line-height: 18px + font-size: inherit + + .search_facet_input_container + border-left: 1px solid $facets-border + height: 18px + line-height: 18px + padding: 0 4px + cursor: pointer + + .search_facet_remove + left: 1px + top: 3px + + .VS-icon-cancel + right: 24px + + .oe_vs_unfold_drawer + position: absolute + top: 0 + right: 0 + height: 100% + line-height: 23px + padding: 0 7px 0 4px + color: #ccc + cursor: pointer + &:before + content: "▾" + + &.oe_searchview_open_drawer + .oe_searchview_drawer + display: block + + .oe_searchview_drawer + position: absolute + top: 100% + right: 0 + background-color: white + width: 500px + display: none + border: 1px solid #ccc + + .oe_searchview_filters + display: table + width: 100% + + > div + @include unscrew-box + display: table-cell + width: 50% + + h3 + margin: 2px 4px 2px 8px + color: $section-title-color + + ul + margin: 0 12px 3px + padding: 0 + list-style: none + + li + list-style: none + padding: 3px 6px + height: 14px + color: inherit + cursor: pointer + + &:hover + background-color: #f0f0fa + + .oe_searchview_advanced + h4 + border-top: 1px solid #ccc + margin: 5px 0 3px + cursor: pointer + + h4:before + content: "▸ " + + div + display: none + + button.oe_add_condition:before + content: "⊞ " + button.oe_apply:before + content: "⚡ " + + ul + list-style: none + padding: 0 + li + list-style: none + margin: 0 + + &.oe_opened + h4:before + content: "▾ " + div + display: block + // }}} + // Content Header {{{ + .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 + 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 SearchView v2 Layout {{{ + .searcharea + position: relative + float: right + .toggle-button + position: absolute + top: 10px + right: 8px + width: 0 + height: 0 + display: inline-block + content: "&darr" + vertical-align: top + border-top: 5px solid #4c4c4c + border-left: 5px solid transparent + border-right: 5px solid transparent + @include opacity(0.5) + &:hover + @include opacity(0.8) + .searchmenu + display: none + position: absolute + top: 30px + right: 7px + border: 1px solid #afafb6 + width: 432px + overflow-x: hidden + z-index: 900 + background: white + @include radius(5px) + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + .dropdown-menu + input + width: 120px + input + width: 25px + .toggle:before + margin-left: 0 + margin-top: 9px + .open:before + margin-top: 14px + .menu + &:last-child + margin-bottom: 0 + li + padding-left: 12px margin-right: 8px .custom-filters a:hover:after @@ -646,16 +798,69 @@ $colour4: #8a89ba @include radius(13px) @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset) - .search-clear - position: absolute - top: 7px - right: 24px - width: 12px - height: 12px - cursor: pointer - display: none + .search-clear + position: absolute + top: 7px + right: 24px + width: 12px + height: 12px + cursor: pointer + display: none + // }}} + // ViewManager Dropdown {{{ + .oe_form_dropdown_section + position: relative + display: inline-block + margin-right: 4px + + .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 + width: 120px + overflow-x: hidden + z-index: 900 + background: white + @include radius(3px) + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + li + 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 + &:hover + text-decoration: none + @include vertical-gradient(#f0f0fa, #eeeef6) + @include box-shadow(none) + // }}} - // FormView Layout {{{ .oe_form label @@ -763,12 +968,10 @@ $colour4: #8a89ba .oe_layout_debug_cell display: none // }}} - - // FormView Widgets {{{ + // FormView Label {{{ .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap // }}} - // FormView Notebook {{{ .oe_form_notebook margin: 8px 0 @@ -811,61 +1014,8 @@ $colour4: #8a89ba .ui-tabs-hide display: none - // FormView Dropdown {{{ - - .oe_form_dropdown_section - position: relative - display: inline-block - margin-right: 4px - - .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 - width: 120px - overflow-x: hidden - z-index: 900 - background: white - @include radius(3px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - li - 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 - &:hover - text-decoration: none - @include vertical-gradient(#f0f0fa, #eeeef6) - @include box-shadow(none) - - // List view {{{ + // }}} + // ListView {{{ .oe-listview-content width: 100% thead, tfoot @@ -918,7 +1068,7 @@ $colour4: #8a89ba @include box-shadow(none) @include opacity(0.6) // }}} - // Kanban view {{{ + // KanbanView {{{ .oe_kanban_group_title margin: 1px 1px 4px font-size: 15px @@ -956,180 +1106,6 @@ $colour4: #8a89ba @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) // }}} - // Application to rename into action {{{ - .oe_application - a - color: $colour4 - &:hover - text-decoration: underline - // }}} - - // Search View {{{ - .oe_searchview - position: relative - - .VS-search - .VS-search-box - min-height: 0 - border-width: 1px - padding: 0 - - .VS-icon - top: 5px - - .VS-icon-search - left: 5px - - .VS-search-inner - margin: 0 40px 0 17px - font-size: 13px - - input - font-size: inherit - line-height: inherit - height: auto - padding: 0 - - .VS-input-width-tester - font-size: inherit - padding: 0 - - .search_input - margin-left: 0 - height: 22px - input, .VS-input-width-tester - padding: 0 2px - height: inherit - margin: 0 - - .search_facet - padding: 0 - margin: 1px 0 - border: 1px solid $facets-border - @include radius(3px) - background: #f0f0fa - height: 18px - - &.is_selected - border-color: $facets-border-selected - @include box-shadow(0 0 3px 1px $facets-border-selected) - - .category - margin-left: 0 - .VS-icon-cancel - // don't change the icon on selection - @include opacity(1.0) - background-position: center 0 - - .category - padding: 0 4px 0 14px - color: white - background: #8786b7 - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) - font-weight: normal - text-transform: none - height: 18px - line-height: 18px - font-size: inherit - - .search_facet_input_container - border-left: 1px solid $facets-border - height: 18px - line-height: 18px - padding: 0 4px - cursor: pointer - - .search_facet_remove - left: 1px - top: 3px - - .VS-icon-cancel - right: 24px - - .oe_vs_unfold_drawer - position: absolute - top: 0 - right: 0 - height: 100% - line-height: 23px - padding: 0 7px 0 4px - color: #ccc - cursor: pointer - &:before - content: "▾" - - &.oe_searchview_open_drawer - .oe_searchview_drawer - display: block - - .oe_searchview_drawer - position: absolute - top: 100% - right: 0 - background-color: white - width: 500px - display: none - border: 1px solid #ccc - - .oe_searchview_filters - display: table - width: 100% - - > div - @include unscrew-box - display: table-cell - width: 50% - - h3 - margin: 2px 4px 2px 8px - color: $section-title-color - - ul - margin: 0 12px 3px - padding: 0 - list-style: none - - li - list-style: none - padding: 3px 6px - height: 14px - color: inherit - cursor: pointer - - &:hover - background-color: #f0f0fa - - .oe_searchview_advanced - h4 - border-top: 1px solid #ccc - margin: 5px 0 3px - cursor: pointer - - h4:before - content: "▸ " - - div - display: none - - button.oe_add_condition:before - content: "⊞ " - button.oe_apply:before - content: "⚡ " - - ul - list-style: none - padding: 0 - li - list-style: none - margin: 0 - - &.oe_opened - h4:before - content: "▾ " - div - display: block - // }}} - // Transitional overrides for old styles {{{ .openerp .oe_form_field_many2one -- cgit v1.2.3 From cfee631f1965f153a6b6489accac0280cf9422df Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 8 Apr 2012 16:33:01 +0200 Subject: css and xml bzr revid: al@openerp.com-20120408143301-31iicxhama860iu1 --- addons/web/static/src/css/base.sass | 154 +++++++++++++++++++++++++----------- 1 file changed, 109 insertions(+), 45 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 aa796154929..a37b03770aa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -99,17 +99,13 @@ $colour4: #8a89ba 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 @@ -118,7 +114,6 @@ $colour4: #8a89ba ul, li margin: 0 padding: 0 - li list-style-type: none // }}} @@ -199,19 +194,6 @@ $colour4: #8a89ba @include vertical-gradient(#dc5f59, #b33630) // }}} - // Fullscreen mode {{{ - .oe_content_full_screen - .oe_application - top: 0 - left: 0 - .topbar, .leftbar - display: none - // }}} - // Webclient {{{ - .oe_webclient - width: 100% - height: 100% - // }}} // Topbar {{{ .oe_topbar width: 100% @@ -461,13 +443,11 @@ $colour4: #8a89ba border-right: 4px solid transparent border-top: 4px solid #4c4c4c // }}} - // Main {{{ - .oe_main + // Webclient {{{ + .oe_webclient width: 100% height: 100% border-spacing: 0px - .view-manager-main-table - width: 100% // }}} // ActionManager {{{ .oe_application @@ -477,6 +457,14 @@ $colour4: #8a89ba &:hover text-decoration: underline // }}} + // Fullscreen mode {{{ + .oe_content_full_screen + .oe_application + top: 0 + left: 0 + .oe_topbar, .oe_leftbar + display: none + // }}} // SearchView {{{ .oe_searchview position: relative @@ -861,10 +849,108 @@ $colour4: #8a89ba @include box-shadow(none) // }}} - // FormView Layout {{{ + + // Content Header {{{ + .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_view_manager_row + height: 26px + line-height: 26px + margin: 8px + clear: both + text-shadow: 0 1px 1px white + h2 + float: left + font-size: 18px + margin: 1px 0 + a + color: $colour4 + .dropdown-toggle:after + margin-top: 7px + margin-left: 6px + border-top-color: #404040 + .filter + vertical-align: top + li + height: 24px + line-height: 24px + padding: 0 8px + .pagination + li + height: 24px + line-height: 24px + padding: 0 8px + .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_switch + li + padding-left: 1px + text-align: center + width: 24px + height: 24px + line-height: 24px + // }}} + + + // FormView Chrome {{{ + .oe_form_header + padding: 8px + .oe_form_buttons + padding-right: 8px + float: left + margin-right: 12px + .oe_form_pager + float: right + // FIXME + .oe-sidebar-attachments + display: none + + // }}} + // FormView Body {{{ .oe_form label font-weight: bold + .oe_form_group_cell + line-height: 18px + .oe_form_button + width: 100% + white-space: nowrap + .oe_layout_debugging + .oe_form_group + border: 2px dashed red + .oe_form_group_cell + border: 1px solid blue + padding-bottom: 1em + .oe_layout_debug_cell + color: white + background: #696 + font-size: 80% + text-align: center + .oe_layout_debug_cell + display: block + .oe_layout_debug_cell + display: none .oe_form_topbar border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) @@ -945,28 +1031,6 @@ $colour4: #8a89ba // .data // padding: 2px // line-height: 18px - .oe_form_header - padding: 4px 16px - .oe_form_group_cell - line-height: 18px - .oe_form_button - width: 100% - white-space: nowrap - .oe_layout_debugging - .oe_form_group - border: 2px dashed red - .oe_form_group_cell - border: 1px solid blue - padding-bottom: 1em - .oe_layout_debug_cell - color: white - background: #696 - font-size: 80% - text-align: center - .oe_layout_debug_cell - display: block - .oe_layout_debug_cell - display: none // }}} // FormView Label {{{ .oe_form_label_help[for], .oe_form_label[for] -- cgit v1.2.3 From 53e6b4b4a12acdc46ab613c995f0935519632a61 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 8 Apr 2012 17:06:33 +0200 Subject: fix loading bzr revid: al@openerp.com-20120408150633-k7g8pph11eey9at4 --- addons/web/static/src/css/base.sass | 53 ++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 18 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 a37b03770aa..ed01b04b2d2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -67,6 +67,12 @@ $colour4: #8a89ba // }}} .openerp2 + // {{{ Loading + // }}} + // {{{ Loading + // }}} + // {{{ Loading + // }}} // Global style {{{ padding: 0 margin: 0 @@ -128,6 +134,8 @@ $colour4: #8a89ba float: right .oe_clear clear: both + .oe_wait + cursor: wait // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'] @@ -194,6 +202,24 @@ $colour4: #8a89ba @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 + // }}} // Topbar {{{ .oe_topbar width: 100% @@ -849,8 +875,7 @@ $colour4: #8a89ba @include box-shadow(none) // }}} - - // Content Header {{{ + // ViewManager Header {{{ .oe_view_manager_header border-top: 1px solid #cacaca border-bottom: 1px solid #cacaca @@ -872,17 +897,12 @@ $colour4: #8a89ba margin-top: 7px margin-left: 6px border-top-color: #404040 - .filter + .oe_filter vertical-align: top li height: 24px line-height: 24px padding: 0 8px - .pagination - li - height: 24px - line-height: 24px - padding: 0 8px .oe_button_group display: inline-block border: 1px solid #ababab @@ -902,17 +922,14 @@ $colour4: #8a89ba a color: #fff text-shadow: 0 1px 2px rgba(0,0,0,0.4) - - .oe_view_manager_switch + .pagination li - padding-left: 1px - text-align: center - width: 24px height: 24px line-height: 24px + padding: 0 8px + .oe_view_manager_switch + float: right // }}} - - // FormView Chrome {{{ .oe_form_header padding: 8px @@ -928,9 +945,6 @@ $colour4: #8a89ba // }}} // FormView Body {{{ - .oe_form - label - font-weight: bold .oe_form_group_cell line-height: 18px .oe_form_button @@ -1033,6 +1047,9 @@ $colour4: #8a89ba // line-height: 18px // }}} // FormView Label {{{ + .oe_form + label + font-weight: bold .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap // }}} -- cgit v1.2.3 From 07202a9761123a167279e85a599d5497801b4cbf Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 8 Apr 2012 18:52:25 +0200 Subject: chrome cleanups: remove OldWidget, improve xml and css bzr revid: al@openerp.com-20120408165225-avsnq1t25uhvxjb1 --- addons/web/static/src/css/base.sass | 580 +++++++++++++++++++++--------------- 1 file changed, 345 insertions(+), 235 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 ed01b04b2d2..5b76f9a4d3d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -67,11 +67,7 @@ $colour4: #8a89ba // }}} .openerp2 - // {{{ Loading - // }}} - // {{{ Loading - // }}} - // {{{ Loading + // {{{ Group // }}} // Global style {{{ padding: 0 @@ -117,7 +113,7 @@ $colour4: #8a89ba width: 82px input text-align: right - ul, li + ul, li, ol margin: 0 padding: 0 li @@ -220,7 +216,136 @@ $colour4: #8a89ba border-bottom-right-radius: 8px border-bottom-left-radius: 8px // }}} - // Topbar {{{ + // Login {{{ + .oe_login + background: url("/web/static/src/img/pattern.png") repeat + color: #eee + text-align: center + font-size: 14px + height: 100% + li + list-style-type: none + padding-bottom: 4px + a + color: #eee + text-decoration: none + 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 + 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 + 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 + color: #000 + text-align: left + .oe_database_manager_menu + // }}} + // {{{ Notification + .oe_notification + z-index: 1050 + // }}} + // 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 @@ -276,7 +401,39 @@ $colour4: #8a89ba border-top: 4px solid white @include opacity(0.5) // }}} - // TopBarUserMenu {{{ + // Webclient.leftbar {{{ + .oe_leftbar + width: 220px + background: #f0eeee + border-right: 1px solid #afafb6 + text-shadow: 0 1px 1px white + 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 @@ -322,38 +479,6 @@ $colour4: #8a89ba @include vertical-gradient(#292929, #191919) @include box-shadow(none) // }}} - // Leftbar {{{ - .oe_leftbar - width: 220px - background: #f0eeee - border-right: 1px solid #afafb6 - text-shadow: 0 1px 1px white - 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 - // }}} // Menu {{{ .oe_menu float: left @@ -469,12 +594,6 @@ $colour4: #8a89ba border-right: 4px solid transparent border-top: 4px solid #4c4c4c // }}} - // Webclient {{{ - .oe_webclient - width: 100% - height: 100% - border-spacing: 0px - // }}} // ActionManager {{{ .oe_application width: 100% @@ -483,18 +602,184 @@ $colour4: #8a89ba &:hover text-decoration: underline // }}} - // Fullscreen mode {{{ - .oe_content_full_screen - .oe_application - top: 0 - left: 0 - .oe_topbar, .oe_leftbar - display: none + // Content Header {{{ + .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 + 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) // }}} - // SearchView {{{ - .oe_searchview + // ViewManager Header {{{ + .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_view_manager_row + height: 26px + line-height: 26px + margin: 8px + clear: both + text-shadow: 0 1px 1px white + h2 + float: left + font-size: 18px + margin: 1px 0 + a + color: $colour4 + .dropdown-toggle:after + margin-top: 7px + margin-left: 6px + border-top-color: #404040 + .oe_filter + vertical-align: top + li + height: 24px + line-height: 24px + padding: 0 8px + .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) + .pagination + li + height: 24px + line-height: 24px + padding: 0 8px + .oe_view_manager_switch + float: right + // }}} + // ViewManager Dropdown {{{ + .oe_form_dropdown_section position: relative + display: inline-block + margin-right: 4px + + .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 + width: 120px + overflow-x: hidden + z-index: 900 + background: white + @include radius(3px) + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + li + 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 + &:hover + text-decoration: none + @include vertical-gradient(#f0f0fa, #eeeef6) + @include box-shadow(none) + // }}} + // SearchView xmo {{{ + .oe_searchview + position: relative .VS-search .VS-search-box min-height: 0 @@ -656,73 +941,7 @@ $colour4: #8a89ba div display: block // }}} - // Content Header {{{ - .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 - 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 SearchView v2 Layout {{{ + // SearchView mit {{{ .searcharea position: relative float: right @@ -821,116 +1040,7 @@ $colour4: #8a89ba cursor: pointer display: none // }}} - // ViewManager Dropdown {{{ - .oe_form_dropdown_section - position: relative - display: inline-block - margin-right: 4px - - .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 - width: 120px - overflow-x: hidden - z-index: 900 - background: white - @include radius(3px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - li - 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 - &:hover - text-decoration: none - @include vertical-gradient(#f0f0fa, #eeeef6) - @include box-shadow(none) - - // }}} - // ViewManager Header {{{ - .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_view_manager_row - height: 26px - line-height: 26px - margin: 8px - clear: both - text-shadow: 0 1px 1px white - h2 - float: left - font-size: 18px - margin: 1px 0 - a - color: $colour4 - .dropdown-toggle:after - margin-top: 7px - margin-left: 6px - border-top-color: #404040 - .oe_filter - vertical-align: top - li - height: 24px - line-height: 24px - padding: 0 8px - .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) - .pagination - li - height: 24px - line-height: 24px - padding: 0 8px - .oe_view_manager_switch - float: right - // }}} - // FormView Chrome {{{ + // FormView.header {{{ .oe_form_header padding: 8px .oe_form_buttons @@ -944,7 +1054,7 @@ $colour4: #8a89ba display: none // }}} - // FormView Body {{{ + // FormView.body {{{ .oe_form_group_cell line-height: 18px .oe_form_button @@ -1046,14 +1156,14 @@ $colour4: #8a89ba // padding: 2px // line-height: 18px // }}} - // FormView Label {{{ + // FormView.label {{{ .oe_form label font-weight: bold .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap // }}} - // FormView Notebook {{{ + // FormView.notebook {{{ .oe_form_notebook margin: 8px 0 padding: 0 8px -- cgit v1.2.3 From 8ea5590e2cd741b41ec64205f713ba2e62c8ef5d Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 9 Apr 2012 00:42:01 +0200 Subject: databasemanager cleanups bzr revid: al@openerp.com-20120408224201-jpafsl49k1d01q3q --- addons/web/static/src/css/base.sass | 7 +++---- 1 file changed, 3 insertions(+), 4 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 5b76f9a4d3d..067a83cd33d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -219,16 +219,12 @@ $colour4: #8a89ba // Login {{{ .oe_login background: url("/web/static/src/img/pattern.png") repeat - color: #eee text-align: center font-size: 14px height: 100% li list-style-type: none padding-bottom: 4px - a - color: #eee - text-decoration: none button float: right display: inline-block @@ -282,6 +278,7 @@ $colour4: #8a89ba 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)) @@ -302,6 +299,7 @@ $colour4: #8a89ba width: 100% text-align: center a + color: #eee margin: 0 8px &:hover text-decoration: underline @@ -326,6 +324,7 @@ $colour4: #8a89ba color: #000 text-align: left .oe_database_manager_menu + color: #000 // }}} // {{{ Notification .oe_notification -- cgit v1.2.3 From 7b158acee539b1900e6e99f53df4715b5b481625 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 9 Apr 2012 02:39:01 +0200 Subject: core refactoring, split core into corelib.js and coresetup.js bzr revid: al@openerp.com-20120409003901-uo5wn6lj27yb6w7x --- addons/web/static/src/css/base.sass | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 067a83cd33d..521402bd71a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -216,6 +216,10 @@ $colour4: #8a89ba 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 @@ -321,15 +325,12 @@ $colour4: #8a89ba // }}} // {{{ DatabaseManager .oe_database_manager + background: #fff color: #000 text-align: left .oe_database_manager_menu color: #000 // }}} - // {{{ Notification - .oe_notification - z-index: 1050 - // }}} // WebClient {{{ .oe_webclient width: 100% -- cgit v1.2.3 From b4157132e0559c52117b77226661e9ce79ea54ed Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 9 Apr 2012 15:14:38 +0200 Subject: sidebar refactoring attachements broken bzr revid: al@openerp.com-20120409131438-9nmd5192z2oahjt6 --- addons/web/static/src/css/base.sass | 3 +-- 1 file changed, 1 insertion(+), 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 521402bd71a..417014aee78 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -602,7 +602,7 @@ $colour4: #8a89ba &:hover text-decoration: underline // }}} - // Content Header {{{ + // Content Header MIT {{{ .oe-view-manager-header border-top: 1px solid #cacaca border-bottom: 1px solid #cacaca @@ -647,7 +647,6 @@ $colour4: #8a89ba height: 24px line-height: 24px padding: 0 8px - .button-group display: inline-block border: 1px solid #ababab -- cgit v1.2.3 From d047526a89647482396df7993a097a40c7126e11 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 9 Apr 2012 17:38:18 +0200 Subject: form invalid bzr revid: al@openerp.com-20120409153818-wtk910fj67i0z1t3 --- addons/web/static/src/css/base.sass | 4 ++++ 1 file changed, 4 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 417014aee78..d7356660cd1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1054,6 +1054,10 @@ $colour4: #8a89ba // }}} // FormView.body {{{ + .oe_form_invalid + input, select, textarea + background-color: #F66 !important + border: 1px solid #D00 !important .oe_form_group_cell line-height: 18px .oe_form_button -- cgit v1.2.3 From 6d41ce134cb1f777b800e4598d304183b377eef6 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 9 Apr 2012 17:43:59 +0200 Subject: Fixed styling of searchbox bzr revid: mit@openerp.com-20120409154359-mnm1z7x986ixejkl --- addons/web/static/src/css/base.sass | 14 ++++++++++++-- 1 file changed, 12 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 417014aee78..8e6a722c195 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -779,12 +779,22 @@ $colour4: #8a89ba // SearchView xmo {{{ .oe_searchview position: relative + float: right .VS-search .VS-search-box min-height: 0 border-width: 1px padding: 0 - + width: 410px + //border: 1px solid #ababab + //margin-top: 0 + //margin-bottom: 0 + //padding: 4px 19px + //font-size: 13px + //background: url('../img/search.png') no-repeat 5px + //background-color: white + //@include radius(13px) + //@include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset) .VS-icon top: 5px @@ -878,7 +888,7 @@ $colour4: #8a89ba top: 100% right: 0 background-color: white - width: 500px + width: 410px display: none border: 1px solid #ccc -- cgit v1.2.3 From aa93523e3ac5d1b89111d4f636322967dd17f08e Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 9 Apr 2012 18:10:00 +0200 Subject: dont display sheet in dialog forms bzr revid: al@openerp.com-20120409161000-hpx81ccxzgnu6ozy --- addons/web/static/src/css/base.sass | 59 +++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 29 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 3f6d9265e93..e2dcc711960 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1139,35 +1139,36 @@ $colour4: #8a89ba .oe_form_steps_active font-weight: bold color: #b33630 - .oe_form_sheetbg - background: url(/web/static/src/img/form_sheetbg.png) - padding: 8px - border-bottom: 1px solid #ddd - .oe_form_sheet_width - min-width: 650px - max-width: 880px - margin: 0 auto - .oe_form_sheet - padding-top: 8px - background: white - min-height: 420px - border: 1px solid #afafb6 - @include box-shadow(0 0 10px rgba(0,0,0,0.3)) - //.avatar - // max-height: 52px - //.contacts - // li - // float: left - // width: 33% - // margin-bottom: 4px - // .avatar - // height: 40px - // width: 40px - // border: 1px solid - // border-color: #e5e5e5 #dbdbdb #d2d2d2 - // .data - // padding: 2px - // line-height: 18px + .oe_application + .oe_form_sheetbg + background: url(/web/static/src/img/form_sheetbg.png) + padding: 8px + border-bottom: 1px solid #ddd + .oe_form_sheet_width + min-width: 650px + max-width: 880px + margin: 0 auto + .oe_form_sheet + padding-top: 8px + background: white + min-height: 420px + border: 1px solid #afafb6 + @include box-shadow(0 0 10px rgba(0,0,0,0.3)) + //.avatar + // max-height: 52px + //.contacts + // li + // float: left + // width: 33% + // margin-bottom: 4px + // .avatar + // height: 40px + // width: 40px + // border: 1px solid + // border-color: #e5e5e5 #dbdbdb #d2d2d2 + // .data + // padding: 2px + // line-height: 18px // }}} // FormView.label {{{ .oe_form -- cgit v1.2.3 From e4944983ca3abe9110babc11e178db83fac80b13 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 9 Apr 2012 19:16:08 +0200 Subject: [IMP] Added separator styling bzr revid: fme@openerp.com-20120409171608-mq05tzh4c9u7c7ol --- addons/web/static/src/css/base.sass | 13 +++++++++++++ 1 file changed, 13 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 e2dcc711960..f9b0cb49f92 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1177,6 +1177,19 @@ $colour4: #8a89ba .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap // }}} + // FormView.separator {{{ + .oe_horizontal_separator + font-weight: bold + border: 0 solid #666 + border-bottom-width: 1px + margin: 3px 4px 3px 1px + height: 17px + .oe_horizontal_separator:empty + height: 5px + .oe_vertical_separator + border-left: 1px solid #666 + padding: 0 4px 0 4px + // }}} // FormView.notebook {{{ .oe_form_notebook margin: 8px 0 -- cgit v1.2.3 From bc92baa084205dbfbe1bc65b367ce11a8dcf9bf8 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 9 Apr 2012 20:43:30 +0200 Subject: [IMP] Improved styles bzr revid: fme@openerp.com-20120409184330-g8qp5pu5sonpc4tn --- addons/web/static/src/css/base.sass | 97 +++++++++++++++++++++++++++++++------ 1 file changed, 82 insertions(+), 15 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 f9b0cb49f92..6201312a7f4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -885,6 +885,7 @@ $colour4: #8a89ba .oe_searchview_drawer position: absolute + z-index: 1 top: 100% right: 0 background-color: white @@ -1073,21 +1074,6 @@ $colour4: #8a89ba .oe_form_button width: 100% white-space: nowrap - .oe_layout_debugging - .oe_form_group - border: 2px dashed red - .oe_form_group_cell - border: 1px solid blue - padding-bottom: 1em - .oe_layout_debug_cell - color: white - background: #696 - font-size: 80% - text-align: center - .oe_layout_debug_cell - display: block - .oe_layout_debug_cell - display: none .oe_form_topbar border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) @@ -1177,6 +1163,30 @@ $colour4: #8a89ba .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap // }}} + // FormView.binaryfile {{{ + /* 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 + width: 45px + height: 30px + input.oe-binary-file + z-index: 0 + line-height: 0 + font-size: 12px + position: absolute + // Should be adjusted for all browsers + top: 1px + right: 10px + opacity: 0 + filter: alpha(opacity = 0) + -ms-filter: "alpha(opacity=0)" + margin: 0 + padding: 0 + // }}} // FormView.separator {{{ .oe_horizontal_separator font-weight: bold @@ -1233,6 +1243,30 @@ $colour4: #8a89ba display: none // }}} + // FormView.progressbar {{{ + .oe_form + .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 + border: 1px solid #999 + -moz-border-radius: 3px + -webkit-border-radius: 3px + border-radius: 3px + background: white + min-width: 90px + + 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 + // }}} // ListView {{{ .oe-listview-content width: 100% @@ -1324,6 +1358,39 @@ $colour4: #8a89ba @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) // }}} + // Debugging stuff {{{ + .oe_layout_debugging + .oe_form_group + border: 2px dashed red + .oe_form_group_cell + border: 1px solid blue + padding-bottom: 1em + .oe_layout_debug_cell + color: white + background: #696 + font-size: 80% + text-align: center + .oe_layout_debug_cell + display: block + .oe_layout_debug_cell + display: none + + .oe_debug_view_log + font-size: 95% + .oe_debug_view_log label + display: block + width: 49% + text-align: right + float: left + font-weight: bold + color: #009 + .oe_debug_view_log span + display: block + width: 49% + float: right + color: #333 + // }}} + // Transitional overrides for old styles {{{ .openerp .oe_form_field_many2one -- cgit v1.2.3 From d4b103fb4d656f8480299fb673ebbdd3b95e9aed Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 9 Apr 2012 20:44:45 +0200 Subject: viewmanager refactor part1 bzr revid: al@openerp.com-20120409184445-nri84zeylu6ur21d --- addons/web/static/src/css/base.sass | 129 ++++-------------------------------- 1 file changed, 12 insertions(+), 117 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 6201312a7f4..8d08c257acd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -667,7 +667,7 @@ $colour4: #8a89ba color: #fff text-shadow: 0 1px 2px rgba(0,0,0,0.4) // }}} - // ViewManager Header {{{ + // ViewManager.header {{{ .oe_view_manager_header border-top: 1px solid #cacaca border-bottom: 1px solid #cacaca @@ -721,13 +721,21 @@ $colour4: #8a89ba padding: 0 8px .oe_view_manager_switch float: right + .oe_view_manager_buttons + padding-right: 8px + float: left + margin-right: 12px + .oe_view_manager_sidebar + display: block + .oe_view_manager_pager + float: right + // }}} - // ViewManager Dropdown {{{ + // ViewManager.sidebar {{{ .oe_form_dropdown_section position: relative display: inline-block margin-right: 4px - .oe_dropdown_toggle:after width: 0 height: 0 @@ -739,11 +747,9 @@ $colour4: #8a89ba 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 @@ -951,120 +957,9 @@ $colour4: #8a89ba div display: block // }}} - // SearchView mit {{{ - .searcharea - position: relative - float: right - .toggle-button - position: absolute - top: 10px - right: 8px - width: 0 - height: 0 - display: inline-block - content: "&darr" - vertical-align: top - border-top: 5px solid #4c4c4c - border-left: 5px solid transparent - border-right: 5px solid transparent - @include opacity(0.5) - &:hover - @include opacity(0.8) - .searchmenu - display: none - position: absolute - top: 30px - right: 7px - border: 1px solid #afafb6 - width: 432px - overflow-x: hidden - z-index: 900 - background: white - @include radius(5px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - .dropdown-menu - input - width: 120px - input - width: 25px - .toggle:before - margin-left: 0 - margin-top: 9px - .open:before - margin-top: 14px - .menu - &:last-child - margin-bottom: 0 - li - padding-left: 12px - margin-right: 8px - .custom-filters - a:hover:after - content: 'd' - font-family: "mnmliconsRegular" !important - font-size: 18px - font-weight: 300 !important - float: right - margin-top: -1px - a - height: 14px - line-height: 14px - padding: 3px 6px - color: #4c4c4c - &:hover - text-decoration: none - @include vertical-gradient(#f0f0fa, #eeeef6) - p - margin-left: 12px - input, textarea - height: 14px - padding: 2px - font-size: 11px - line-height: 18px - border: 1px solid #ccc - @include radius(3px) - .column - width: 48% - .full-column - margin: 8px 0 - padding: 4px - - input.searchbox - width: 410px - border: 1px solid #ababab - margin-top: 0 - margin-bottom: 0 - padding: 4px 19px - font-size: 13px - background: url('/web/static/src/img/search.png') no-repeat 5px - background-color: white - @include radius(13px) - @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset) - - .search-clear - position: absolute - top: 7px - right: 24px - width: 12px - height: 12px - cursor: pointer - display: none - // }}} - // FormView.header {{{ + // FormView.body {{{ .oe_form_header padding: 8px - .oe_form_buttons - padding-right: 8px - float: left - margin-right: 12px - .oe_form_pager - float: right - // FIXME - .oe-sidebar-attachments - display: none - - // }}} - // FormView.body {{{ .oe_form_invalid input, select, textarea background-color: #F66 !important -- cgit v1.2.3 From 789fb206fba5f5706fd481fbf5d61cac12ee13d0 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 9 Apr 2012 20:49:13 +0200 Subject: viewmanager refactor part2 bzr revid: al@openerp.com-20120409184913-ndgelv1lyfw4e6ix --- 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 8d08c257acd..ed3ecf585c5 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -726,7 +726,7 @@ $colour4: #8a89ba float: left margin-right: 12px .oe_view_manager_sidebar - display: block + display: inline-block .oe_view_manager_pager float: right -- cgit v1.2.3 From 5126b6e3a74437e3f5df18ec2e0e57c8ee6e1af6 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 9 Apr 2012 20:55:03 +0200 Subject: [FIX] Debug select box pushes down the searchview bzr revid: fme@openerp.com-20120409185503-vim01wum2lv675pi --- 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 ed3ecf585c5..38e932dd973 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1270,6 +1270,8 @@ $colour4: #8a89ba .oe_layout_debug_cell display: none + .oe_debug_view + float: left .oe_debug_view_log font-size: 95% .oe_debug_view_log label -- cgit v1.2.3 From d69238574738a3bdf097f9c88a42b0e7f5c59181 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 9 Apr 2012 21:31:37 +0200 Subject: [FIX] View switcher buttons bzr revid: fme@openerp.com-20120409193137-gmkzxlaswz9kfeqe --- addons/web/static/src/css/base.sass | 118 ++++++++++++++++++++++++++++++++++++ 1 file changed, 118 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 38e932dd973..247a1308626 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -668,6 +668,124 @@ $colour4: #8a89ba text-shadow: 0 1px 2px rgba(0,0,0,0.4) // }}} // ViewManager.header {{{ + .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_view_manager_row + height: 26px + line-height: 26px + margin: 8px + clear: both + text-shadow: 0 1px 1px white + h2 + float: left + font-size: 18px + margin: 1px 0 + a + color: $colour4 + .dropdown-toggle:after + margin-top: 7px + margin-left: 6px + border-top-color: #404040 + .oe_filter + vertical-align: top + li + height: 24px + line-height: 24px + padding: 0 8px + .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) + .pagination + li + height: 24px + line-height: 24px + padding: 0 8px + .oe_view_manager_buttons + padding-right: 8px + float: left + margin-right: 12px + .oe_view_manager_sidebar + display: inline-block + .oe_view_manager_pager + float: right + // }}} + // ViewManager.switches {{{ + .oe_view_manager_switch + float: right + margin: 2px 0 0 0 + + .oe_vm_switch_form, + .oe_vm_switch_page, + .oe_vm_switch_tree, + .oe_vm_switch_list, + .oe_vm_switch_graph, + .oe_vm_switch_gantt, + .oe_vm_switch_calendar, + .oe_vm_switch_kanban, + .oe_vm_switch_diagram + background: url("/web/static/src/img/views-icons-a.png") repeat-x scroll left top transparent + overflow: hidden + width: 22px + height: 21px + border: none + background-position: 0px 0px + span + display: none + + .oe_vm_switch_list, .oe_vm_switch_tree + background-position: 0px 0px + &:active, &:hover, &:focus, &.oe_view_manager_switch_selected + background-position: 0px -21px + + .oe_vm_switch_form, .oe_vm_switch_page + background-position: -22px 0px + &:active, &:hover, &:focus, &.oe_view_manager_switch_selected + background-position: -22px -21px + + .oe_vm_switch_graph + background-position: -44px 0px + &:active, &:hover, &:focus, &.oe_view_manager_switch_selected + background-position: -44px -21px + + .oe_vm_switch_gantt + background-position: -66px 0px + &:active, &:hover, &:focus, &.oe_view_manager_switch_selected + background-position: -66px -21px + + .oe_vm_switch_calendar + background-position: -88px 0px + &:active, &:hover, &:focus, &.oe_view_manager_switch_selected + background-position: -88px -21px + + .oe_vm_switch_kanban + background-position: -110px 0px + &:active, &:hover, &:focus, &.oe_view_manager_switch_selected + background-position: -110px -21px + + .oe_vm_switch_diagram + background-position: 0px 0px + &:active, &:hover, &:focus, &.oe_view_manager_switch_selected + background-position: 0px -21px + // }}} .oe_view_manager_header border-top: 1px solid #cacaca border-bottom: 1px solid #cacaca -- cgit v1.2.3 From 6a5f61f994529d5676d50deb749738452336a629 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 9 Apr 2012 21:39:13 +0200 Subject: [REM] Removed duplicated css inserted in previous commit bzr revid: fme@openerp.com-20120409193913-mbn3hzrxksy5h4zt --- addons/web/static/src/css/base.sass | 63 ------------------------------------- 1 file changed, 63 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 247a1308626..1c162fbd79e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -786,69 +786,6 @@ $colour4: #8a89ba &:active, &:hover, &:focus, &.oe_view_manager_switch_selected background-position: 0px -21px // }}} - .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_view_manager_row - height: 26px - line-height: 26px - margin: 8px - clear: both - text-shadow: 0 1px 1px white - h2 - float: left - font-size: 18px - margin: 1px 0 - a - color: $colour4 - .dropdown-toggle:after - margin-top: 7px - margin-left: 6px - border-top-color: #404040 - .oe_filter - vertical-align: top - li - height: 24px - line-height: 24px - padding: 0 8px - .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) - .pagination - li - height: 24px - line-height: 24px - padding: 0 8px - .oe_view_manager_switch - float: right - .oe_view_manager_buttons - padding-right: 8px - float: left - margin-right: 12px - .oe_view_manager_sidebar - display: inline-block - .oe_view_manager_pager - float: right - - // }}} // ViewManager.sidebar {{{ .oe_form_dropdown_section position: relative -- cgit v1.2.3 From 4e40395d3c830044bf993c363ae1fbdba4101276 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 9 Apr 2012 22:03:34 +0200 Subject: listview css bzr revid: al@openerp.com-20120409200334-24j00uopwpofpbq3 --- addons/web/static/src/css/base.sass | 4 +--- 1 file changed, 1 insertion(+), 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 1c162fbd79e..968b48025b6 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1221,11 +1221,9 @@ $colour4: #8a89ba .oe-listview-content width: 100% thead, tfoot - border-bottom: 2px solid #cacaca + border-bottom: 1px solid #cacaca background: #eee tfoot - border-top: 1px solid #cacaca - border-top: 2px solid #cacaca border-bottom: 1px solid #cacaca font-weight: bold tbody -- cgit v1.2.3 From 63e14ebeaa54f83029ef0af32a7e1f9e7ebd31d0 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 9 Apr 2012 22:10:17 +0200 Subject: [FIX] Form save dirty button bzr revid: fme@openerp.com-20120409201017-auczo7u6kivvvbg2 --- addons/web/static/src/css/base.sass | 10 ++++++++++ 1 file changed, 10 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 968b48025b6..1ec1e389359 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1019,6 +1019,16 @@ $colour4: #8a89ba input, select, textarea background-color: #F66 !important border: 1px solid #D00 !important + .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 + font-weight: bold .oe_form_group_cell line-height: 18px .oe_form_button -- cgit v1.2.3 From db8a61ba9b8cb9a877f17d041d68ba817be99d4b Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 9 Apr 2012 22:28:52 +0200 Subject: listview fix css bzr revid: al@openerp.com-20120409202852-n58vuvhxhq6arjir --- 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 1ec1e389359..aad1ea6d9bb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1241,7 +1241,7 @@ $colour4: #8a89ba background: white thead vertical-align: top - td:first-child, th:first-child + td.oe_list_checkbox:first-child, th.oe_list_checkbox:first-child width: 17px &:after border-width: 0 -- cgit v1.2.3 From b2b53816e5afb006e2042b679061b0509714e7e0 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 9 Apr 2012 23:43:48 +0200 Subject: [ADD] Added auto layout bzr revid: fme@openerp.com-20120409214348-gfo3tgca17nnzt86 --- addons/web/static/src/css/base.sass | 148 +++++++++++++++++++++++++++++++++--- 1 file changed, 139 insertions(+), 9 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 aad1ea6d9bb..ebab12fe42e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -67,7 +67,7 @@ $colour4: #8a89ba // }}} .openerp2 - // {{{ Group + // Group {{{ // }}} // Global style {{{ padding: 0 @@ -198,7 +198,7 @@ $colour4: #8a89ba @include vertical-gradient(#dc5f59, #b33630) // }}} - // {{{ Loading + // Loading {{{ .oe_loading display: none z-index: 100 @@ -216,7 +216,7 @@ $colour4: #8a89ba border-bottom-right-radius: 8px border-bottom-left-radius: 8px // }}} - // {{{ Notification + // Notification {{{ .oe_notification z-index: 1050 // }}} @@ -323,7 +323,7 @@ $colour4: #8a89ba .oe_login_error_message display: inline-block // }}} - // {{{ DatabaseManager + // DatabaseManager {{{ .oe_database_manager background: #fff color: #000 @@ -1029,11 +1029,6 @@ $colour4: #8a89ba -webkit-box-shadow: none -box-shadow: none font-weight: bold - .oe_form_group_cell - line-height: 18px - .oe_form_button - width: 100% - white-space: nowrap .oe_form_topbar border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) @@ -1116,6 +1111,42 @@ $colour4: #8a89ba // padding: 2px // line-height: 18px // }}} + // FormView.autolayout {{{ + .oe_form_autolayout + .oe_button + height: 22px + .oe_form_group_cell + line-height: 18px + padding: 2px + height: 25px + .oe_form_button + width: 100% + white-space: nowrap + .oe_form_group_cell > .oe_form_field_many2one, + .oe_form_group_cell > .oe_form_field_many2one input, + .oe_form_group_cell > .oe_form_field_char input, + .oe_form_group_cell > .oe_form_field_text textarea, + .oe_form_group_cell > .oe_form_field_email, + .oe_form_group_cell > .oe_form_field_email input, + .oe_form_group_cell > .oe_form_field_url, + .oe_form_group_cell > .oe_form_field_url input, + .oe_form_group_cell > .oe_form_field_date input, + .oe_form_group_cell > .oe_form_field_float input, + .oe_form_group_cell > .oe_form_field_selection select, + .oe_form_group_cell > .oe_datepicker_root + width: 100% + .oe_form_button.oe_button + color: #4c4c4c + white-space: nowrap + min-width: 100% + width: 100% + height: 22px + span + position: relative + vertical-align: top + .oe_form_group_cell.oe_form_group_nested + padding: 0 + // }}} // FormView.label {{{ .oe_form label @@ -1123,6 +1154,101 @@ $colour4: #8a89ba .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap // }}} + // FormView.fields {{{ + .oe_form + textarea + resize: vertical + 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 + -moz-box-sizing: border-box + -webkit-box-sizing: border-box + -ms-box-sizing: border-box + box-sizing: border-box + padding: 0 2px + margin: 0 2px + border: 1px solid #999 + -moz-border-radius: 3px + -webkit-border-radius: 3px + border-radius: 3px + background: white + min-width: 90px + color: #1f1f1f + input[readonly], + select[readonly], + textarea[readonly], + input[disabled], + select[disabled], + textarea[disabled] + background: #E5E5E5 !important + color: #666 + .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 + -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_email button img, + .oe_form_field_url button img + vertical-align: top + .oe_form_field_translatable, + .oe_form_field_many2one, + .oe_form_field_date, + .oe_form_field_datetime + white-space: nowrap + .oe_form_field_boolean + padding-top: 4px + .oe_form_field_datetime input + min-width: 11em + .oe_datepicker_container + display: none + .oe_datepicker_root + display: inline-block + .oe_form_required + input, select, textarea + background-color: #D2D2FF !important + .oe_form_invalid + input, select, textarea + background-color: #F66 !important + border: 1px solid #D00 !important + // }}} + // FormView.buttons {{{ + .oe_form + .oe_button.oe_field_button + -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 + border-bottom-left-radius: 0px + margin-right: -1px + height: 22px + .oe_input_icon + cursor: pointer + margin: 3px 0 0 -21px + vertical-align: top + .oe_input_icon_disabled + position: absolute + cursor: default + opacity: 0.5 + filter: alpha(opacity=50) + right: 5px + top: 3px + // }}} // FormView.binaryfile {{{ /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image @@ -1315,6 +1441,10 @@ $colour4: #8a89ba @include radius(3px) @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) // }}} + // Translation {{{ + .oe_trad_field.touched + border: 1px solid green !important + // }}} // Debugging stuff {{{ .oe_layout_debugging -- cgit v1.2.3 From 121345f0f771ef19ff15f6542bc159cc11d96188 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 9 Apr 2012 23:52:59 +0200 Subject: one2many css bzr revid: al@openerp.com-20120409215259-97tq92f5h4u2qqy5 --- addons/web/static/src/css/base.sass | 5 +++++ 1 file changed, 5 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 ebab12fe42e..4fde9d4d075 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1353,6 +1353,11 @@ $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 + .oe_view_manager_row:first-child + display: none + // }}} // ListView {{{ .oe-listview-content width: 100% -- cgit v1.2.3 From d7d69a26c9de37c39afdf0a3f8680ff310aa2f0c Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 10 Apr 2012 00:10:56 +0200 Subject: restyling of view switcher bzr revid: mit@openerp.com-20120409221056-xjuo8dmagjxp3mk5 --- addons/web/static/src/css/base.sass | 79 ++++++++++--------------------------- 1 file changed, 21 insertions(+), 58 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 4fde9d4d075..fc911d88588 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -661,11 +661,11 @@ $colour4: #8a89ba &:hover text-decoration: none .active + width: 100% 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) + color: #fff + text-shadow: 0 1px 2px rgba(0,0,0,0.4) // }}} // ViewManager.header {{{ .oe_view_manager_header @@ -730,61 +730,24 @@ $colour4: #8a89ba // }}} // ViewManager.switches {{{ .oe_view_manager_switch - float: right - margin: 2px 0 0 0 - - .oe_vm_switch_form, - .oe_vm_switch_page, - .oe_vm_switch_tree, - .oe_vm_switch_list, - .oe_vm_switch_graph, - .oe_vm_switch_gantt, - .oe_vm_switch_calendar, - .oe_vm_switch_kanban, - .oe_vm_switch_diagram - background: url("/web/static/src/img/views-icons-a.png") repeat-x scroll left top transparent - overflow: hidden - width: 22px - height: 21px - border: none - background-position: 0px 0px - span - display: none - - .oe_vm_switch_list, .oe_vm_switch_tree - background-position: 0px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: 0px -21px - - .oe_vm_switch_form, .oe_vm_switch_page - background-position: -22px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: -22px -21px - - .oe_vm_switch_graph - background-position: -44px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: -44px -21px - - .oe_vm_switch_gantt - background-position: -66px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: -66px -21px - - .oe_vm_switch_calendar - background-position: -88px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: -88px -21px - - .oe_vm_switch_kanban - background-position: -110px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: -110px -21px - - .oe_vm_switch_diagram - background-position: 0px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: 0px -21px + li + padding-left: 1px + text-align: center + width: 24px + height: 24px + line-height: 24px + .oe_vm_switch_list:after, .oe_vm_switch_tree:after + content: "ö" + .oe_vm_switch_graph:after + content: "ó" + .oe_vm_switch_gantt:after + content: "y" + .oe_vm_switch_calendar:after + content: "b" + .oe_vm_switch_kanban:after + content: "ó" + .oe_vm_switch_diagram:after + content: "}" // }}} // ViewManager.sidebar {{{ .oe_form_dropdown_section -- cgit v1.2.3 From c06f170f8340fa8769e3164c7dc34e0e957e5b62 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 10 Apr 2012 02:29:09 +0200 Subject: Styling of pager bzr revid: mit@openerp.com-20120410002909-o5cwm5stb086u2my --- 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 fc911d88588..cdb99b3f9b8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -126,8 +126,10 @@ $colour4: #8a89ba font-weight: 300 !important .oe_left float: left + margin-right: 8px .oe_right float: right + margin-left: 8px .oe_clear clear: both .oe_wait @@ -727,6 +729,10 @@ $colour4: #8a89ba display: inline-block .oe_view_manager_pager float: right + .oe_previous:after + content: "(" + .oe_next:after + content: ")" // }}} // ViewManager.switches {{{ .oe_view_manager_switch -- cgit v1.2.3 From ea97885e1881a822b77898b2e2f6d931f7757895 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 10 Apr 2012 11:42:57 +0200 Subject: [FIX] kanban does not have a border by default bzr revid: chs@openerp.com-20120410094257-yk9ufr9eseagvuef --- addons/web/static/src/css/base.sass | 6 ------ 1 file changed, 6 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 cdb99b3f9b8..342b9f1b847 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1395,17 +1395,11 @@ $colour4: #8a89ba position: relative display: block min-height: 50px - background: white - border: 1px solid #d8d8d8 - border-bottom-color: #b9b9b9 - padding: 6px margin: 6px 0 display: block @include radius(4px) &:last-child margin-bottom: 0 - &:hover - @include box-shadow(0 0 3px rgba(0,0,0,0.6)) .oe_kanban_title font-weight: bold margin: 2px 4px -- cgit v1.2.3 From b6f8c0f01162524e1c87333cddea86140825f4d0 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 10 Apr 2012 10:47:52 +0200 Subject: revert mit pager bzr revid: al@openerp.com-20120410084752-c5uvflwgi93pshvo --- addons/web/static/src/css/base.sass | 6 ------ 1 file changed, 6 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 342b9f1b847..cc684d7df7a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -126,10 +126,8 @@ $colour4: #8a89ba font-weight: 300 !important .oe_left float: left - margin-right: 8px .oe_right float: right - margin-left: 8px .oe_clear clear: both .oe_wait @@ -729,10 +727,6 @@ $colour4: #8a89ba display: inline-block .oe_view_manager_pager float: right - .oe_previous:after - content: "(" - .oe_next:after - content: ")" // }}} // ViewManager.switches {{{ .oe_view_manager_switch -- cgit v1.2.3 From 79c988967ba8ff87a31da8d74245c4884332b403 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 10 Apr 2012 11:44:17 +0200 Subject: fix pager view_form bzr revid: al@openerp.com-20120410094417-tza93i2kkko6dcy9 --- addons/web/static/src/css/base.sass | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 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 cc684d7df7a..957d436db31 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -728,6 +728,51 @@ $colour4: #8a89ba .oe_view_manager_pager float: right // }}} + // ViewManager.pager {{{ + .oe_pager_value + height: 24px + line-height: 24px + padding: 0 8px + .oe_pager_group + height: 24px + line-height: 24px + padding: 0 8px + display: inline-block + border: 1px solid #ababab + @include radius(5px) + li + height: 24px + line-height: 24px + padding: 0 8px + float: left + border-right: 1px solid #ababab + &:last-child + border: none + a + color: #4c4c4c + &:hover + text-decoration: none + button + height: 24px + padding: 0 + background: transparent + border: 0 none + overflow: visible + .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 + padding-right: 8px + float: left + margin-right: 12px + .oe_view_manager_sidebar + display: inline-block + .oe_view_manager_pager + float: right + // }}} // ViewManager.switches {{{ .oe_view_manager_switch li -- cgit v1.2.3 From 0da2dd7d5fbbe7d67d04a96317e4dcde7db972f3 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 10 Apr 2012 12:08:16 +0200 Subject: pager css fix bzr revid: al@openerp.com-20120410100816-c8qcogm0e429953j --- addons/web/static/src/css/base.sass | 16 ++-------------- 1 file changed, 2 insertions(+), 14 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 957d436db31..b65f7982ac3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -733,12 +733,14 @@ $colour4: #8a89ba height: 24px line-height: 24px padding: 0 8px + display: inline-block .oe_pager_group height: 24px line-height: 24px padding: 0 8px display: inline-block border: 1px solid #ababab + cursor: pointer @include radius(5px) li height: 24px @@ -752,26 +754,12 @@ $colour4: #8a89ba color: #4c4c4c &:hover text-decoration: none - button - height: 24px - padding: 0 - background: transparent - border: 0 none - overflow: visible .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 - padding-right: 8px - float: left - margin-right: 12px - .oe_view_manager_sidebar - display: inline-block - .oe_view_manager_pager - float: right // }}} // ViewManager.switches {{{ .oe_view_manager_switch -- cgit v1.2.3 From 12d3bc7c2f7fff590d4bb46d7054f26a75662a3e Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 10 Apr 2012 12:31:21 +0200 Subject: fixed pager style bzr revid: mit@openerp.com-20120410103121-kw5qbodsmp31h6he --- addons/web/static/src/css/base.sass | 10 +++++----- 1 file changed, 5 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 b65f7982ac3..ded205d0c3c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -126,8 +126,10 @@ $colour4: #8a89ba font-weight: 300 !important .oe_left float: left + margin-right: 8px .oe_right float: right + margin-left: 8px .oe_clear clear: both .oe_wait @@ -730,14 +732,12 @@ $colour4: #8a89ba // }}} // ViewManager.pager {{{ .oe_pager_value - height: 24px - line-height: 24px - padding: 0 8px - display: inline-block + float: left + margin-right: 8px .oe_pager_group + float: left height: 24px line-height: 24px - padding: 0 8px display: inline-block border: 1px solid #ababab cursor: pointer -- cgit v1.2.3 From d3888c8366e17bdff37bc484887c04eacc9208b9 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 10 Apr 2012 12:48:05 +0200 Subject: form sheet padding bzr revid: al@openerp.com-20120410104805-dy5dg5mttl6i394v --- addons/web/static/src/css/base.sass | 6 ++++-- 1 file changed, 4 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 ded205d0c3c..bb3da31db5a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1025,6 +1025,8 @@ $colour4: #8a89ba -webkit-box-shadow: none -box-shadow: none font-weight: bold + // }}} + // FormView.customdivs {{{ .oe_form_topbar border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) @@ -1083,10 +1085,10 @@ $colour4: #8a89ba border-bottom: 1px solid #ddd .oe_form_sheet_width min-width: 650px - max-width: 880px + max-width: 980px margin: 0 auto .oe_form_sheet - padding-top: 8px + padding: 8px 8px 8px 8px background: white min-height: 420px border: 1px solid #afafb6 -- cgit v1.2.3 From 3bfa67a51647ad6c4072b8e92d7992c89f8f6463 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 10 Apr 2012 13:03:08 +0200 Subject: Fixed alignment of sidebar buttons bzr revid: mit@openerp.com-20120410110308-ca42xa6e2wv82dxi --- 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 bb3da31db5a..f14a278e1b0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -681,6 +681,7 @@ $colour4: #8a89ba margin: 8px clear: both text-shadow: 0 1px 1px white + text-align: center h2 float: left font-size: 18px -- cgit v1.2.3 From 77944d57e70f330f7e7a948b2741aa1147453942 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 10 Apr 2012 13:34:11 +0200 Subject: [FIX] Fixed dirty save button hover styling bzr revid: fme@openerp.com-20120410113411-n7v6fwhthgnnz2b9 --- 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 f14a278e1b0..79190896c5a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1026,6 +1026,8 @@ $colour4: #8a89ba -webkit-box-shadow: none -box-shadow: none font-weight: bold + &:hover + background: #ED6F6A // }}} // FormView.customdivs {{{ .oe_form_topbar -- cgit v1.2.3 From 429f46771d9f14368142bfe743d789a978eb9a80 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 10 Apr 2012 13:31:32 +0200 Subject: [FIX] paddings in pager button: clicking on the button should click the gorram button, not some kind of void which doesn't do anything. bzr revid: xmo@openerp.com-20120410113132-sytcu7jtv2x1ini3 --- 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 79190896c5a..a829589639c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -746,13 +746,14 @@ $colour4: #8a89ba li height: 24px line-height: 24px - padding: 0 8px + padding: 0 float: left border-right: 1px solid #ababab &:last-child border: none a color: #4c4c4c + padding: 0 8px &:hover text-decoration: none .active -- cgit v1.2.3 From 8fa309ea2760b4c71bee9bd73970d8d08f3320da Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 10 Apr 2012 13:43:35 +0200 Subject: [IMP] Added oe_view_topbar css class bzr revid: fme@openerp.com-20120410114335-ivs65hfhljzvjs70 --- addons/web/static/src/css/base.sass | 7 +++++++ 1 file changed, 7 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 a829589639c..d946b595820 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1010,6 +1010,13 @@ $colour4: #8a89ba div display: block // }}} + // View.topbar {{{ + .oe_view_topbar + border-bottom: 1px solid #cacaca + @include vertical-gradient(#fcfcfc, #dedede) + padding: 0 8px + line-height: 30px + // }}} // FormView.body {{{ .oe_form_header padding: 8px -- cgit v1.2.3 From ec5ab4ec291e1cf1e4f6b37d547de9aa786e4392 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 10 Apr 2012 14:15:26 +0200 Subject: [REM] Removed openerp2 css class bzr revid: fme@openerp.com-20120410121526-c427rno1hp3ig10k --- addons/web/static/src/css/base.sass | 5 ++++- 1 file changed, 4 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 d946b595820..4913a12a449 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -66,7 +66,10 @@ $colour4: #8a89ba // }}} -.openerp2 +.openerp.openerp-web-client-container + height: 100% + +.openerp // Group {{{ // }}} // Global style {{{ -- cgit v1.2.3 From a181c840a80edf3a59100a944f89cb23a0b73587 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 10 Apr 2012 14:26:17 +0200 Subject: [FIX] Fixed m2o and tooltip styling bzr revid: fme@openerp.com-20120410122617-ipj1phnn07k7n069 --- addons/web/static/src/css/base.sass | 25 ++++++++++++++++++++----- 1 file changed, 20 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 4913a12a449..9b5b5e7219b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -68,10 +68,9 @@ $colour4: #8a89ba .openerp.openerp-web-client-container height: 100% + position: relative .openerp - // Group {{{ - // }}} // Global style {{{ padding: 0 margin: 0 @@ -79,12 +78,11 @@ $colour4: #8a89ba color: #4c4c4c font-size: 13px background: white - position: relative - height: 100% - a text-decoration: none // }}} + +.openerp // Tag reset {{{ table padding: 0 @@ -1456,6 +1454,23 @@ $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 + // }}} // Debugging stuff {{{ .oe_layout_debugging -- cgit v1.2.3 From f66503c286ecb101a7bf5027edcbe8bbd5ab9a8a Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 10 Apr 2012 14:39:23 +0200 Subject: Fix to align problem in the drawer view bzr revid: mit@openerp.com-20120410123923-uuaix1zn7ob1feae --- 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 9b5b5e7219b..3a2f93db50d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -952,6 +952,7 @@ $colour4: #8a89ba width: 410px display: none border: 1px solid #ccc + text-align: left .oe_searchview_filters display: table -- cgit v1.2.3 From 2ff967c5b8173bc23539b003b2a6dc64e6ec2ece Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 10 Apr 2012 14:45:24 +0200 Subject: Fix to align problem in dropdow menu bzr revid: mit@openerp.com-20120410124524-ujobb38h70rof8xg --- 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 3a2f93db50d..5d3fdc484b9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -814,6 +814,7 @@ $colour4: #8a89ba 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)) -- cgit v1.2.3 From 8009420fa562e5b1a8efcbe2eb9f7b3ee2a2f1a4 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 10 Apr 2012 14:53:31 +0200 Subject: sidebar center bzr revid: al@openerp.com-20120410125331-nsqdcdq0klqeme4a --- addons/web/static/src/css/base.sass | 8 ++------ 1 file changed, 2 insertions(+), 6 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 5d3fdc484b9..8ed6ad21703 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -718,17 +718,13 @@ $colour4: #8a89ba a color: #fff text-shadow: 0 1px 2px rgba(0,0,0,0.4) - .pagination - li - height: 24px - line-height: 24px - padding: 0 8px .oe_view_manager_buttons padding-right: 8px float: left margin-right: 12px .oe_view_manager_sidebar - display: inline-block + margin: 0 auto + width: 33% .oe_view_manager_pager float: right // }}} -- cgit v1.2.3 From a639d1d191a9018ecc29fd92b8ccc7bf9b40258b Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 10 Apr 2012 16:40:49 +0200 Subject: login show invalid login bzr revid: al@openerp.com-20120410144049-zy9pm45pa2e6wdf5 --- addons/web/static/src/css/base.sass | 6 +++--- 1 file changed, 3 insertions(+), 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 8ed6ad21703..f5a576a54c2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -322,9 +322,9 @@ $colour4: #8a89ba 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 + .oe_login_invalid + .oe_login_error_message + display: inline-block // }}} // DatabaseManager {{{ .oe_database_manager -- cgit v1.2.3 From 257677747a02f99d04d46ecad2166df113293dc7 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 10 Apr 2012 17:11:53 +0200 Subject: [IMP] temporary improvement related to partner form view bzr revid: qdp-launchpad@openerp.com-20120410151153-tsc29nti1cr7ds9z --- addons/web/static/src/css/base.sass | 7 +++++++ 1 file changed, 7 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 f5a576a54c2..e294acd6013 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1447,6 +1447,13 @@ $colour4: #8a89ba height: 20px @include radius(3px) @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) + .oe_kanban_avatar_toto + height: 40px + width: 40px + border: 1px solid + border-color: #e5e5e5 #dbdbdb #d2d2d2 + @include radius(3px) + @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) // }}} // Translation {{{ .oe_trad_field.touched -- cgit v1.2.3 From e559ad7bdaf93314b2c767834bd1a479086f9912 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 10 Apr 2012 17:37:36 +0200 Subject: listview css buttons bzr revid: al@openerp.com-20120410153736-rjr6e9m305mnzk7f --- addons/web/static/src/css/base.sass | 5 +++++ 1 file changed, 5 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 e294acd6013..316ca0c3501 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1392,6 +1392,11 @@ $colour4: #8a89ba td, th padding: 3px 6px line-height: 18px + button + border: none + background: transparent + padding: 0 + @include box-shadow(none) .numeric text-align: right width: 82px -- cgit v1.2.3 From c991c9faf29b9eeb93ebbf91dbd7a87e5108de14 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 10 Apr 2012 18:42:04 +0200 Subject: styling of hover of follow button bzr revid: mit@openerp.com-20120410164204-63f67konnz7tpypu --- addons/web/static/src/css/base.sass | 13 +++++++++++-- 1 file changed, 11 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 316ca0c3501..9074fa8d6e2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -191,13 +191,13 @@ $colour4: #8a89ba button.following color: white - width: 90px + width: 120px @include vertical-gradient($colour4, darken($colour4, 3%)) button.unfollow display: none color: white - width: 90px + width: 120px @include vertical-gradient(#dc5f59, #b33630) // }}} @@ -728,6 +728,13 @@ $colour4: #8a89ba .oe_view_manager_pager float: right // }}} + + // ViewManager.body {{{ + .oe_view_manager_body + h4 + margin: 8px 0 + // }}} + // ViewManager.pager {{{ .oe_pager_value float: left @@ -1017,6 +1024,8 @@ $colour4: #8a89ba line-height: 30px // }}} // FormView.body {{{ + .oe_formview + background: white .oe_form_header padding: 8px .oe_form_invalid -- cgit v1.2.3 From 53510b98e7d9849329fe1666e42c3d96703a7e90 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 10 Apr 2012 23:26:45 +0200 Subject: tables vs float, viewmanager uses tables, tables have won a battle but not yet the war bzr revid: al@openerp.com-20120410212645-x2uumkezv9w031ei --- addons/web/static/src/css/base.sass | 59 +++++++++++++++---------------------- 1 file changed, 23 insertions(+), 36 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 9074fa8d6e2..6afddbee2fa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -671,34 +671,21 @@ $colour4: #8a89ba text-shadow: 0 1px 2px rgba(0,0,0,0.4) // }}} // ViewManager.header {{{ - .oe_view_manager_header + .oe_view_manager_header2 + 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_view_manager_row - height: 26px + h2 + float: left + font-size: 18px + margin: 1px 0 + a + color: $colour4 + td + padding: 4px 8px line-height: 26px - margin: 8px - clear: both - text-shadow: 0 1px 1px white - text-align: center - h2 - float: left - font-size: 18px - margin: 1px 0 - a - color: $colour4 - .dropdown-toggle:after - margin-top: 7px - margin-left: 6px - border-top-color: #404040 - .oe_filter - vertical-align: top - li - height: 24px - line-height: 24px - padding: 0 8px .oe_button_group display: inline-block border: 1px solid #ababab @@ -718,23 +705,12 @@ $colour4: #8a89ba a color: #fff text-shadow: 0 1px 2px rgba(0,0,0,0.4) - .oe_view_manager_buttons - padding-right: 8px - float: left - margin-right: 12px - .oe_view_manager_sidebar - margin: 0 auto - width: 33% - .oe_view_manager_pager - float: right // }}} - // ViewManager.body {{{ .oe_view_manager_body h4 margin: 8px 0 // }}} - // ViewManager.pager {{{ .oe_pager_value float: left @@ -1372,8 +1348,19 @@ $colour4: #8a89ba // }}} // FormView.viewmanager {{{ .oe_form - .oe_view_manager_row:first-child - display: none + .oe_view_manager_header2 + td + padding: 0px 8px + line-height: 16px + .oe_i + font-size: 13px + .oe_pager_group + height: auto + line-height: 16px + li + height: auto + line-height: 16px + // }}} // ListView {{{ .oe-listview-content -- cgit v1.2.3 From 8e316cbdabd3e7e9decce57f02bcc94c1da7ba1c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 16 Apr 2012 13:49:53 +0200 Subject: [IMP] Improved styling for view manager header bzr revid: fme@openerp.com-20120416114953-belugivw6fzfhrcz --- addons/web/static/src/css/base.sass | 5 ++++- 1 file changed, 4 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 6afddbee2fa..b2373c7782b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -705,6 +705,8 @@ $colour4: #8a89ba a color: #fff text-shadow: 0 1px 2px rgba(0,0,0,0.4) + .oe_view_manager_buttons + white-space: nowrap // }}} // ViewManager.body {{{ .oe_view_manager_body @@ -814,7 +816,8 @@ $colour4: #8a89ba text-decoration: none @include vertical-gradient(#f0f0fa, #eeeef6) @include box-shadow(none) - + .oe_sidebar + white-space: nowrap // }}} // SearchView xmo {{{ .oe_searchview -- cgit v1.2.3 From 70a48b74c93e89532c8a554f97a1c92304bf7984 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 18 Apr 2012 18:10:39 +0200 Subject: [IMP] Improved layout outline debugging feature bzr revid: fme@openerp.com-20120418161039-wztsy1ss7espeo8v --- addons/web/static/src/css/base.sass | 14 ++------------ 1 file changed, 2 insertions(+), 12 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 b2373c7782b..f95d843b689 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1484,19 +1484,9 @@ $colour4: #8a89ba // Debugging stuff {{{ .oe_layout_debugging .oe_form_group - border: 2px dashed red + outline: 2px dashed red .oe_form_group_cell - border: 1px solid blue - padding-bottom: 1em - .oe_layout_debug_cell - color: white - background: #696 - font-size: 80% - text-align: center - .oe_layout_debug_cell - display: block - .oe_layout_debug_cell - display: none + outline: 1px solid blue .oe_debug_view float: left -- cgit v1.2.3