summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2012-06-28 16:32:52 +0200
committerFabien Meghazi <fme@openerp.com>2012-06-28 16:32:52 +0200
commit89b2b1e3072f950c1e93ba9dc217819326904557 (patch)
treeb8019cd69b06837adcde2a7f57dec3b894ff71f3 /addons/web/static/src/css
parent8e392289a31c87ff1f586bdb5e2cf60d3631ce3a (diff)
[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
Diffstat (limited to 'addons/web/static/src/css')
-rw-r--r--addons/web/static/src/css/base.css16
-rw-r--r--addons/web/static/src/css/base.sass4
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 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