From c3bbd6012b47d7ba8974ca8e9068164a215df215 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 18:18:49 +0200 Subject: [PATCH] [IMP] Void oe_highlight in oe_form_editable bzr revid: fme@openerp.com-20120621161849-dzedftfw2g789vwn --- addons/web/static/src/css/base.css | 10 +++++----- addons/web/static/src/css/base.sass | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 3245942..91600f0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -103,7 +103,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 .oe_form_editable button.oe_highlight { display: inline-block; border: 1px solid #ababab; color: #404040; @@ -128,7 +128,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 .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); @@ -138,7 +138,7 @@ background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); cursor: pointer; } -.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 .oe_form_editable button.oe_highlight:focus { border: 1px solid #80bfff; background-color: #f6f6f6; background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); @@ -151,7 +151,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 .oe_form_editable button.oe_highlight:active { background: #e3e3e3; background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f; background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f; @@ -160,7 +160,7 @@ -webkit-box-shadow: none; box-shadow: none; } -.openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled { +.openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled, .openerp .oe_form_editable button.oe_highlight:disabled { background: #efefef !important; border: 1px solid #d1d1d1 !important; -moz-box-shadow: none !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index dea2fbc..f4e4f57 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -144,7 +144,7 @@ $colour4: #8a89ba 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'], .oe_form_editable button.oe_highlight display: inline-block border: 1px solid #ababab color: #404040 @@ -159,23 +159,23 @@ $colour4: #8a89ba -webkit-font-smoothing: antialiased outline: none - a.button:hover, button:hover, input[type='submit']:hover + a.button:hover, button:hover, input[type='submit']:hover, .oe_form_editable button.oe_highlight:hover @include vertical-gradient(#f6f6f6, #e3e3e3) cursor: pointer - a.button:focus, button:focus, input[type='submit']:focus + a.button:focus, button:focus, input[type='submit']:focus, .oe_form_editable button.oe_highlight: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 + a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active, .oe_form_editable button.oe_highlight: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 + a.button.disabled, button:disabled, input[type='submit']:disabled, .oe_form_editable button.oe_highlight:disabled background: #efefef !important border: 1px solid #d1d1d1 !important @include box-shadow(none !important) -- 1.7.10.4