From 3e99ca7285a3eb7b9aa2a8179ba408beca021f40 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 17 Apr 2014 15:34:57 +0200 Subject: [IMP] small css tweaks to stat buttons (addon web) bzr revid: ged@openerp.com-20140417133457-m04g3560jnwjudnr --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 570bb367a70..a4653fad853 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -79,7 +79,7 @@ vertical-align: top; } .openerp .oe_title { - width: 50%; + width: 38%; float: left; } .openerp .oe_title:after { @@ -316,7 +316,7 @@ } .openerp .oe_button_box { width: 400px; - text-align: left; + text-align: right; } .openerp .oe_button_box .oe_stat_button:hover { background: #7c7bad; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0a2bee832e4..d2bc762853d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -190,7 +190,7 @@ $sheet-padding: 16px td vertical-align: top .oe_title - width: 50% + width: 38% float: left .oe_title:after content: "." @@ -332,7 +332,7 @@ $sheet-padding: 16px background: #ED6F6A .oe_button_box width: 400px - text-align: left + text-align: right .oe_stat_button:hover background: #7c7bad color: white -- cgit v1.2.3 From fcacd5452c34304e9bb781f5d2fa2f740138e1ce Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 17 Apr 2014 15:37:06 +0200 Subject: [IMP] improves the css for the stat buttons: moves the css independent of oe_button_box to a oe_stat_button section to allow a better look when used out of the button box (addon web) bzr revid: ged@openerp.com-20140417133706-c60zdovc3k4ll9ga --- addons/web/static/src/css/base.css | 56 +++++++++++++++++-------------- addons/web/static/src/css/base.sass | 67 +++++++++++++++++++------------------ 2 files changed, 64 insertions(+), 59 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a4653fad853..813f75345a3 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"); @@ -314,56 +314,58 @@ .openerp .oe_form_dirty button.oe_highlight_on_dirty:hover { background: #ed6f6a; } -.openerp .oe_button_box { - width: 400px; - text-align: right; -} -.openerp .oe_button_box .oe_stat_button:hover { - background: #7c7bad; - color: white; -} -.openerp .oe_button_box .oe_stat_button:hover .fa { - color: white; -} -.openerp .oe_button_box .oe_stat_button { +.openerp .oe_stat_button { font-weight: normal; - display: inline-table; - width: 33% !important; height: 42px; - margin: 0px -1px -1px 0px; - padding: 0; color: #666666; border: 1px solid #dddddd; border-radius: 0; box-shadow: none; background: white; } -.openerp .oe_button_box .oe_stat_button > div { +.openerp .oe_stat_button > div { display: table-cell; vertical-align: middle; text-align: left; padding: 0; line-height: 120%; } -.openerp .oe_button_box .oe_stat_button .stat_button_icon { +.openerp .oe_stat_button .stat_button_icon { color: #7c7bad; font-size: 24px; padding: 0px 3px; width: 37px; text-align: center; } -.openerp .oe_button_box .oe_stat_button .oe_form_field_percent_pie { +.openerp .oe_stat_button .oe_form_field_percent_pie { width: 42px; } -.openerp .oe_button_box .oe_stat_button .oe_form_field_bar_chart { +.openerp .oe_stat_button .oe_form_field_bar_chart { width: 42px; } -.openerp .oe_button_box .oe_stat_button svg { +.openerp .oe_stat_button svg { width: 38px; height: 38px; display: inline; vertical-align: middle; } +.openerp .oe_stat_button:hover { + background: #7c7bad; + color: white; +} +.openerp .oe_stat_button:hover .fa { + color: white; +} +.openerp .oe_button_box { + width: 400px; + text-align: right; +} +.openerp .oe_button_box .oe_stat_button { + display: inline-table; + width: 33% !important; + margin: 0px -1px -1px 0px; + padding: 0; +} .openerp .oe_avatar > img { max-height: 90px; max-width: 90px; @@ -3331,6 +3333,7 @@ body.oe_single_form .oe_single_form_container { width: 18px; height: 18px; } + .modal .modal-header button.close { border: none; background: none; @@ -3341,12 +3344,13 @@ body.oe_single_form .oe_single_form_container { .modal .modal-footer { text-align: left; } -.modal .oe_act_window.modal-body{ - padding: 0; -} -.modal .oe_button{ +.modal .oe_button { margin: 0 4px 0 0; } +.modal .oe_act_window.modal-body { + padding: 0; +} + input[type="radio"], input[type="checkbox"] { margin-right: 4px; margin-left: 4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d2bc762853d..23a0095cb08 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -330,47 +330,48 @@ $sheet-padding: 16px @include box-shadow(none) &:hover background: #ED6F6A + .oe_stat_button + font-weight: normal + height: 42px + color: #666 + border: 1px solid #dddddd + border-radius: 0 + box-shadow: none + background: white + > div + display: table-cell + vertical-align: middle + text-align: left + padding: 0 + line-height: 120% + .stat_button_icon + color: #7C7BAD + font-size: 24px + padding: 0px 3px + width: 37px + text-align: center + .oe_form_field_percent_pie + width: 42px + .oe_form_field_bar_chart + width: 42px + svg + width: 38px + height: 38px + display: inline + vertical-align: middle + .oe_stat_button:hover + background: #7c7bad + color: white + .fa + color: white .oe_button_box width: 400px text-align: right - .oe_stat_button:hover - background: #7c7bad - color: white - .fa - color: white .oe_stat_button - font-weight: normal display: inline-table width: 33% !important - height: 42px margin: 0px -1px -1px 0px padding: 0 - color: #666 - border: 1px solid #dddddd - border-radius: 0 - box-shadow: none - background: white - > div - display: table-cell - vertical-align: middle - text-align: left - padding: 0 - line-height: 120% - .stat_button_icon - color: #7C7BAD - font-size: 24px - padding: 0px 3px - width: 37px - text-align: center - .oe_form_field_percent_pie - width: 42px - .oe_form_field_bar_chart - width: 42px - svg - width: 38px - height: 38px - display: inline - vertical-align: middle .oe_avatar > img max-height: 90px -- cgit v1.2.3 From 98b45f97ebebdb70a21347508fca327b4975f6d5 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 17 Apr 2014 15:37:35 +0200 Subject: [IMP] small css tweaks to stat buttons (addon web) bzr revid: ged@openerp.com-20140417133735-ijp8il7e1igs7z95 --- addons/web/static/src/css/base.css | 6 +++--- addons/web/static/src/css/base.sass | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 813f75345a3..b9f681281bb 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -316,8 +316,11 @@ } .openerp .oe_stat_button { font-weight: normal; + width: 132px !important; height: 42px; color: #666666; + margin: 0px -1px -1px 0px; + padding: 0; border: 1px solid #dddddd; border-radius: 0; box-shadow: none; @@ -362,9 +365,6 @@ } .openerp .oe_button_box .oe_stat_button { display: inline-table; - width: 33% !important; - margin: 0px -1px -1px 0px; - padding: 0; } .openerp .oe_avatar > img { max-height: 90px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 23a0095cb08..3934f0f9acb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -332,8 +332,11 @@ $sheet-padding: 16px background: #ED6F6A .oe_stat_button font-weight: normal + width: 132px !important height: 42px color: #666 + margin: 0px -1px -1px 0px + padding: 0 border: 1px solid #dddddd border-radius: 0 box-shadow: none @@ -369,9 +372,6 @@ $sheet-padding: 16px text-align: right .oe_stat_button display: inline-table - width: 33% !important - margin: 0px -1px -1px 0px - padding: 0 .oe_avatar > img max-height: 90px -- cgit v1.2.3 From 5910f9375f2181da8f847738eb2118073986bc61 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Fri, 18 Apr 2014 11:34:53 +0200 Subject: [IMP] removes 2px to the stat button height, to save on vertical space (addon web) bzr revid: ged@openerp.com-20140418093453-4u0vcqbtj2pdqi69 --- 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 b9f681281bb..b0bfcda8b38 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -317,7 +317,7 @@ .openerp .oe_stat_button { font-weight: normal; width: 132px !important; - height: 42px; + height: 40px; color: #666666; margin: 0px -1px -1px 0px; padding: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3934f0f9acb..7b863cb1527 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -333,7 +333,7 @@ $sheet-padding: 16px .oe_stat_button font-weight: normal width: 132px !important - height: 42px + height: 40px color: #666 margin: 0px -1px -1px 0px padding: 0 -- cgit v1.2.3 From 447fa873dfa72b49e75baa2953b9a5346b661502 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Wed, 23 Apr 2014 10:19:14 +0200 Subject: [FIX] Force zindex for elements which should be at top of a modal window. bzr revid: jke@openerp.com-20140423081914-anmpeae40z7dav4a --- addons/web/static/src/css/base.css | 14 ++++++++++---- addons/web/static/src/css/base.sass | 6 +++++- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b8c28e1660e..9dd8e55723e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -754,7 +754,7 @@ border-bottom-left-radius: 8px; } .openerp .oe_notification { - z-index: 1050; + z-index: 1500; } .openerp .oe_webclient_timezone_notification a { color: white; @@ -3331,6 +3331,7 @@ body.oe_single_form .oe_single_form_container { width: 18px; height: 18px; } + .modal .modal-header button.close { border: none; background: none; @@ -3341,12 +3342,17 @@ body.oe_single_form .oe_single_form_container { .modal .modal-footer { text-align: left; } -.modal .oe_act_window.modal-body{ +.modal .oe_button { + margin: 0 4px 0 0; +} +.modal .oe_act_window.modal-body { padding: 0; } -.modal .oe_button{ - margin: 0 4px 0 0; + +.ui-datepicker { + z-index: 1500 !important; } + input[type="radio"], input[type="checkbox"] { margin-right: 4px; margin-left: 4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a98948117f6..ebffed27410 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -666,7 +666,8 @@ $sheet-padding: 16px // }}} // Notifications {{{ .oe_notification - z-index: 1050 + z-index: 1500 + .oe_webclient_timezone_notification a color: white @@ -2725,6 +2726,9 @@ body.oe_single_form .oe_act_window.modal-body padding: 0 +.ui-datepicker + z-index: 1500 !important + input[type="radio"], input[type="checkbox"] margin-right: 4px margin-left: 4px -- cgit v1.2.3 From 48e9d255ae71b6325ab1d92c83bca4728b449410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 23 Apr 2014 11:41:24 +0200 Subject: [FIX] web: list view: fixed button behavior - icon-like behavior is the default behavior - text-based buttons (using btn_txt class) are used whenever no icon is given to the button in a list view. This way the previous behavior is always the default behavior, and the css modifications are done only for the text-based buttons, avoiding side-effects. bzr revid: tde@openerp.com-20140423094124-8zq3yysy616aowu2 --- addons/web/static/src/css/base.css | 10 ++++++---- addons/web/static/src/css/base.sass | 7 +++++-- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 9dd8e55723e..503d6f84aa1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2776,13 +2776,15 @@ padding: 3px 6px; white-space: pre-line; } -.openerp .oe_list_content > tbody > tr > td > button.btn_img, .openerp .oe_list_content > tbody > tr > th > button.btn_img { +.openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button { border: none; background: transparent; padding: 0; - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; +} +.openerp .oe_list_content > tbody > tr > td > button.btn_txt, .openerp .oe_list_content > tbody > tr > th > button.btn_txt { + border: 1px solid rgba(0, 0, 0, 0.4); + background: #e3e3e3; + padding: 3px 12px; } .openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child { width: 17px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ebffed27410..8ebb2d88ca3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2248,11 +2248,14 @@ $sheet-padding: 16px padding: 3px 6px white-space: pre-line > td, > th - > button.btn_img + > button border: none background: transparent padding: 0 - @include box-shadow(none) + > button.btn_txt + border: 1px solid rgba(0,0,0,0.4) + background: #e3e3e3 + padding: 3px 12px > td.oe_list_checkbox:first-child, th.oe_list_checkbox:first-child width: 17px &:after -- cgit v1.2.3