diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-27 10:46:03 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-27 10:46:03 +0530 |
| commit | cec3e542a65af5af89bef4aa75f97ae3d3a76507 (patch) | |
| tree | 34e103bbbaeae6903dafd10bd65dcbf3fa401f7c /addons/web/static/src/css | |
| parent | 6e922eabccfdc4cf745571c01bd06a7446969b0e (diff) | |
| parent | 718b26d796ef8bf793184ff52502af61c3c7a812 (diff) | |
[MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121126110752-8mmm2c7iciw6jhp1
bzr revid: jra@tinyerp.com-20121127051603-q6y1bardiezruu1m
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 22 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 13 |
2 files changed, 25 insertions, 10 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a79bd414003..383e014d5ea 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -30,7 +30,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp.openerp_webclient_container { height: 100%; @@ -1180,7 +1180,7 @@ color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightgrey; + border: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1205,7 +1205,7 @@ transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - border-top: 1px solid lightgrey; + border-top: 1px solid lightGray; border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); @@ -1912,14 +1912,22 @@ max-width: 700px; } .openerp .oe_view_nocontent .oe_view_nocontent_create { - background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 7px 0; margin-top: 0; padding-top: 35px; - min-height: 28px; color: #4c4c4c; } +.openerp .oe_view_nocontent .oe_view_nocontent_create:before { + content: ""; + display: inline-block; + position: absolute; + width: 70px; + height: 80px; + margin-left: -70px; + margin-top: -50px; + background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 0px 0px; +} .openerp .oe_view_nocontent > p { - padding-left: 95px; + padding-left: 78px; } .openerp .oe_view_nocontent .oe_empty_custom_dashboard { background: transparent url(/web/static/src/img/graph_background.png) no-repeat 0 0; @@ -2134,7 +2142,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkgreen; + color: darkGreen; vertical-align: top; position: relative; top: -4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 47adb2a8eca..2bc13dc26c9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1536,13 +1536,20 @@ $sheet-padding: 16px font-size: 125% max-width: 700px .oe_view_nocontent_create - background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 7px 0 margin-top: 0 padding-top: 35px - min-height: 28px color: #4c4c4c + &:before + content: "" + display: inline-block + position: absolute + width: 70px + height: 80px + margin-left: -70px + margin-top: -50px + background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 0px 0px > p - padding-left: 95px + padding-left: 78px .oe_empty_custom_dashboard background: transparent url(/web/static/src/img/graph_background.png) no-repeat 0 0 margin-top: -15px |