summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2013-04-04 12:34:22 +0200
committerThibault Delavallée <tde@openerp.com>2013-04-04 12:34:22 +0200
commit431f447fa4232a037f1cfa0579fcd8f005583180 (patch)
tree34fdbf3f3979399c3f9f246846eb2276ee706c5b /addons/web/static/src/css
parentcaff74a6504d48e2a3fde8fb61d23efcd3c68a2f (diff)
parentb207801acc5daa3c1244f9a0321fa1caaf8ca07e (diff)
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130328112348-5gcg79ipve3rt4ut bzr revid: tde@openerp.com-20130402081347-hgz8vg6af9l18vcx bzr revid: tde@openerp.com-20130404090149-csbp0wnodbe126q7 bzr revid: tde@openerp.com-20130404103422-p533mmjn7btlhvcb
Diffstat (limited to 'addons/web/static/src/css')
-rw-r--r--addons/web/static/src/css/base.css22
-rw-r--r--addons/web/static/src/css/base.sass19
2 files changed, 40 insertions, 1 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1bad7a02f90..50028703f51 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2312,6 +2312,28 @@
display: inline-block;
min-width: 70px;
}
+.openerp .oe_form_field_radio.oe_horizontal {
+ white-space: nowrap;
+}
+.openerp .oe_form_field_radio.oe_horizontal .oe_radio_header {
+ display: inline-block;
+ text-align: center;
+}
+.openerp .oe_form_field_radio.oe_vertical .oe_radio_header {
+ cursor: pointer;
+}
+.openerp .oe_form_field_radio .oe_radio_input {
+ cursor: pointer;
+ display: inline-block;
+ width: 20px;
+ background: transparent url(/web/static/src/img/icons/input_radio-off.png) no-repeat center center;
+}
+.openerp .oe_form_field_radio .oe_radio_input_on {
+ background: transparent url(/web/static/src/img/icons/input_radio-on.png) no-repeat center center;
+}
+.openerp .oe_form_field_radio .oe_radio_label {
+ cursor: default;
+}
.openerp .oe_form_field_progressbar.ui-progressbar {
height: 22px;
font-size: 10px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index a9fa725b07c..c0d5aa0ad91 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -480,7 +480,24 @@ $sheet-padding: 16px
.oe_tag_dark
background: $tag-bg-dark
color: #eee
-
+ .oe_form_field_radio
+ &.oe_horizontal
+ white-space: nowrap
+ .oe_radio_header
+ display: inline-block
+ text-align: center
+ &.oe_vertical
+ .oe_radio_header
+ cursor: pointer
+ .oe_radio_input
+ cursor: pointer
+ display: inline-block
+ width: 20px
+ background: transparent url(/web/static/src/img/icons/input_radio-off.png) no-repeat center center
+ .oe_radio_input_on
+ background: transparent url(/web/static/src/img/icons/input_radio-on.png) no-repeat center center
+ .oe_radio_label
+ cursor: default
.oe_tags
&.oe_inline
min-width: 250px