diff options
| author | ajay javiya (OpenERP) <aja@tinyerp.com> | 2014-03-31 09:49:56 +0530 |
|---|---|---|
| committer | ajay javiya (OpenERP) <aja@tinyerp.com> | 2014-03-31 09:49:56 +0530 |
| commit | c4896f801ceec95fb9a7f4e592ffbfc843135cba (patch) | |
| tree | 3933534acdda506195b53be129ce82c62a1d450e /addons/website/static/src | |
| parent | 3d8952b53477c6fc7d92353e76f56b38c14b5a8e (diff) | |
| parent | fd43cecbdadcffee2be2ff078bd32a4521ad9574 (diff) | |
[MERGE] : with trunk
bzr revid: aja@tinyerp.com-20140331041956-0ots0gkn1d4ffudq
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/css/website.css | 9 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index c4cf689d8de..87079d270e2 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -410,9 +410,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 { @@ -526,9 +523,3 @@ span[data-oe-type="monetary"] { width: 400px; margin: 40px auto; } - -.oe_website_overflow_ellipsis{ - white-space:nowrap; - overflow:hidden; - text-overflow:ellipsis; -} diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 67e0aa5fde2..73aa4f77737 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -340,7 +340,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) |