diff options
| author | Chirag Dodiya (OpenERP) <cod@tinyerp.com> | 2014-03-31 14:37:09 +0530 |
|---|---|---|
| committer | Chirag Dodiya (OpenERP) <cod@tinyerp.com> | 2014-03-31 14:37:09 +0530 |
| commit | 76840b36cb14f623d3491ce96e24a40215de5fb3 (patch) | |
| tree | b476a633494bdd07cc233ebb5651d7fc5e46b417 /addons/website/static/src/css | |
| parent | dd404cd70108432a8cef9de5fc7aefb81b749955 (diff) | |
| parent | fd43cecbdadcffee2be2ff078bd32a4521ad9574 (diff) | |
[MRG]Merge with lp:openobject-addons
bzr revid: cod@tinyerp.com-20140331090709-y4bj3kqp5chq2zko
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/website.css | 3 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index e9df2841347..354796a053e 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -414,9 +414,6 @@ div.carousel .carousel-indicators .active { .oe_dark { background: #eff8f8; background: rgba(200, 200, 200, 0.14); - -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; - -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; - box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; } .oe_black { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 2c8d5d2fdda..77da53c2958 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -342,7 +342,6 @@ div.carousel .oe_dark background: #eff8f8 background: rgba(200, 200, 200, 0.14) - +box-shadow(0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset) .oe_black background-color: rgba(0, 0, 0, 0.9) @@ -429,3 +428,9 @@ span[data-oe-type="monetary"] .oe_website_login_container width: 400px margin: 40px auto + +.oe_website_overflow_ellipsis + white-space:nowrap + overflow:hidden + text-overflow:ellipsis + |