diff options
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/editor.css | 48 | ||||
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 39 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.css | 19 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 14 |
4 files changed, 74 insertions, 46 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 8a52aec47aa..2d1439f4f36 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; /* ---- CKEditor Minimal Reset ---- */ .navbar.navbar-inverse .cke_chrome { border: none; @@ -167,7 +167,6 @@ table.editorbar-panel td.selected { box-shadow: 0px 10px 10px -10px black inset; z-index: 1010; overflow: hidden; - height: 110px; } #oe_snippets:hover { height: auto; @@ -177,16 +176,13 @@ table.editorbar-panel td.selected { overflow-y: auto; } #oe_snippets .nav { - padding: 3px 15px; - width: 162px; - background: #444444; position: fixed; z-index: 1; - height: 108px; } #oe_snippets .nav > li { - display: block; + display: inline-block; float: none; + font-size: 13px; } #oe_snippets .nav > li > a { padding: 2px 10px !important; @@ -194,13 +190,14 @@ table.editorbar-panel td.selected { display: block; } #oe_snippets .pill-content { + margin-top: 24px; display: inline-block; - height: 110px; white-space: nowrap; - padding-left: 166px; } #oe_snippets .pill-content > div { display: inline-block; + background: black; + padding: 5px; } #oe_snippets .pill-content > div label { width: 44px; @@ -211,23 +208,23 @@ table.editorbar-panel td.selected { #oe_snippets .pill-content > div label div { width: 100px; text-align: center; - -webkit-transform: translate(-39px, 44px) rotate(-90deg); - -moz-transform: translate(-39px, 44px) rotate(-90deg); - -o-transform: translate(-39px, 44px) rotate(-90deg); - transform: translate(-39px, 44px) rotate(-90deg); - -webkit-transform-origin: 50% 50%; - -moz-transform-origin: 50% 50%; - -ms-transform-origin: 50% 50%; - -o-transform-origin: 50% 50%; - transform-origin: 50% 50%; + -webkit-transform: translate(-39px, 44px); + -moz-transform: translate(-39px, 44px); + -ms-transform: translate(-39px, 44px); + -o-transform: translate(-39px, 44px); + transform: translate(-39px, 44px); + -webkit-transform-origin: 50% 50% 50%; + -moz-transform-origin: 50% 50% 50%; + -ms-transform-origin: 50% 50% 50%; + -o-transform-origin: 50% 50% 50%; + transform-origin: 50% 50% 50%; } .oe_snippet { display: inline-block; vertical-align: top; - width: 108px; - height: 108px; - border-radius: 3px; + width: 100px; + height: 100px; margin: 1px; margin-top: 0px; position: relative; @@ -243,9 +240,15 @@ table.editorbar-panel td.selected { height: 100%; background: transparent; color: white; - text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.95); position: relative; } +.oe_snippet .oe_snippet_thumbnail .oe_snippet_thumbnail_title { + font-size: 12px; + display: block; +} +.oe_snippet .oe_snippet_thumbnail .oe_snippet_thumbnail_img { + box-shadow: inset 0px 0px 0px 3px #333333; +} .oe_snippet .oe_snippet_thumbnail span, .oe_snippet .oe_snippet_thumbnail div { line-height: 18px; } @@ -256,7 +259,6 @@ table.editorbar-panel td.selected { #oe_snippets .oe_snippet_thumbnail { background: #747474; background-image: radial-gradient(rgba(0, 0, 0, 0.25), rgba(0, 0, 0, 0.4)); - box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.07) inset; } /* ---- SNIPPETS DROP ZONES ---- */ diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 54c6b6576de..0a126bb3197 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -1,5 +1,7 @@ @charset "utf-8" +@import "compass/css3" + /* ---- CKEditor Minimal Reset ---- */ .navbar.navbar-inverse .cke_chrome @@ -145,33 +147,30 @@ table.editorbar-panel box-shadow: 0px 10px 10px -10px black inset z-index: 1010 overflow: hidden - height: 110px &:hover height: auto .scroll white-space: nowrap overflow-y: auto .nav - padding: 3px 15px - width: 162px - background: #444444 > li - display: block + display: inline-block float: none + font-size: 13px > a padding: 2px 10px !important width: 100% display: block position: fixed z-index: 1 - height: 108px .pill-content + margin-top: 24px display: inline-block - height: 110px white-space: nowrap - padding-left: 166px > div display: inline-block + background: rgb(0,0,0) + padding: 5px label width: 44px height: 100% @@ -180,22 +179,14 @@ table.editorbar-panel div width: 100px text-align: center - -webkit-transform: translate(-39px, 44px) rotate(-90deg) - -moz-transform: translate(-39px, 44px) rotate(-90deg) - -o-transform: translate(-39px, 44px) rotate(-90deg) - transform: translate(-39px, 44px) rotate(-90deg) - -webkit-transform-origin: 50% 50% - -moz-transform-origin: 50% 50% - -ms-transform-origin: 50% 50% - -o-transform-origin: 50% 50% - transform-origin: 50% 50% + @include transform( translate(-39px, 44px) , rotate(-90deg) ) + @include transform-origin(50% 50%) .oe_snippet display: inline-block vertical-align: top - width: 108px - height: 108px - border-radius: 3px + width: 100px + height: 100px margin: 1px margin-top: 0px position: relative @@ -204,15 +195,18 @@ table.editorbar-panel user-select: none cursor: move pointer-events: none - .oe_snippet_thumbnail pointer-events: auto text-align: center height: 100% background: transparent color: white - text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.95) position: relative + .oe_snippet_thumbnail_title + font-size: 12px + display: block + .oe_snippet_thumbnail_img + box-shadow: inset 0px 0px 0px 3px #333333 span, div line-height: 18px & > :not(.oe_snippet_thumbnail) @@ -221,7 +215,6 @@ table.editorbar-panel #oe_snippets .oe_snippet_thumbnail background: rgb(116, 116, 116) background-image: radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4)) - box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.07) inset /* ---- SNIPPETS DROP ZONES ---- */ diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 80057dbf21d..1796729f18c 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -367,6 +367,25 @@ ul.nav-stacked > li > a { } /* ---- PUBLISH ---- */ +a[data-publish] { + text-decoration: none !important; +} +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 { + 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_unpublish, .dropdown .css_publish { display: none; } diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index b1f43b543a3..9834fb66aed 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -283,6 +283,20 @@ ul.nav-stacked > li > a text-transform: uppercase /* ---- PUBLISH ---- */ +a[data-publish] + text-decoration: none !important + .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 |
