diff options
| author | Fabien Meghazi <fme@openerp.com> | 2013-09-26 15:31:55 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2013-09-26 15:31:55 +0200 |
| commit | b6e1e1ec71045e7c921b7cff48d863a2effb4542 (patch) | |
| tree | 5821d966716823e16a652f2240e27385b5ce6916 /addons/website/static/src/css | |
| parent | 8c25a35cc6fc5380efa52ea0ec737883b63703e3 (diff) | |
| parent | cc939d65fda448bdb922244c1483e05deccdd038 (diff) | |
[MERGE] upstream
bzr revid: fme@openerp.com-20130926133155-y1fz603wa4oxw6g3
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/website.css | 23 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 22 |
2 files changed, 9 insertions, 36 deletions
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 5a064a40a9e..d3d275aac71 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -352,27 +352,12 @@ ul.nav-stacked > li > a { } /* ---- PUBLISH ---- */ -a[data-publish] { - text-decoration: none !important; - z-index: 2; -} -a[data-publish] .label { - padding: 5px 8px; -} -a[data-publish] .css_unpublish, a[data-publish] .css_publish, a[data-publish] .css_unpublished, a[data-publish] .css_published { - display: none; -} -a[data-publish][data-publish='off'] .css_unpublished, a[data-publish][data-publish='off']:hover .css_publish { - display: inline; -} -a[data-publish][data-publish='off']:hover .css_unpublished { +.dropdown .css_unpublish, .dropdown .css_publish { display: none; } -a[data-publish][data-publish='on'] .css_published, a[data-publish][data-publish='on']:hover .css_unpublish { - display: inline; -} -a[data-publish][data-publish='on']:hover .css_published { - display: none; + +.dropdown.css_publish .css_unpublish, .dropdown.css_unpublish .css_publish { + display: block; } .unpublish { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index cb0e93d9170..5e3468d9f33 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -267,23 +267,11 @@ ul.nav-stacked > li > a text-transform: uppercase /* ---- PUBLISH ---- */ -a[data-publish] - text-decoration: none !important - z-index: 2 - .label - padding: 5px 8px - .css_unpublish, .css_publish, .css_unpublished, .css_published - display: none - &[data-publish='off'] - .css_unpublished, &:hover .css_publish - display: inline - &:hover .css_unpublished - display: none - &[data-publish='on'] - .css_published, &:hover .css_unpublish - display: inline - &:hover .css_published - display: none + +.dropdown .css_unpublish, .dropdown .css_publish + display: none +.dropdown.css_publish .css_unpublish, .dropdown.css_unpublish .css_publish + display: block .unpublish opacity: 0.5 |