diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index a808b9bab35..3729775cf73 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 406b8feeb78..4a245b1f2c9 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/img/blocks/block_banner.png b/addons/website/static/src/img/blocks/block_banner.png
new file mode 100644
index 00000000000..305ffb8855b
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_banner.png differ
diff --git a/addons/website/static/src/img/blocks/block_big_picture.png b/addons/website/static/src/img/blocks/block_big_picture.png
new file mode 100644
index 00000000000..8fd913efcdc
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_big_picture.png differ
diff --git a/addons/website/static/src/img/blocks/block_button.png b/addons/website/static/src/img/blocks/block_button.png
new file mode 100644
index 00000000000..8daf48ec3bc
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_button.png differ
diff --git a/addons/website/static/src/img/blocks/block_comparison.png b/addons/website/static/src/img/blocks/block_comparison.png
new file mode 100644
index 00000000000..610f7658e96
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_comparison.png differ
diff --git a/addons/website/static/src/img/blocks/block_faq.png b/addons/website/static/src/img/blocks/block_faq.png
new file mode 100644
index 00000000000..fe0f819143b
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_faq.png differ
diff --git a/addons/website/static/src/img/blocks/block_image_gallery.png b/addons/website/static/src/img/blocks/block_image_gallery.png
new file mode 100644
index 00000000000..2b70ce2557a
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_image_gallery.png differ
diff --git a/addons/website/static/src/img/blocks/block_image_text.png b/addons/website/static/src/img/blocks/block_image_text.png
new file mode 100644
index 00000000000..01bf9861066
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_image_text.png differ
diff --git a/addons/website/static/src/img/blocks/block_jumbotron.png b/addons/website/static/src/img/blocks/block_jumbotron.png
new file mode 100644
index 00000000000..656f9591998
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_jumbotron.png differ
diff --git a/addons/website/static/src/img/blocks/block_panel.png b/addons/website/static/src/img/blocks/block_panel.png
new file mode 100644
index 00000000000..c4d66975905
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_panel.png differ
diff --git a/addons/website/static/src/img/blocks/block_parallax.png b/addons/website/static/src/img/blocks/block_parallax.png
new file mode 100644
index 00000000000..693da297cef
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_parallax.png differ
diff --git a/addons/website/static/src/img/blocks/block_portfolio.png b/addons/website/static/src/img/blocks/block_portfolio.png
new file mode 100644
index 00000000000..40102160f96
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_portfolio.png differ
diff --git a/addons/website/static/src/img/blocks/block_quote.png b/addons/website/static/src/img/blocks/block_quote.png
new file mode 100644
index 00000000000..8c3d082219b
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_quote.png differ
diff --git a/addons/website/static/src/img/blocks/block_references.png b/addons/website/static/src/img/blocks/block_references.png
new file mode 100644
index 00000000000..c7164d36b7a
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_references.png differ
diff --git a/addons/website/static/src/img/blocks/block_separator.png b/addons/website/static/src/img/blocks/block_separator.png
new file mode 100644
index 00000000000..293d83ee398
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_separator.png differ
diff --git a/addons/website/static/src/img/blocks/block_surprise.png b/addons/website/static/src/img/blocks/block_surprise.png
new file mode 100644
index 00000000000..e01382a5ab1
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_surprise.png differ
diff --git a/addons/website/static/src/img/blocks/block_text_block.png b/addons/website/static/src/img/blocks/block_text_block.png
new file mode 100644
index 00000000000..df2c96de997
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_text_block.png differ
diff --git a/addons/website/static/src/img/blocks/block_text_image.png b/addons/website/static/src/img/blocks/block_text_image.png
new file mode 100644
index 00000000000..4e275fcc22a
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_text_image.png differ
diff --git a/addons/website/static/src/img/blocks/block_three_columns.png b/addons/website/static/src/img/blocks/block_three_columns.png
new file mode 100644
index 00000000000..5cc49b3319e
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_three_columns.png differ
diff --git a/addons/website/static/src/img/blocks/block_title.png b/addons/website/static/src/img/blocks/block_title.png
new file mode 100644
index 00000000000..2e28ea0a068
Binary files /dev/null and b/addons/website/static/src/img/blocks/block_title.png differ
diff --git a/addons/website/static/src/img/blocks/blocks-icons.png b/addons/website/static/src/img/blocks/blocks-icons.png
new file mode 100644
index 00000000000..94c82f3f309
Binary files /dev/null and b/addons/website/static/src/img/blocks/blocks-icons.png differ
diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js
index 5a9e70fb742..5b93f0e7d71 100644
--- a/addons/website/static/src/js/website.snippets.js
+++ b/addons/website/static/src/js/website.snippets.js
@@ -158,23 +158,29 @@
var $pill = self.$(".pill-content");
var padding = parseInt($pill.css("padding-left"));
var $scroll = this.$(".scroll");
-
- $scroll.scroll(function () {
+
+ $scroll.scroll(function () {
$pill.find("> div").each(function () {
+ /*
if ($(this).position().left <= padding) {
$ul.find("> li").removeClass('active');
$ul.find("a[href='#" + $(this).attr("id") + "']").parent("li").addClass('active');
- }
+ }*/
});
});
$ul.find("a").click(function (event) {
event.preventDefault();
- $scroll.scrollLeft( $scroll.scrollLeft() + $($(event.currentTarget).attr("href")).position().left - padding );
+ $pill.find("> div").hide();
+ $pill.find( $(event.currentTarget).attr('href')).show();
+ $ul.find('> li').removeClass('active');
+ $(event.currentTarget).parent().addClass('active');
return false;
});
- $pill.css("padding-right", self.$el.outerWidth() - padding + 10 - $pill.find("> div:last").outerWidth());
+ // $pill.css("padding-right", self.$el.outerWidth() - padding + 10 - $pill.find("> div:last").outerWidth());
+ $pill.find("> div").hide();
+ $pill.find("div:first").show();
$ul.find("> li:first").addClass('active');
},
cover_target: function ($el, $target){
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index e4c0cfc5670..db3f551d963 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -63,10 +63,10 @@
Effects
@@ -139,7 +139,7 @@
Velour
Wood
Yellow Green
- Enter your image
+
- 
- Banner
+ 
+ Banner
+ Quote
+ 
+ Panel
+ 
+ Surprise!
+ 
+ Text-Image
+ Image-Text
+ Jumbotron
+ Text Block
+ Title
+ 
+ Separator
+ Big Picture
- 
+ Three Columns
- Post job offers and keep track of each application received.
- 
- Break down information silos. Share knowledge and best practices amongst all employees.
- 
- The agenda of each employee is updated accordingly.
- 
+ Portfolio
+ 
+ Image Gallery
- 
- 
+ Comparisons
+ 
+ Button
+ 
+ FAQ
+ 
+ References
+ 
+