diff options
| author | Fabien Pinckaers <fp@openerp.com> | 2013-09-15 00:13:01 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@openerp.com> | 2013-09-15 00:13:01 +0200 |
| commit | b7f3383c3c4aef93b6d339a6c8197ce0646d23fe (patch) | |
| tree | e0cf5cf645bf943813eee0f2708d170502436692 /addons/website/static/src/css | |
| parent | ab00ebf05ed76a51f52814f617f3bb40955cadf4 (diff) | |
[IMP] title node selection
bzr revid: fp@openerp.com-20130914221301-gnt115hzjv61slpe
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/editor.css | 10 | ||||
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 6 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.css | 2 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index d4fc2f338f7..325eeb3b26d 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; @@ -197,9 +197,6 @@ table.editorbar-panel td.selected { -webkit-transition: margin 250ms linear; width: 100%; z-index: 1000; - position: absolute; - background: rgba(153, 0, 255, 0.17); - border-radius: 3px; } .oe_drop_zone.oe_insert:first-child:not(:last-child) { margin-top: -8px; @@ -231,6 +228,11 @@ table.editorbar-panel td.selected { position: absolute; margin: 0px !important; } +.oe_drop_zone.oe_insert.oe_overlay { + position: absolute; + background: rgba(153, 0, 255, 0.17); + border-radius: 3px; +} .oe_drop_zone { background: rgba(153, 0, 255, 0.17); diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 14c0c58ede3..28230889ab0 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -209,9 +209,9 @@ table.editorbar-panel position: absolute margin: 0px !important &.oe_overlay - position: absolute - background: rgba(153, 0, 255, 0.17) - border-radius: 3px + position: absolute + background: rgba(153, 0, 255, 0.17) + border-radius: 3px .oe_drop_zone background: rgba(153, 0, 255, 0.17) diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index a016cbc150b..362912b2e54 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -144,7 +144,7 @@ footer { padding-left: 16px; } -div#wrap .carousel { +div#wrap .carousel:first-child { top: -20px; } diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index a4b07b2969c..3b4b4727515 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -111,7 +111,7 @@ footer padding-left: 16px div#wrap - .carousel + .carousel:first-child top: -20px /* -- Hack for removing double scrollbar from mobile preview -- */ @@ -157,4 +157,4 @@ a[data-publish] top: -10px display: none /*&:hover > [data-publish]*/ - /* display: block*/
\ No newline at end of file + /* display: block*/ |
