diff options
| author | bth-openerp <bth@tinyerp.com> | 2013-04-17 11:38:18 +0530 |
|---|---|---|
| committer | bth-openerp <bth@tinyerp.com> | 2013-04-17 11:38:18 +0530 |
| commit | 4d0cb54886d293a8ff92c8aeaa95f891cc245865 (patch) | |
| tree | 35cd81f2980219789c4a37dc64a349a8de2ab2c2 /addons/web/static/src/css/base.sass | |
| parent | 7e05448204ecef5ce4c957d0a842654811e9c429 (diff) | |
| parent | 97900c25a44cb4669f1e45401d69b31b88cdcd96 (diff) | |
[MERGE] Merge lp:openerp-web.
bzr revid: bth@tinyerp.com-20130417060818-rzznm2t8ersljdsv
Diffstat (limited to 'addons/web/static/src/css/base.sass')
| -rw-r--r-- | addons/web/static/src/css/base.sass | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d687ce21869..072fda44357 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -483,21 +483,25 @@ $sheet-padding: 16px .oe_form_field_radio &.oe_horizontal white-space: nowrap - .oe_radio_header + label display: inline-block text-align: center + height: 16px &.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 + label + margin-left: 4px + &.oe_form_required + .oe_radio_input + border: 2px solid transparent + display: inline-block + height: 12px + width: 12px + vertical-align: bottom + border-radius: 10px + margin: 1px 0 + &.oe_form_invalid + .oe_radio_input + border-color: red .oe_tags &.oe_inline min-width: 250px @@ -1681,6 +1685,9 @@ $sheet-padding: 16px @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset)) .oe_form_invisible display: none !important + .oe_form_editable + .oe_read_only + display: none !important .oe_form_readonly .oe_edit_only, .oe_form_field:empty display: none !important @@ -1901,6 +1908,7 @@ $sheet-padding: 16px background: white min-width: 60px color: #1f1f1f + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled] background: #E5E5E5 !important color: #666 @@ -1909,6 +1917,7 @@ $sheet-padding: 16px padding-left: 8px @include box-shadow(none) @include radius(0px) + color: #4c4c4c textarea.oe_inline[disabled] border-left: 8px solid #eee .oe_form_field_url button img @@ -2499,6 +2508,9 @@ $sheet-padding: 16px background-attachment: fixed >* opacity: 0.70 +.loading-kitten + @include radius(15px) + @include box-shadow(0 0 5px 5px #999) // }}} // jQueryUI top level {{{ |