From da86f505acf8b6c906f80933dc733c02ffa84eec Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 3 Sep 2012 18:40:10 +0200 Subject: [PATCH] Added polish to left menu bzr revid: mit@openerp.com-20120903164010-itzwtaf37c6bas71 --- addons/web/static/src/css/base.css | 33 ++++++++++++++------ addons/web/static/src/css/base.sass | 16 ++++++---- addons/web_kanban/static/src/css/kanban.css | 5 +-- addons/web_kanban/static/src/css/kanban.sass | 3 +- 4 files changed, 35 insertions(+), 22 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b1c6348b2ad..e875ff9fab2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -454,6 +454,9 @@ -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } +.openerp .oe_background_grey { + background: #eeeeee !important; +} .openerp .oe_form_dirty .oe_highlight_on_dirty { color: white; background: #dc5f59; @@ -1207,24 +1210,31 @@ .openerp .oe_secondary_submenu .oe_menu_counter { float: right; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - margin: 0px; + margin: 1px; padding: 1px 4px; + border: none; } .openerp .oe_secondary_submenu .oe_menu_counter:hover { cursor: pointer; - border: 1px solid #c81010; - -moz-box-shadow: 0 0 2px #c81010; - -webkit-box-shadow: 0 0 2px #c81010; - box-shadow: 0 0 2px #c81010; + -moz-transform: scale(1.1); + -webkit-transform: scale(1.1); + -o-transform: scale(1.1); + -ms-transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - background: #7c7bad; border-top: 1px solid lightGray; - border-bottom: 1px solid lightGray; + border-bottom: 1px solid #e0e0e0; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); + background-color: #7372a7; + background-image: -webkit-gradient(linear, left top, left bottom, from(#7372a7), to(#8281b1)); + background-image: -webkit-linear-gradient(top, #7372a7, #8281b1); + background-image: -moz-linear-gradient(top, #7372a7, #8281b1); + background-image: -ms-linear-gradient(top, #7372a7, #8281b1); + background-image: -o-linear-gradient(top, #7372a7, #8281b1); + background-image: linear-gradient(to bottom, #7372a7, #8281b1); } .openerp .oe_secondary_submenu .oe_active a { color: white; @@ -1240,6 +1250,9 @@ .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; color: #7c7bad; + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); } .openerp .oe_secondary_submenu .oe_menu_toggler:before { width: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1b6a1b3d766..637a1975e32 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -390,6 +390,8 @@ $sheet-max-width: 860px @include vertical-gradient(#DF6B66, #BF3A33) //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + .oe_background_grey + background: #eee !important .oe_form_dirty .oe_highlight_on_dirty @@ -945,18 +947,19 @@ $sheet-max-width: 860px .oe_menu_counter float: right text-shadow: 0 1px 1px rgba(0,0,0,0.2) - margin: 0px + margin: 1px padding: 1px 4px + border: none &:hover cursor: pointer - border: 1px solid #C81010 - @include box-shadow(0 0 2px #C81010) + @include transform(scale(1.1)) .oe_active - background: $link-color border-top: 1px solid lightGray - border-bottom: 1px solid lightGray + border-bottom: 1px solid #e0e0e0 text-shadow: 0 1px 1px rgba(0,0,0,0.2) - @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2)) + @include box-shadow((inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2))) + //background: $link-color + @include vertical-gradient(darken($link-color, 3%), lighten($link-color, 2%)) a color: white .oe_menu_label @@ -967,6 +970,7 @@ $sheet-max-width: 860px .oe_menu_counter background: #eee color: $link-color + @include box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.2)) .oe_menu_toggler:before width: 0 height: 0 diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 299aba737e6..1b9530b0845 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -1,4 +1,5 @@ .openerp .oe_kanban_view { + background: white; height: inherit; } .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_dummy_cell { @@ -229,7 +230,6 @@ margin-bottom: 5px; } .openerp .oe_kanban_view .oe_kanban_box_header { - background: #eeeeee; border-bottom: 1px solid #cccccc; } .openerp .oe_kanban_view .oe_kanban_title { @@ -248,9 +248,6 @@ .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_show_more .oe_button { width: 100%; } -.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column { - background: #eeeeee; -} .openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column .oe_kanban_record { float: left; padding: 2px; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 30bfe9b364f..cd2b210a733 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -37,6 +37,7 @@ .openerp .oe_kanban_view // KanbanView {{{ //background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==) + background: white height: inherit &.oe_kanban_grouped .oe_kanban_dummy_cell background: url(/web/static/src/img/form_sheetbg.png) @@ -219,7 +220,6 @@ -webkit-border-radius: 4px margin-bottom: 5px .oe_kanban_box_header - background: #EEE border-bottom: 1px solid #CCC .oe_kanban_title font-size: 95% @@ -234,7 +234,6 @@ &.oe_kanban_grouped .oe_kanban_show_more .oe_button width: 100% &.oe_kanban_ungrouped .oe_kanban_column - background: #eee .oe_kanban_record float: left padding: 2px