From ad6742b6b873507b577231323392b70dea96512c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 26 Jul 2012 13:55:50 +0200 Subject: [PATCH 1/8] [FIX] kanban group dropdown bzr revid: al@openerp.com-20120726115550-bu4jp1163bb4ov6n --- addons/web_kanban/static/src/css/kanban.css | 2 +- addons/web_kanban/static/src/css/kanban.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index a6f2cc7441b..5830cb33e0f 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -50,7 +50,7 @@ .openerp .oe_kanban_view .oe_kanban_group_title { font-size: 16px; font-weight: bold; - min-height: 30px; + min-height: 32px; color: #333333; text-shadow: 0 1px 0 white; } diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 7175b398cbe..44b3251c8fb 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -73,7 +73,7 @@ .oe_kanban_group_title font-size: 16px font-weight: bold - min-height: 30px + min-height: 32px color: #333333 text-shadow: 0 1px 0 white > span From 6e48ab42041c589c9c63cfa7ba289df80652c0f1 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 26 Jul 2012 14:20:06 +0200 Subject: [PATCH 2/8] Resizing of the About dialog to match the golden ratio bzr revid: mit@openerp.com-20120726122006-5y3tm5r2fwk0m233 --- addons/web/static/src/js/chrome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index b5c69f5c82f..4a76d7ded2f 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -864,7 +864,7 @@ instance.web.UserMenu = instance.web.Widget.extend({ window.location.href, 'debug'); }); instance.web.dialog($help, {autoOpen: true, - modal: true, width: 580, height: 290, resizable: false, title: _t("About")}); + modal: true, width: 507, height: 290, resizable: false, title: _t("About")}); }); }, }); From 5f2fe0169be2b0cb5bde166aa3db750dcc74bcb9 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 26 Jul 2012 18:11:06 +0200 Subject: [PATCH 3/8] Rationalization of tag css classes bzr revid: mit@openerp.com-20120726161106-5a9uu0wjuwausmgh --- addons/web/static/src/css/base.css | 50 +++++++++++++-------------- addons/web/static/src/css/base.sass | 53 +++++++++++++++-------------- addons/web/static/src/xml/base.xml | 4 +-- 3 files changed, 54 insertions(+), 53 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e929ec6c16b..9b6cd67b51c 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"); @@ -551,17 +551,19 @@ -webkit-animation: bounce 0.4s linear; } .openerp .oe_tag { - border-radius: 2px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - border: 1px solid #9daccc; - background: #e2e6f0; - color: black !important; - padding: 0px 3px 0px 3px; + border: 1px solid #afafb6; + font-size: 11px; + padding: 2px 4px; margin: 0 2px 2px 0; - height: 16px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background: #f0f0fa; + color: #4c4c4c; +} +.openerp .oe_tag_dark { + background: #8786b7; + color: #eeeeee; } .openerp .oe_tags .text-wrap { width: 100% !important; @@ -1183,16 +1185,9 @@ } .openerp .oe_secondary_submenu .oe_menu_counter { float: right; - background: #8a89ba; - color: #eeeeee; - font-size: 10px; - border: 1px solid lightgray; - padding: 2px 4px; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); margin: 0px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; + padding: 1px 4px; } .openerp .oe_secondary_submenu .oe_active { background: #8a89ba; @@ -1532,25 +1527,27 @@ display: inline-block; line-height: 17px; } -.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet { +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet { height: 18px; margin: 1px 0; font-size: 11px; } -.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input:focus, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus { +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus { outline: none; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_input { padding: 0 0 0 6px; + font-size: 12px; + height: 16px; + margin-top: 3px; +} +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input:focus { + outline: none; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet { position: relative; cursor: pointer; - border: 1px solid #afafb6; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background: #8786b7; + padding: 0; -webkit-font-smoothing: auto; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus { @@ -1579,6 +1576,7 @@ .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value { border-left: 1px solid #afafb6; text-shadow: 0 1px 1px white; + color: #4c4c4c; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value:last-child { padding-right: 16px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c9e00c65a8a..dd4f9baee66 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2,8 +2,10 @@ // Variables {{{ $section-title-color: #8786b7 -$facets-border: #afafb6 -$facets-border-selected: #a6a6fe +$tag-bg-light: #f0f0fa +$tag-bg-dark: #8786b7 +$tag-border: #afafb6 +$tag-border-selected: #a6a6fe $hover-background: #f0f0fa $colour4: #8a89ba $sheet-max-width: 860px @@ -427,15 +429,17 @@ $sheet-max-width: 860px // }}} // Tags (for many2many tags, among others) {{{ .oe_tag - border-radius: 2px - @include box-sizing(border) - border: 1px solid #9DACCC - background: #E2E6F0 - color: black !important - padding: 0px 3px 0px 3px + border: 1px solid $tag-border + font-size: 11px + padding: 2px 4px margin: 0 2px 2px 0 - height: 16px - // font: 11px "lucida grande", tahoma, verdana, arial, sans-serif + @include radius(3px) + background: $tag-bg-light + color: #4C4C4C + .oe_tag_dark + background: $tag-bg-dark + color: #eee + .oe_tags .text-wrap width: 100% !important @@ -906,14 +910,9 @@ $sheet-max-width: 860px @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2)) .oe_menu_counter float: right - background: #8a89ba - color: #eee - font-size: 10px - border: 1px solid lightgray - padding: 2px 4px text-shadow: 0 1px 1px rgba(0,0,0,0.2) margin: 0px - @include radius(4px) + padding: 1px 4px .oe_active background: $colour4 border-top: 1px solid lightGray @@ -1125,8 +1124,8 @@ $sheet-max-width: 860px font-size: 12px line-height: 18px &.oe_focused - border-color: $facets-border-selected - @include box-shadow(0 1px 2px $facets-border-selected inset) + border-color: $tag-border-selected + @include box-shadow(0 1px 2px $tag-border-selected inset) .oe_searchview_clear cursor: pointer position: absolute @@ -1177,7 +1176,7 @@ $sheet-max-width: 860px vertical-align: top display: inline-block line-height: 17px - .oe_searchview_input, .oe_searchview_facet + .oe_searchview_facet height: 18px margin: 1px 0 font-size: 11px @@ -1185,17 +1184,20 @@ $sheet-max-width: 860px outline: none .oe_searchview_input padding: 0 0 0 6px + font-size: 12px + height: 16px + margin-top: 3px + &:focus + outline: none .oe_searchview_facet position: relative cursor: pointer - border: 1px solid $facets-border - @include radius(3px) - background: #8786b7 + padding: 0 -webkit-font-smoothing: auto // spacing for opera, FF &:focus - border-color: $facets-border-selected - @include box-shadow(0 0 3px 1px $facets-border-selected) + border-color: $tag-border-selected + @include box-shadow(0 0 3px 1px $tag-border-selected) .oe_facet_values background: #f0f0fa @include radius(0 3px 3px 0) @@ -1208,8 +1210,9 @@ $sheet-max-width: 860px .oe_facet_category.oe_i font-size: 16px .oe_facet_value - border-left: 1px solid $facets-border + border-left: 1px solid $tag-border text-shadow: 0 1px 1px white + color: #4C4C4C &:last-child padding-right: 16px .oe_facet_remove diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 55353f0a748..c6b8b20c9bd 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -310,7 +310,7 @@ t-att-data-action-id="menu.action ? menu.action.split(',')[1] : ''"> -
+
@@ -1269,7 +1269,7 @@ contenteditable="true"/>
x From 84488630075d41930a8d2a715eebb62e69471b2f Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 30 Jul 2012 17:47:50 +0200 Subject: [PATCH 4/8] Restyling of jquery-ui buttons in dialog box + various style fixes bzr revid: mit@openerp.com-20120730154750-x40vpq9y9f492zvn --- addons/web/static/src/css/base.css | 27 ++++++++++++++++++--------- addons/web/static/src/css/base.sass | 22 +++++++++++++++------- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 9b6cd67b51c..703683d4d96 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -148,7 +148,7 @@ .openerp h4 { margin: 4px 0; } -.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'] { +.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; color: #404040; @@ -173,7 +173,7 @@ -webkit-font-smoothing: antialiased; outline: none; } -.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover { +.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-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); @@ -182,9 +182,11 @@ background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3); background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); cursor: pointer; + background-position: 0; } -.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus { +.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus { border: 1px solid #80bfff; + background-position: 0; background-color: #f6f6f6; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); @@ -196,7 +198,7 @@ -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; } -.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active { +.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-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); @@ -230,11 +232,6 @@ .openerp .ui-menu .ui-menu-item a.ui-state-active { background: #f0f0fa; } -.openerp div.ui-widget-overlay { - background: black; - filter: alpha(opacity=30); - opacity: 0.3; -} .openerp.ui-dialog { display: none; padding: 6px; @@ -294,6 +291,9 @@ .openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: left; } +.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { + margin-right: 4px; +} .openerp.ui-dialog .ui-dialog-titlebar-close { padding: 0; } @@ -329,6 +329,9 @@ .openerp.ui-dialog .oe_about a:hover { text-decoration: underline; } +.openerp.ui-dialog .oe_about a:focus { + outline: none; +} .openerp.ui-dialog .oe_about .oe_logo { margin-left: -6px; } @@ -2539,3 +2542,9 @@ .kitten-mode-activated > * { opacity: 0.7; } + +div.ui-widget-overlay { + background: black; + filter: alpha(opacity=30); + opacity: 0.3; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index dd4f9baee66..2a2d816241f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -184,7 +184,7 @@ $sheet-max-width: 860px margin: 4px 0 // }}} // Button style {{{ - a.button:link, a.button:visited, button, input[type='submit'] + a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button display: inline-block border: 1px solid #ababab color: #404040 @@ -199,16 +199,18 @@ $sheet-max-width: 860px -webkit-font-smoothing: antialiased outline: none - a.button:hover, button:hover, input[type='submit']:hover + a.button:hover, button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover @include vertical-gradient(#f6f6f6, #e3e3e3) cursor: pointer + background-position: 0 - a.button:focus, button:focus, input[type='submit']:focus + a.button:focus, button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus border: 1px solid #80bfff + background-position: 0 @include vertical-gradient(#f6f6f6, #e3e3e3) @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset)) - a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active + a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active @include vertical-gradient(#e3e3e3, #f6f6f6) @include box-shadow(none) @@ -231,9 +233,7 @@ $sheet-max-width: 860px width: auto a.ui-state-active background: #f0f0fa - div.ui-widget-overlay - background: black - @include opacity(0.3) + // Modal box &.ui-dialog display: none @@ -270,6 +270,8 @@ $sheet-max-width: 860px margin: 0 .ui-dialog-buttonset float: left + .ui-button + margin-right: 4px .ui-dialog-titlebar-close padding: 0 .ui-icon-closethick @@ -296,6 +298,8 @@ $sheet-max-width: 860px color: #8A89BA &:hover text-decoration: underline + &:focus + outline: none .oe_logo margin-left: -6px .oe_bottom @@ -1993,6 +1997,10 @@ $sheet-max-width: 860px // }}} +// The jQuery-ui overlay is outside the .openerp div, please don't add indentation !!! +div.ui-widget-overlay + background: black + @include opacity(0.3) // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: From 0fa88efde693fe8e0f3efd384b17d1012935159e Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 30 Jul 2012 19:18:44 +0200 Subject: [PATCH 5/8] fixed display issue in kanban nocontent view bzr revid: mit@openerp.com-20120730171844-4cjadauklpe8if2e --- addons/web_kanban/static/src/js/kanban.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index cd12953adcd..568e6890522 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -161,6 +161,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ }, do_search: function(domain, context, group_by) { var self = this; + this.$element.find('.oe_view_nocontent').parent().addClass('oe_kanban_view').find('.oe_kanban_groups').show(); this.$element.find('.oe_view_nocontent').remove(); this.search_domain = domain; this.search_context = context; @@ -335,7 +336,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ $('
') .append($('', { src: '/web/static/src/img/view_empty_arrow.png' })) .append($('
').html(this.options.action.help)) - ); + ).removeClass('oe_kanban_view').find('.oe_kanban_groups').hide(); } }); From 3364a85ba5904ed4bdd8fe9c61574e794c0ce9a7 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 1 Aug 2012 16:28:05 +0200 Subject: [PATCH 6/8] fixed padding in kanban tags and searchview tags bzr revid: mit@openerp.com-20120801142805-5drbpx6t3ks7p86s --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + addons/web_kanban/static/src/css/kanban.css | 5 ++++- addons/web_kanban/static/src/css/kanban.sass | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 703683d4d96..a15d8ca4b22 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1592,6 +1592,7 @@ line-height: 8px; width: 12px; height: 12px; + padding-top: 1px; text-align: center; font-weight: bold; cursor: pointer; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2a2d816241f..8723d9d6f2e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1227,6 +1227,7 @@ $sheet-max-width: 860px line-height: 8px width: 12px height: 12px + padding-top: 1px text-align: center font-weight: bold cursor: pointer diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 5830cb33e0f..246475a2b7f 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -1,4 +1,3 @@ -@charset "utf-8"; .openerp .oe_kanban_view { background: url(/web/static/src/img/form_sheetbg.png); height: inherit; @@ -169,6 +168,10 @@ .openerp .oe_kanban_view .oe_kanban_details h4 { margin: 0 0 4px 0; } +.openerp .oe_kanban_view .oe_kanban_details .oe_tag { + display: inline-block; + margin: 0 0 2px 0; +} .openerp .oe_kanban_view .oe_kanban_record { position: relative; display: block; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 44b3251c8fb..ae387244024 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -176,6 +176,9 @@ color: #4c4c4c h4 margin: 0 0 4px 0 + .oe_tag + display: inline-block + margin: 0 0 2px 0 .oe_kanban_record position: relative display: block From ad585bf761e99e8037d2ff50ddc303ad0d4a8086 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 3 Aug 2012 17:37:58 +0200 Subject: [PATCH 7/8] Restyling of 'edit avatar' button bzr revid: mit@openerp.com-20120803153758-03jg3xuwyrh2e198 --- addons/web/static/src/css/base.css | 29 ++++++++----------- addons/web/static/src/css/base.sass | 43 +++++++++++++---------------- addons/web/static/src/xml/base.xml | 7 +---- 3 files changed, 32 insertions(+), 47 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1aa6f8aa54a..41ba0ce4cc3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -224,6 +224,9 @@ font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; font-size: 13px; } +.openerp .ui-widget-content a { + color: #8a89ba; +} .openerp .ui-menu .ui-menu-item { margin: 0 8px 0 0; padding: 0 0 0 12px; @@ -487,9 +490,6 @@ .openerp .oe_button_box button { margin: 4px; } -.openerp .oe_avatar { - margin: 0 6px 15px 0; -} .openerp .oe_avatar > img { height: 90px; max-width: 100px; @@ -2199,20 +2199,14 @@ .openerp .oe_form_editable .oe_form .oe_form_field_datetime { width: 11.5em !important; } -.openerp .oe_hidden_input_file { - overflow: hidden; - position: relative; - display: inline-block; - width: 45px; - height: 30px; -} .openerp .oe_hidden_input_file input.oe_form_binary_file { z-index: 0; line-height: 0; font-size: 12px; position: absolute; top: 1px; - right: 10px; + left: 0; + right: 0; opacity: 0; filter: alpha(opacity=0); -ms-filter: "alpha(opacity=0)"; @@ -2228,15 +2222,16 @@ } .openerp .oe_form .oe_form_field_image .oe_form_field_image_controls { position: absolute; - white-space: nowrap; top: 1px; - padding: 3px 0 0 0; - margin: 0 1px; + padding: 4px; + width: 100%; display: none; - width: 99%; text-align: center; - background: url(/web/static/src/img/form_sheetbg.png); - border-bottom: 1px dotted black; + color: #eeeeee; + background: rgba(37, 37, 37, 0.9); + -moz-border-radius: 3px 3px 0 0; + -webkit-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0eb4472164f..a2b4231b130 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -7,7 +7,7 @@ $tag-bg-dark: #8786b7 $tag-border: #afafb6 $tag-border-selected: #a6a6fe $hover-background: #f0f0fa -$colour4: #8a89ba +$link-color: #8a89ba $sheet-max-width: 860px // }}} // Mixins {{{ @@ -226,6 +226,8 @@ $sheet-max-width: 860px .ui-widget font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif font-size: 13px + .ui-widget-content a + color: $link-color .ui-menu .ui-menu-item margin: 0 8px 0 0 @@ -295,7 +297,7 @@ $sheet-max-width: 860px background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=) @include radius(0 0 2px 2px) a - color: #8A89BA + color: $link-color &:hover text-decoration: underline &:focus @@ -397,7 +399,6 @@ $sheet-max-width: 860px button margin: 4px .oe_avatar - margin: 0 6px 15px 0 > img height: 90px max-width: 100px @@ -412,7 +413,7 @@ $sheet-max-width: 860px display: none span @include reset() - color: #8A89BA + color: $link-color font-weight: bold &:hover text-decoration: underline @@ -886,7 +887,7 @@ $sheet-max-width: 860px .oe_secondary_menu_section font-weight: bold margin-left: 8px - color: $colour4 + color: $link-color .oe_secondary_submenu padding: 2px 0 8px 0 margin: 0 @@ -904,7 +905,7 @@ $sheet-max-width: 860px top: 1px right: 1px font-size: 10px - background: $colour4 + background: $link-color color: white padding: 2px 4px margin: 1px 6px 0 0 @@ -918,7 +919,7 @@ $sheet-max-width: 860px margin: 0px padding: 1px 4px .oe_active - background: $colour4 + background: $link-color border-top: 1px solid lightGray border-bottom: 1px solid lightGray text-shadow: 0 1px 1px rgba(0,0,0,0.2) @@ -927,12 +928,12 @@ $sheet-max-width: 860px color: white .oe_menu_label background: #eee - color: $colour4 + color: $link-color text-shadow: 0 1px 1px white @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2)) .oe_menu_counter background: #eee - color: #8a89ba + color: $link-color .oe_menu_toggler:before width: 0 height: 0 @@ -959,7 +960,7 @@ $sheet-max-width: 860px .oe_application width: 100% a - color: $colour4 + color: $link-color &:hover text-decoration: underline > div @@ -993,7 +994,7 @@ $sheet-max-width: 860px margin: 0 float: left a - color: $colour4 + color: $link-color .oe_button_group display: inline-block border: 1px solid #ababab @@ -1706,19 +1707,14 @@ $sheet-max-width: 860px * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image */ .oe_hidden_input_file - overflow: hidden - position: relative - display: inline-block - width: 45px - height: 30px input.oe_form_binary_file z-index: 0 line-height: 0 font-size: 12px position: absolute - // Should be adjusted for all browsers top: 1px - right: 10px + left: 0 + right: 0 opacity: 0 filter: alpha(opacity = 0) -ms-filter: "alpha(opacity=0)" @@ -1733,15 +1729,14 @@ $sheet-max-width: 860px vertical-align: top .oe_form_field_image_controls position: absolute - white-space: nowrap top: 1px - padding: 3px 0 0 0 - margin: 0 1px + padding: 4px + width: 100% display: none - width: 99% text-align: center - background: url(/web/static/src/img/form_sheetbg.png) - border-bottom: 1px dotted black + color: #eee + background: rgba(37,37,37,0.9) + @include radius(3px 3px 0 0) @include box-sizing(border) &:hover .oe_form_field_image_controls display: block diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 014868eac90..37da66eb082 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1042,13 +1042,8 @@
- + Edit -