diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-04-11 11:23:06 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-04-11 11:23:06 +0200 |
| commit | 1d12a480c344ce96f3935187e5efa52131e6f2da (patch) | |
| tree | 1eda60f28b8e5b910bebfc438d42e30a80b341b6 /addons/web/static/src/css | |
| parent | 67452d290eac4e26a0d940510960e2cdc36c657b (diff) | |
| parent | aaed0ccd43b4697e35c9362fe18796685102d9ce (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20130411092306-wypa8h3kh1v5q8qn
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 13 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 8 |
2 files changed, 21 insertions, 0 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 7e3b3e1a43c..1d7d2fa8c7a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2105,6 +2105,9 @@ .openerp .oe_form_invisible { display: none !important; } +.openerp .oe_form_editable .oe_read_only { + display: none !important; +} .openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty { display: none !important; } @@ -2403,6 +2406,7 @@ background: white; min-width: 60px; color: #1f1f1f; + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; } .openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] { background: #e5e5e5 !important; @@ -2417,6 +2421,7 @@ -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; + color: #4c4c4c; } .openerp .oe_form textarea.oe_inline[disabled] { border-left: 8px solid #eeeeee; @@ -3176,6 +3181,14 @@ .kitten-mode-activated > * { opacity: 0.7; } +.loading-kitten { + -moz-border-radius: 15px; + -webkit-border-radius: 15px; + border-radius: 15px; + -moz-box-shadow: 0 0 5px 5px #999999; + -webkit-box-shadow: 0 0 5px 5px #999999; + box-shadow: 0 0 5px 5px #999999; +} div.ui-widget-overlay { background: black; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4e3dc656882..004204f73c5 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1685,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 @@ -1905,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 @@ -1913,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 @@ -2503,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 {{{ |