From dd2b3227a8c2e8d39fad5139ff575eea6d02d660 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 25 Jun 2012 16:48:45 +0200 Subject: Graph dropdown toggle improvement bzr revid: mit@openerp.com-20120625144845-idyfjd3px6pct5jj --- addons/web/static/src/css/base.css | 7 ++++++- addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0d4912c2840..986539e5555 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -315,6 +315,11 @@ list-style: none; zoom: 1; } +.openerp .oe_notebook.ui-corner-all { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; +} .openerp .oe_notebook:before, .openerp .oe_notebook:after { display: table; content: ""; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 35e1d08e17f..389490bcd0a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -275,6 +275,8 @@ $colour4: #8a89ba padding: 0 16px list-style: none zoom: 1 + .oe_notebook.ui-corner-all + @include radius(0) .oe_notebook:before, .oe_notebook:after display: table content: "" -- cgit v1.2.3 From c5c08808f73152557577a47dd9c3eef19871f116 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 28 Jun 2012 09:41:23 +0200 Subject: [IMP] Improved topbar dropdown css bzr revid: fme@openerp.com-20120628074123-et65mt93rq9tc9ri --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + 2 files changed, 2 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d06c157696b..543e701b5d9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -779,6 +779,7 @@ border-top: 4px solid white; } .openerp .oe_topbar .oe_dropdown_menu { + top: 32px; background: #333333; background: rgba(37, 37, 37, 0.9); border-color: #999999; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a0b29b1fc81..018b4088ee0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -612,6 +612,7 @@ $colour4: #8a89ba .oe_dropdown_arrow:after border-top: 4px solid white .oe_dropdown_menu + top: 32px background: #333 background: rgba(37,37,37,0.9) border-color: #999 -- cgit v1.2.3 From 89b2b1e3072f950c1e93ba9dc217819326904557 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 28 Jun 2012 16:32:52 +0200 Subject: [CHG] Applied new rules to oe_highlight. Added action.target to oe_view_manager class oe_highlight depend on target of the action current: readonly: red, editmode: dont apply inline : always red new: always red and save is always red (so no dirty anymore but keep the class just in case) bzr revid: fme@openerp.com-20120628143252-r9jxckyet9v1qn1l --- addons/web/static/src/css/base.css | 16 ++++++++-------- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 543e701b5d9..2bcb8d1ac3d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1162,10 +1162,10 @@ .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_diagram:after { content: "f"; } -.openerp .oe_view_manager_global { +.openerp .oe_view_manager_current, .openerp .oe_view_manager_inline { height: 100%; } -.openerp .oe_view_manager_global > .oe_view_manager_header { +.openerp .oe_view_manager_current > .oe_view_manager_header, .openerp .oe_view_manager_inline > .oe_view_manager_header { border-top: 1px solid #cacaca; border-bottom: 1px solid #cacaca; background-color: #fcfcfc; @@ -1179,10 +1179,10 @@ -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); } -.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row td { +.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row td, .openerp .oe_view_manager_inline > .oe_view_manager_header .oe_header_row td { padding: 8px; } -.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row:first-child td { +.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row:first-child td, .openerp .oe_view_manager_inline > .oe_view_manager_header .oe_header_row:first-child td { padding-top: 8px; } .openerp .oe_popup_form > .oe_formview > .oe_form_pager { @@ -1566,11 +1566,11 @@ background-color: #ff6666 !important; border: 1px solid #dd0000 !important; } -.openerp .oe_form_editable .oe_highlight { +.openerp .oe_view_manager_current .oe_form_editable .oe_highlight { color: #404040; background: none; } -.openerp .oe_form_editable button.oe_highlight { +.openerp .oe_view_manager_current .oe_form_editable button.oe_highlight { background-color: #efefef; background-image: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8)); background-image: -webkit-linear-gradient(top, #efefef, #d8d8d8); @@ -1582,7 +1582,7 @@ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; } -.openerp .oe_form_editable button.oe_highlight:active { +.openerp .oe_view_manager_current .oe_form_editable button.oe_highlight:active { background-color: #e3e3e3; background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)); background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6); @@ -1594,7 +1594,7 @@ -webkit-box-shadow: none; box-shadow: none; } -.openerp .oe_form_editable button.oe_highlight:hover { +.openerp .oe_view_manager_current .oe_form_editable button.oe_highlight:hover { background-color: #f6f6f6; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 018b4088ee0..116ca3c2ca2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -913,7 +913,7 @@ $colour4: #8a89ba content: "f" // }}} // ViewManager application {{{ - .oe_view_manager_global + .oe_view_manager_current, .oe_view_manager_inline height: 100% > .oe_view_manager_header border-top: 1px solid #cacaca @@ -1241,7 +1241,7 @@ $colour4: #8a89ba input, select, textarea background-color: #F66 !important border: 1px solid #D00 !important - .oe_form_editable + .oe_view_manager_current .oe_form_editable .oe_highlight color: #404040 background: none -- cgit v1.2.3 From 3f6307bc0d39e17887c900a7e79a531ef3458a41 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 28 Jun 2012 16:57:19 +0200 Subject: [FIX] unfuck editable o2m icon in last cell bzr revid: xmo@openerp.com-20120628145719-vnbhicr1bxw9bwye --- addons/web/static/src/css/base.css | 8 +++++++- addons/web/static/src/css/base.sass | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 2bcb8d1ac3d..8df712d88d1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2014,7 +2014,10 @@ display: none; } .openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save { - background-image: url(/web/static/src/img/iconset-b-remove.png); + background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat; +} +.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save:before { + visibility: hidden; } .openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top { display: none; @@ -2144,6 +2147,9 @@ .openerp .oe_list_content .numeric input { text-align: right; } +.openerp .oe_list_content .oe_list_edit_row_save:before { + content: "S"; +} .openerp .oe_trad_field.touched { border: 1px solid green !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 116ca3c2ca2..2846ce7235d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1590,7 +1590,9 @@ $colour4: #8a89ba .oe_form_field_one2many // TODO: oe_form_field_one2many_list? .oe_list .oe_list_edit_row_save - background-image: url(/web/static/src/img/iconset-b-remove.png) + background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat + &:before + visibility: hidden &> .oe_view_manager .oe_header_row_top @@ -1685,6 +1687,8 @@ $colour4: #8a89ba width: 82px input text-align: right + .oe_list_edit_row_save:before + content: "S" // }}} // Translation {{{ .oe_trad_field.touched -- cgit v1.2.3 From b864de994b689d07270d1fec24c72106c116cf43 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 29 Jun 2012 18:06:06 +0200 Subject: Many small improvements to Kanban view bzr revid: mit@openerp.com-20120629160606-8dyxa381pm3xcde6 --- addons/web/static/src/css/base.css | 6 ++---- addons/web/static/src/css/base.sass | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 986539e5555..db152e391ad 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -950,10 +950,8 @@ border-right: 4px solid transparent; border-top: 4px solid #4c4c4c; } -.openerp .oe_application { - width: 100%; -} .openerp .oe_application a { + width: 100%; color: #8a89ba; } .openerp .oe_application a:hover { @@ -1158,7 +1156,7 @@ .openerp .oe_searchview input, .openerp .oe_searchview textarea { padding: 3px; height: 14px; - font-size: 11px; + font-size: 12px; line-height: 18px; } .openerp .oe_searchview.oe_focused { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 389490bcd0a..85d22c20809 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -363,7 +363,6 @@ $colour4: #8a89ba border-right: 4px solid transparent border-top: 4px solid#404040 @include opacity(0.5) - .oe_sidebar white-space: nowrap .oe_dropdown_menu @@ -755,8 +754,8 @@ $colour4: #8a89ba // }}} // ActionManager {{{ .oe_application - width: 100% a + width: 100% color: $colour4 &:hover text-decoration: underline @@ -917,7 +916,7 @@ $colour4: #8a89ba input, textarea padding: 3px height: 14px - font-size: 11px + font-size: 12px line-height: 18px &.oe_focused border-color: $facets-border-selected -- cgit v1.2.3 From 5fa4fb68a53496e66002941b6487b0675404a02c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 2 Jul 2012 17:53:47 +0200 Subject: [IMP?] jQuery UI dialog: Could we use single div solution ? Let's Minh decide... bzr revid: fme@openerp.com-20120702155347-1hq7v03k4reamgpn --- addons/web/static/src/css/base.css | 11 +++++++++++ addons/web/static/src/css/base.sass | 8 ++++++++ 2 files changed, 19 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 8df712d88d1..cf84870047d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -186,6 +186,17 @@ .openerp .ui-menu .ui-menu-item a.ui-state-active { background: #f0f0fa; } +.openerp.ui-dialog { + border: 13px solid rgba(0, 0, 0, 0.3); + -moz-border-radius: 16px; + -webkit-border-radius: 16px; + border-radius: 16px; + -moz-background-clip: padding-box; + -webkit-background-clip: padding; + background-clip: padding-box; + box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.6); + -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2); +} .openerp .oe_i { font-family: "mnmliconsRegular" !important; font-size: 21px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2846ce7235d..93a1b2cf289 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -200,6 +200,14 @@ $colour4: #8a89ba width: auto a.ui-state-active background: #f0f0fa + &.ui-dialog + border: 13px solid rgba(0, 0, 0, 0.3) + @include radius(16px) + -moz-background-clip: padding-box + -webkit-background-clip: padding + background-clip: padding-box + box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.6) + -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2) // }}} // Generic classes {{{ .oe_i -- cgit v1.2.3 From dc902a89fb78caf41aebc403eaed5a2723fed56c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 2 Jul 2012 23:34:48 +0200 Subject: [FIX] inline mode hide view manager, fix nosheet margins bzr revid: al@openerp.com-20120702213448-2gphmpsen8imtgvx --- addons/web/static/src/css/base.css | 24 +++++++++++++++++------- addons/web/static/src/css/base.sass | 17 +++++++++++++---- 2 files changed, 30 insertions(+), 11 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index cf84870047d..68fdbc8a215 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1173,10 +1173,10 @@ .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_diagram:after { content: "f"; } -.openerp .oe_view_manager_current, .openerp .oe_view_manager_inline { +.openerp .oe_view_manager_current { height: 100%; } -.openerp .oe_view_manager_current > .oe_view_manager_header, .openerp .oe_view_manager_inline > .oe_view_manager_header { +.openerp .oe_view_manager_current > .oe_view_manager_header { border-top: 1px solid #cacaca; border-bottom: 1px solid #cacaca; background-color: #fcfcfc; @@ -1190,12 +1190,18 @@ -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); } -.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row td, .openerp .oe_view_manager_inline > .oe_view_manager_header .oe_header_row td { +.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row td { padding: 8px; } -.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row:first-child td, .openerp .oe_view_manager_inline > .oe_view_manager_header .oe_header_row:first-child td { +.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row:first-child td { padding-top: 8px; } +.openerp .oe_view_manager_inline { + height: 100%; +} +.openerp .oe_view_manager_inline > .oe_view_manager_header { + display: none; +} .openerp .oe_popup_form > .oe_formview > .oe_form_pager { display: none !important; } @@ -1623,9 +1629,13 @@ .openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty { display: none !important; } -.openerp .oe_form_nosheet > *:not(header) { - margin-left: 10px !important; - margin-right: 10px !important; +.openerp .oe_form_nosheet { + margin-left: 10px; + margin-right: 10px; +} +.openerp .oe_form_nosheet > header { + margin-left: -10px; + margin-right: -10px; } .openerp .oe_form header { position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 93a1b2cf289..395b9dd694b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -921,7 +921,7 @@ $colour4: #8a89ba content: "f" // }}} // ViewManager application {{{ - .oe_view_manager_current, .oe_view_manager_inline + .oe_view_manager_current height: 100% > .oe_view_manager_header border-top: 1px solid #cacaca @@ -935,6 +935,12 @@ $colour4: #8a89ba td padding-top: 8px // }}} + // ViewManager inline {{{ + .oe_view_manager_inline + height: 100% + > .oe_view_manager_header + display: none + // }}} // Viewmanager popup {{{ .oe_popup_form > .oe_formview > .oe_form_pager display: none !important @@ -1267,9 +1273,12 @@ $colour4: #8a89ba .oe_form_readonly .oe_edit_only, .oe_form_field:empty display: none !important - .oe_form_nosheet > *:not(header) - margin-left: 10px !important - margin-right: 10px !important + .oe_form_nosheet + margin-left: 10px + margin-right: 10px + .oe_form_nosheet > header + margin-left: -10px + margin-right: -10px // }}} // FormView.custom tags and classes {{{ .oe_form -- cgit v1.2.3 From 72ba5b724686c38113aa649ed01a5e8071d96dbf Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 3 Jul 2012 08:07:35 +0200 Subject: [IMP] improved CSS for oe_title bzr revid: fp@tinyerp.com-20120703060735-l2x8pkgxr6cv6j7k --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 68fdbc8a215..d6212b64739 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -34,7 +34,7 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp a { text-decoration: none; @@ -294,7 +294,7 @@ background: #ed6f6a; } .openerp .oe_title { - width: 55%; + width: 60%; } .openerp .oe_title:after { content: "."; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 395b9dd694b..3010de3f675 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -260,7 +260,7 @@ $colour4: #8a89ba &:hover background: #ED6F6A .oe_title - width: 55% + width: 60% .oe_title:after content: "." display: block -- cgit v1.2.3 From 9d908a38faa05716bb45c379ce63d6fe028982e6 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 5 Jul 2012 13:58:47 +0200 Subject: various improvements to design bzr revid: mit@openerp.com-20120705115847-5oncw7ynqxs5m9ig --- addons/web/static/src/css/base.css | 25 +++++++++++++++++++------ addons/web/static/src/css/base.sass | 21 +++++++++++++++++---- 2 files changed, 36 insertions(+), 10 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 39dc2fa86f8..443563a096b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -34,7 +34,7 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp a { text-decoration: none; @@ -352,6 +352,19 @@ .openerp .oe_button.oe_link span:hover { text-decoration: underline; } +.openerp .oe_star_on, .openerp .oe_star_off { + color: #cccccc; + text-shadow: 0 0 2px black; + vertical-align: top; + position: relative; + top: -5px; +} +.openerp .oe_star_on:hover, .openerp .oe_star_off:hover { + text-decoration: none; +} +.openerp .oe_star_on { + color: gold; +} .openerp.oe_tooltip { font-size: 12px; } @@ -446,12 +459,12 @@ .openerp .oe_dropdown_menu { display: none; position: absolute; - top: 28px; + top: 32px; z-index: 1; border: 1px solid #afafb6; background: white; - padding: 8px; - min-width: 120px; + padding: 6px 0; + min-width: 140px; text-align: left; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -481,7 +494,7 @@ .openerp .oe_dropdown_menu > li > a { white-space: nowrap; display: block; - padding: 3px 6px; + padding: 4px 15px; color: #4c4c4c; text-decoration: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0612d8dd3a0..61b7d267551 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -287,6 +287,18 @@ $colour4: #8a89ba font-weight: bold &:hover text-decoration: underline + .oe_star_on, .oe_star_off + color: #cccccc + text-shadow: 0 0 2px black + vertical-align: top + position: relative + top: -5px + + .oe_star_on:hover, .oe_star_off:hover + text-decoration: none + + .oe_star_on + color: gold //.oe_edit_only  // }}} @@ -363,12 +375,12 @@ $colour4: #8a89ba .oe_dropdown_menu display: none position: absolute - top: 28px + top: 32px z-index: 1 border: 1px solid #afafb6 background: white - padding: 8px - min-width: 120px + padding: 6px 0 + min-width: 140px text-align: left @include radius(3px) @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) @@ -383,7 +395,7 @@ $colour4: #8a89ba > a white-space: nowrap display: block - padding: 3px 6px + padding: 4px 15px color: #4c4c4c text-decoration: none &:hover @@ -637,6 +649,7 @@ $colour4: #8a89ba &:hover @include vertical-gradient(#292929, #191919) @include box-shadow(none) + // }}} // Webclient.leftbar {{{ .oe_leftbar -- cgit v1.2.3 From 8eac49ea96e4140ec319affb55c75e96e19e4978 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 5 Jul 2012 15:20:03 +0200 Subject: [IMP] white background bzr revid: fp@tinyerp.com-20120705132003-palqn02yh8gq6535 --- addons/web/static/src/css/base.css | 5 ++--- addons/web/static/src/css/base.sass | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 443563a096b..416d92672c6 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "UTF-8"; +@charset "utf-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -34,7 +34,7 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp a { text-decoration: none; @@ -2126,7 +2126,6 @@ } .openerp .oe_list_content > tbody { cursor: pointer; - background: white; } .openerp .oe_list_content > tbody > tr { border-top: 1px solid #dddddd; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 61b7d267551..586bdd7eece 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1683,7 +1683,6 @@ $colour4: #8a89ba @include opacity(0.6) > tbody cursor: pointer - background: white > tr border-top: 1px solid #ddd > td.oe_list_field_cell -- cgit v1.2.3 From edf61ae586625906a15c6708d4561cb6c51590e8 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 5 Jul 2012 15:41:53 +0200 Subject: [IMP] original width of minh mockup bzr revid: fp@tinyerp.com-20120705134153-mxz87km72zos9idd --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 416d92672c6..ac767243e75 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1743,7 +1743,7 @@ } .openerp .oe_application .oe_form_sheet_width { min-width: 650px; - max-width: 960px; + max-width: 860px; margin: 0 auto; } .openerp .oe_application .oe_form_sheet { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 586bdd7eece..cdb14123666 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1362,7 +1362,7 @@ $colour4: #8a89ba border-bottom: 1px solid #ddd .oe_form_sheet_width min-width: 650px - max-width: 960px + max-width: 860px margin: 0 auto .oe_form_sheet background: white -- cgit v1.2.3 From f323d4209d818b944e894024fa97d192f011ba9e Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 6 Jul 2012 09:30:30 +0200 Subject: [IMP] width of sheet in a variable bzr revid: fp@tinyerp.com-20120706073030-dejwb1d37cmjm738 --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index ac767243e75..863dbb80044 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1674,7 +1674,7 @@ } .openerp .oe_form footer { min-width: 650px; - max-width: 960px; + max-width: 860px; margin: 0 auto; } .openerp ul.oe_form_steps { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index cdb14123666..be1e8b6c08e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -6,6 +6,7 @@ $facets-border: #afafb6 $facets-border-selected: #a6a6fe $hover-background: #f0f0fa $colour4: #8a89ba +$sheet-max-width: 860px // }}} // Mixins {{{ @font-face @@ -1307,7 +1308,7 @@ $colour4: #8a89ba float: right footer min-width: 650px - max-width: 960px + max-width: $sheet-max-width margin: 0 auto ul.oe_form_steps height: 30px @@ -1362,7 +1363,7 @@ $colour4: #8a89ba border-bottom: 1px solid #ddd .oe_form_sheet_width min-width: 650px - max-width: 860px + max-width: $sheet-max-width margin: 0 auto .oe_form_sheet background: white -- cgit v1.2.3 From 0267ed32bbb7ed75246e48e2ab28af0912e0387f Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 6 Jul 2012 18:43:57 +0200 Subject: Many improvements bzr revid: mit@openerp.com-20120706164357-c6p6z3ytoqbhmjjn --- addons/web/static/src/css/base.css | 108 ++++++++++++++++++++++++++++++++---- addons/web/static/src/css/base.sass | 103 +++++++++++++++++++++++++++------- 2 files changed, 180 insertions(+), 31 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 443563a096b..7bc210298db 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -91,7 +91,7 @@ list-style-type: none; } .openerp input, .openerp textarea, .openerp select { - padding: 1px 4px; + padding: 2px 4px; border: 1px solid #cccccc; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -187,15 +187,97 @@ background: #f0f0fa; } .openerp.ui-dialog { - border: 13px solid rgba(0, 0, 0, 0.3); - -moz-border-radius: 16px; - -webkit-border-radius: 16px; - border-radius: 16px; + display: none; + position: fixed; + padding: 6px; + top: 50%; + left: 50%; + z-index: 1050; + width: 560px; + margin: -150px 0 0 -280px; + background-color: rgba(60, 60, 60, 0.7); + border: 1px solid; + border-color: #888888 #555555 #444444; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; + -moz-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6); + -webkit-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6); + box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6); + -webkit-background-clip: padding-box; -moz-background-clip: padding-box; - -webkit-background-clip: padding; background-clip: padding-box; - box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.6); - -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2); +} +.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane { + padding: 16px; +} +.openerp.ui-dialog .ui-dialog-titlebar { + border-bottom: 1px solid #cacaca; + -moz-border-radius: 2px 2px 0 0; + -webkit-border-radius: 2px 2px 0 0; + border-radius: 2px 2px 0 0; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); +} +.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title { + margin: 0; + padding: 0; +} +.openerp.ui-dialog .ui-widget-header { + border: none; +} +.openerp.ui-dialog .ui-dialog-content { + background: white; +} +.openerp.ui-dialog .ui-dialog-buttonpane { + border-top: 1px solid #e0e0e0; + background: #f5f7f9; + padding: 8px; + margin: 0; + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp.ui-dialog .ui-dialog-buttonpane button { + margin-left: 8px; +} +.openerp.ui-dialog .ui-dialog-titlebar-close { + padding: 0; +} +.openerp.ui-dialog .ui-dialog-titlebar-close .ui-icon-closethick { + display: none; +} +.openerp.ui-dialog .ui-dialog-titlebar-close:before { + content: "×"; + font-size: 18px; + font-weight: bold; + line-height: 16px; + color: black; + text-shadow: 0 1px 0 white; + padding: 0; + cursor: pointer; + background: transparent; + border: 0; +} +.openerp.ui-dialog .ui-dialog-titlebar-close:before:hover { + color: black; + text-decoration: none; +} +.openerp .modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1040; + background-color: black; + filter: alpha(opacity=30); + opacity: 0.3; } .openerp .oe_i { font-family: "mnmliconsRegular" !important; @@ -352,17 +434,17 @@ .openerp .oe_button.oe_link span:hover { text-decoration: underline; } -.openerp .oe_star_on, .openerp .oe_star_off { +.openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off { color: #cccccc; text-shadow: 0 0 2px black; vertical-align: top; position: relative; top: -5px; } -.openerp .oe_star_on:hover, .openerp .oe_star_off:hover { +.openerp .oe_webclient .oe_star_on:hover, .openerp .oe_webclient .oe_star_off:hover { text-decoration: none; } -.openerp .oe_star_on { +.openerp .oe_webclient .oe_star_on { color: gold; } .openerp.oe_tooltip { @@ -453,6 +535,10 @@ position: relative; cursor: pointer; } +.openerp .oe_dropdown_toggle { + color: #888888; + font-weight: normal; +} .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { display: block; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 61b7d267551..d5d271fe07d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -143,7 +143,7 @@ $colour4: #8a89ba li list-style-type: none input, textarea, select - padding: 1px 4px + padding: 2px 4px border: 1px solid #ccc @include radius(3px) background: white @@ -200,14 +200,75 @@ $colour4: #8a89ba width: auto a.ui-state-active background: #f0f0fa + + // Modal box &.ui-dialog - border: 13px solid rgba(0, 0, 0, 0.3) - @include radius(16px) - -moz-background-clip: padding-box - -webkit-background-clip: padding - background-clip: padding-box - box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.6) - -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2) + display: none + position: fixed + padding: 6px + top: 50% + left: 50% + z-index: 1050 + width: 560px + margin: -150px 0 0 -280px + //overflow: hidden + background-color: rgba(60,60,60,0.7) + border: 1px solid + border-color: #888 #555 #444 + //overflow: hidden + @include radius(8px) + @include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6)) + @include background-clip() + .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane + padding: 16px + .ui-dialog-titlebar + border-bottom: 1px solid #cacaca + @include radius(2px 2px 0 0) + @include vertical-gradient(#FCFCFC, #DEDEDE) + .ui-dialog-title + margin: 0 + padding: 0 + .ui-widget-header + border: none + .ui-dialog-content + background: white + .ui-dialog-buttonpane + border-top: 1px solid #e0e0e0 + background: #f5f7f9 + padding: 8px + margin: 0 + @include radius(0 0 2px 2px) + button + margin-left: 8px + .ui-dialog-titlebar-close + padding: 0 + .ui-icon-closethick + display: none + &:before + content: "×" + font-size: 18px + font-weight: bold + line-height: 16px + color: black + text-shadow: 0 1px 0 white + padding: 0 + cursor: pointer + background: transparent + border: 0 + &:hover + color: black + text-decoration: none + + .modal-backdrop + position: fixed + top: 0 + right: 0 + bottom: 0 + left: 0 + z-index: 1040 + background-color: black + @include opacity(.3) + // }}} // Generic classes {{{ .oe_i @@ -287,18 +348,17 @@ $colour4: #8a89ba font-weight: bold &:hover text-decoration: underline - .oe_star_on, .oe_star_off - color: #cccccc - text-shadow: 0 0 2px black - vertical-align: top - position: relative - top: -5px - - .oe_star_on:hover, .oe_star_off:hover - text-decoration: none - - .oe_star_on - color: gold + .oe_webclient + .oe_star_on, .oe_star_off + color: #cccccc + text-shadow: 0 0 2px black + vertical-align: top + position: relative + top: -5px + .oe_star_on:hover, .oe_star_off:hover + text-decoration: none + .oe_star_on + color: gold //.oe_edit_only  // }}} @@ -370,6 +430,9 @@ $colour4: #8a89ba .oe_dropdown, .oe_dropdown_hover, .oe_dropdown_toggle position: relative cursor: pointer + .oe_dropdown_toggle + color: #888 + font-weight: normal .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened display: block .oe_dropdown_menu -- cgit v1.2.3