diff options
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/snippets.css | 73 | ||||
| -rw-r--r-- | addons/website/static/src/css/snippets.sass | 61 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.css | 35 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 40 |
4 files changed, 153 insertions, 56 deletions
diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css index 16e85850b2a..fe9c18c0081 100644 --- a/addons/website/static/src/css/snippets.css +++ b/addons/website/static/src/css/snippets.css @@ -270,6 +270,10 @@ -moz-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7); box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7); } +.oe_overlay .oe_handle.e:before, .oe_overlay .oe_handle.w:before { + content: "\f0d9-\f0da"; + line-height: 16px; +} .oe_overlay .oe_handle.e { left: auto; top: 2px; @@ -277,8 +281,17 @@ right: -6px; cursor: w-resize; } -.oe_overlay .oe_handle.e:before { - content: "\F061"; +.oe_overlay .oe_handle.w { + top: 2px; + height: 100%; + left: -6px; + cursor: e-resize; +} +.oe_overlay .oe_handle.s:before, .oe_overlay .oe_handle.n:before { + z-index: 0; + content: "\f07d"; + text-align: center; + padding: 1px; } .oe_overlay .oe_handle.s { top: auto; @@ -287,9 +300,11 @@ bottom: -6px; cursor: n-resize; } -.oe_overlay .oe_handle.s:before { - z-index: 0; - content: "\F063"; +.oe_overlay .oe_handle.n { + left: 2px; + width: 100%; + top: -6px; + cursor: s-resize; } .oe_overlay .oe_handle.size { top: auto; @@ -320,24 +335,6 @@ position: relative; top: 8px; } -.oe_overlay .oe_handle.w { - top: 2px; - height: 100%; - left: -6px; - cursor: e-resize; -} -.oe_overlay .oe_handle.w:before { - content: "\F060"; -} -.oe_overlay .oe_handle.n { - left: 2px; - width: 100%; - top: -6px; - cursor: s-resize; -} -.oe_overlay .oe_handle.n:before { - content: "\F062"; -} .oe_overlay .icon.btn { display: inline-block; } @@ -362,6 +359,36 @@ .oe_overlay .oe_overlay_options .dropdown-menu select, .oe_overlay .oe_overlay_options .dropdown-menu input { display: block; } +.oe_overlay.block-w-left .w:before { + content: "\F061" !important; +} +.oe_overlay.block-w-right .w:before { + content: "\F060" !important; +} +.oe_overlay.block-w-left.block-w-right .w { + display: none !important; +} +.oe_overlay.block-e-left .e:before { + content: "\F061" !important; +} +.oe_overlay.block-e-right .e:before { + content: "\F060" !important; +} +.oe_overlay.block-e-left.block-e-right .e { + display: none !important; +} +.oe_overlay.block-s-top .s:before { + content: "\F063" !important; +} +.oe_overlay.block-s-bottom .s:before { + content: "\f062" !important; +} +.oe_overlay.block-n-top .n:before { + content: "\F063" !important; +} +.oe_overlay.block-n-bottom .n:before { + content: "\f062" !important; +} .s-resize-important, .s-resize-important * { cursor: s-resize !important; 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 * diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 317d9193d94..e47b7a41baa 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -298,20 +298,23 @@ ul.nav-stacked > li > a { } .carousel .carousel-caption { - left: auto; - right: auto; - bottom: 10%; + position: absolute; + right: 50%; + left: 50%; + bottom: 20px; +} +.carousel .carousel-caption > div { + position: absolute; text-align: left; padding: 20px; background: rgba(0, 0, 0, 0.4); + bottom: 20px; } .carousel .carousel-caption h1, .carousel .carousel-caption h2, .carousel .carousel-caption h3 { margin-top: 10px; margin-bottom: 10px; } .carousel .carousel-image { - right: 50%; - left: 50%; top: 5%; bottom: 5%; position: absolute; @@ -326,13 +329,35 @@ ul.nav-stacked > li > a { right: 10%; top: 10%; bottom: auto; +} +.carousel .item.text_only .carousel-caption > div { text-align: center; background: transparent; + bottom: auto; + width: 100%; +} +.carousel .item.text_image .carousel-caption { + left: 10%; +} +.carousel .item.text_image .carousel-caption > div { + right: 50%; + margin-right: -20%; + max-width: 550px; +} +.carousel .item.text_image .carousel-image { + right: 10%; + left: 50%; } .carousel .item.image_text .carousel-caption { right: 10%; } +.carousel .item.image_text .carousel-caption > div { + left: 50%; + margin-left: -20%; + max-width: 550px; +} .carousel .item.image_text .carousel-image { + right: 50%; left: 10%; } .carousel .carousel-control { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 2390464bfa7..3cdfe37a896 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -244,18 +244,20 @@ ul.nav-stacked > li > a background-size: cover .carousel .carousel-caption - left: auto - right: auto - bottom: 10% - text-align: left - padding: 20px - background: rgba(0, 0, 0, 0.4) + position: absolute + right: 50% + left: 50% + bottom: 20px + > div + position: absolute + text-align: left + padding: 20px + background: rgba(0, 0, 0, 0.4) + bottom: 20px h1, h2, h3 margin-top: 10px margin-bottom: 10px .carousel-image - right: 50% - left: 50% top: 5% bottom: 5% position: absolute @@ -269,12 +271,30 @@ ul.nav-stacked > li > a right: 10% top: 10% bottom: auto - text-align: center - background: transparent + > div + text-align: center + background: transparent + bottom: auto + width: 100% + .item.text_image + .carousel-caption + left: 10% + > div + right: 50% + margin-right: -20% + max-width: 550px + .carousel-image + right: 10% + left: 50% .item.image_text .carousel-caption right: 10% + > div + left: 50% + margin-left: -20% + max-width: 550px .carousel-image + right: 50% left: 10% .carousel-control cursor: pointer |
