diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2013-07-31 17:36:54 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2013-07-31 17:36:54 +0200 |
| commit | 1eb9d5b626a6c301bef251413331f75debd94aa5 (patch) | |
| tree | 74b1b3756ce8533960cc80a795999a6b54fc06fb /addons/website/static/src/css | |
| parent | 1036f7f205b6e1473f923a58fb2d225a40ab5e3f (diff) | |
| parent | 3269a89f7bf1685f694867c2aae17ff51d715a77 (diff) | |
[MERGE] from upstream
bzr revid: fva@openerp.com-20130731153654-g7htxjci0zk4xev3
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/snippets.css | 8 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.css | 8 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 6 |
3 files changed, 14 insertions, 8 deletions
diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css index 78e9162c332..c9b726affde 100644 --- a/addons/website/static/src/css/snippets.css +++ b/addons/website/static/src/css/snippets.css @@ -176,11 +176,3 @@ margin-left: 0px !important; } */ - -.carousel > .css_carousel_options { - cursor: pointer; - position: absolute; - white-space: nowrap; - z-index: 1; - display: none; -}
\ No newline at end of file diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 74514c2d793..0ff1d410de7 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -103,3 +103,11 @@ h5 { min-height: 300px; color: white; } + +.carousel > .css_carousel_options { + cursor: pointer; + position: absolute; + white-space: nowrap; + z-index: 1; + display: none; +}
\ No newline at end of file diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index a906906c7ac..08848fb0346 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -79,3 +79,9 @@ h5 min-height: 300px color: white +.carousel > .css_carousel_options + cursor: pointer + position: absolute + white-space: nowrap + z-index: 1 + display: none
\ No newline at end of file |