diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-02-20 17:38:15 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-02-20 17:38:15 +0100 |
| commit | 4b72678bc74906e552ebc8cace7161901571d2c1 (patch) | |
| tree | d4965fd90f45af167c6a34eec3caad111a309f12 /addons/website/static/src/css/snippets.sass | |
| parent | 65db3c635eea5324676c8f85d13e0058d66ce1b9 (diff) | |
| parent | d5106a4d34a9b7c52a1ecad7c65331f1fda2e231 (diff) | |
[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
Diffstat (limited to 'addons/website/static/src/css/snippets.sass')
| -rw-r--r-- | addons/website/static/src/css/snippets.sass | 61 |
1 files changed, 43 insertions, 18 deletions
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass index 7e889763572..a06bba01dba 100644 --- a/addons/website/static/src/css/snippets.sass +++ b/addons/website/static/src/css/snippets.sass @@ -147,6 +147,7 @@ .resize_editor_busy background-color: rgba(0,0,0,0.3) + .oe_overlay display: none position: absolute @@ -194,23 +195,38 @@ background: rgba(0, 0, 0, .5) color: #fff +box-shadow(0 0 5px 3px rgba(255,255,255,.7)) + &.e, &.w + &:before + content: "\f0d9-\f0da" + line-height: 16px &.e left: auto top: 2px height: 100% right: -6px cursor: w-resize + &.w + top: 2px + height: 100% + left: -6px + cursor: e-resize + &.s, &.n &:before - content: "\F061" + z-index: 0 + content: "\f07d" + text-align: center + padding: 1px &.s top: auto left: 2px width: 100% bottom: -6px cursor: n-resize - &:before - z-index: 0 - content: "\F063" + &.n + left: 2px + width: 100% + top: -6px + cursor: s-resize &.size top: auto left: 2px @@ -234,20 +250,6 @@ border-color: rgba(0, 0, 0, 0.5) position: relative top: 8px - &.w - top: 2px - height: 100% - left: -6px - cursor: e-resize - &:before - content: "\F060" - &.n - left: 2px - width: 100% - top: -6px - cursor: s-resize - &:before - content: "\F062" .icon.btn display: inline-block @@ -269,6 +271,29 @@ .dropdown-menu select,.dropdown-menu input display: block + &.block-w-left .w:before + content: "\F061" !important + &.block-w-right .w:before + content: "\F060" !important + &.block-w-left.block-w-right .w + display: none !important + &.block-e-left .e:before + content: "\F061" !important + &.block-e-right .e:before + content: "\F060" !important + &.block-e-left.block-e-right .e + display: none !important + + &.block-s-top .s:before + content: "\F063" !important + &.block-s-bottom .s:before + content: "\f062" !important + &.block-n-top .n:before + content: "\F063" !important + &.block-n-bottom .n:before + content: "\f062" !important + + .s-resize-important, .s-resize-important * cursor: s-resize !important .n-resize-important, .n-resize-important * |