[IMP] web_editor, *: change height/margin system to padding system

* web, website, mass_mailing

Before this commit, the editor allowed defining the margin of some
elements and the height of some elements. There were three main
problems with this system:

1) When an user dragged the arrow, he often expected to change the
   size of the element while he was in fact changing the margin

2) When changing the margin, you increase the space between two
   elements but with a white space (while most users want a space
   with the same color of the block they are resizing = padding)

3) When changing the height, the user was able to hide snippet parts
   and the height was not consistent accross screen sizes

Now, the only thing you can edit is padding. There is only one arrow
for each direction, which allows increasing spacing and consistent
dimension at the same time.
The only feature that is lost with this change is the ability to
control vertical alignement of colored columns. This is not a problem
as colored columns are rare in our current snippets and there still
have the possibility to add margin classes by hand if necessary (there
are also plans to control vertical alignement another way).

Note: margin classes are kept for compatibility.

13 files changed, 386 insertions, 542 deletions

diff --git a/addons/mass_mailing/static/src/js/mass_mailing_editor.js b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
index 7705e62fa9e..e88d77864d2 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
@@ -12,32 +12,35 @@ var $editable_area = $('#editable_area');
 var odoo_top = window.top.odoo;
 
 // Snippet option for resizing  image and column width inline like excel
-options.registry["width-x"] = options.Class.extend({
+options.registry.sizing_x = options.Class.extend({
+    /**
+     * @override
+     */
     start: function () {
-        this.container_width = this.$target.parent().closest("td, table, div").width();
+        var def = this._super.apply(this, arguments);
+
+        this.containerWidth = this.$target.parent().closest("td, table, div").width();
 
         var self = this;
         var offset, sib_offset, target_width, sib_width;
-        var $body = $(document.body);
-        this.is_image = false;
-        this._super.apply(this, arguments);
 
-        this.$overlay.find(".oe_handle.e, .oe_handle.w").removeClass("readonly");
-        if (this.$target.is("img")) {
-            this.$overlay.find(".oe_handle.w").addClass("readonly");
+        this.$overlay.find(".o_handle.e, .o_handle.w").removeClass("readonly");
+        this.isIMG = this.$target.is("img");
+        if (this.isIMG) {
+            this.$overlay.find(".o_handle.w").addClass("readonly");
             this.$overlay.find(".oe_snippet_move, .oe_snippet_clone").addClass("hidden");
-            this.is_image=true;
         }
 
-        this.$overlay.find(".oe_handle").on('mousedown', function (event) {
+        var $body = $(document.body);
+        this.$overlay.find(".o_handle").on('mousedown', function (event) {
             event.preventDefault();
             var $handle = $(this);
             var compass = false;
 
-            _.each(['n', 's', 'e', 'w' ], function (handler) {
+            _.each(['n', 's', 'e', 'w'], function (handler) {
                 if ($handle.hasClass(handler)) { compass = handler; }
             });
-            if (self.is_image) { compass = "image"; }
+            if (self.isIMG) { compass = "image"; }
 
             $body.on("mousemove.mass_mailing_width_x", function (event) {
                 event.preventDefault();
@@ -59,11 +62,12 @@ options.registry["width-x"] = options.Class.extend({
                     self.change_width(event, self.$target, target_width, offset, true);
                 }
             });
-
-            $body.one("mouseup", function(){
+            $body.one("mouseup", function () {
                 $body.off('.mass_mailing_width_x');
             });
         });
+
+        return def;
     },
     change_width: function (event, target, target_width, offset, grow) {
         target.css("width", grow ? (event.pageX - offset) : (offset + target_width - event.pageX));
@@ -73,13 +77,13 @@ options.registry["width-x"] = options.Class.extend({
         return parseInt($(el).css("width"), 10);
     },
     get_max_width: function ($el) {
-        return this.container_width - _.reduce(_.map($el.siblings(), this.get_int_width), function (memo, w) { return memo + w; });
+        return this.containerWidth - _.reduce(_.map($el.siblings(), this.get_int_width), function (memo, w) { return memo + w; });
     },
     onFocus: function () {
         this._super.apply(this, arguments);
 
         if (this.$target.is("td, th")) {
-            this.$overlay.find(".oe_handle.e, .oe_handle.w").toggleClass("readonly", this.$target.siblings().length === 0);
+            this.$overlay.find(".o_handle.e, .o_handle.w").toggleClass("readonly", this.$target.siblings().length === 0);
         }
     },
 });
@@ -407,7 +411,7 @@ if ($editable_area.html().indexOf('on_change_model_and_list') !== -1) {
 // Adding compatibility for the outlook compliance of mailings.
 // Commit of such compatibility : a14f89c8663c9cafecb1cc26918055e023ecbe42
 options.registry.background.include({
-    start: function() {
+    start: function () {
         this._super();
         var $table_target = this.$target.find('table:first');
         if ($table_target) {
diff --git a/addons/mass_mailing/static/src/less/themes/theme_default.less b/addons/mass_mailing/static/src/less/themes/theme_default.less
index cfd1264e0c7..0c7510928f5 100644
--- a/addons/mass_mailing/static/src/less/themes/theme_default.less
+++ b/addons/mass_mailing/static/src/less/themes/theme_default.less
@@ -322,31 +322,11 @@
     }
 }
 
-// ===== Margins on td (replaced by paddings) =====
-.o-paddings-all(@factor: 1) {
-    .o-paddings(128, @factor);
-    .o-paddings(96, @factor);
-    .o-paddings(92, @factor);
-    .o-paddings(64, @factor);
-    .o-paddings(48, @factor);
-    .o-paddings(32, @factor);
-    .o-paddings(24, @factor);
-    .o-paddings(16, @factor);
-    .o-paddings(8, @factor);
-    .o-paddings(4, @factor);
-    .o-paddings(0, @factor);
+// Compatibility: mb/mt classes on <td/> elements were interpreted as paddings
+// instead of margins before the introduction of pb/pt classes. As thoses mb/mt
+// classes may remain on clients' templates, <td/> are forced to 0 margin to
+// be sure (normally <td/> should not consider margin properties but some mail
+// clients might make the mistake to do so).
+td[class*="mb"], td[class*="mt"] {
+    margin: 0!important;
 }
-.o-paddings(@name, @factor: 1) {
-    .o-paddings-define(@name, @factor * @name);
-}
-.o-paddings-define(@name, @size: @name) {
-    td.mt@{name} {
-        margin-top: auto!important;
-        padding-top: ~"@{size}px"!important;
-    }
-    td.mb@{name} {
-        margin-bottom: auto!important;
-        padding-bottom: ~"@{size}px"!important;
-    }
-}
-.o-paddings-all();
diff --git a/addons/mass_mailing/views/snippets_themes_options.xml b/addons/mass_mailing/views/snippets_themes_options.xml
index 34d973369e8..50c40473f12 100644
--- a/addons/mass_mailing/views/snippets_themes_options.xml
+++ b/addons/mass_mailing/views/snippets_themes_options.xml
@@ -5,9 +5,8 @@
     <t t-call="web_editor.snippet_options"/>
     <t t-raw="0"/>
 
-    <div data-js="width-x"
-        data-selector="img, .mv, .col_mv, td:not(.o_mail_no_resize), th">
-    </div>
+    <div data-js="sizing_x"
+        data-selector="img, .mv, .col_mv, td:not(.o_mail_no_resize), th"/>
 
     <div data-js="table_item" data-selector="td, th"/>
 
@@ -32,13 +31,8 @@
         data-drop-in="[data-oe-field='body_html']:not(:has(.o_layout)), .oe_structure">
     </div>
 
-    <div data-js="resize"
-        data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div">
-    </div>
-
-    <div data-js="margin-y"
-        data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div, td:not(.o_mail_no_resize), th">
-    </div>
+    <div data-js="sizing_y"
+        data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div, td:not(.o_mail_no_resize), th"/>
 
     <div data-js="colorpicker"
         data-selector="
diff --git a/addons/web/static/src/js/widgets/switch_company_menu.js b/addons/web/static/src/js/widgets/switch_company_menu.js
index ca056c4c644..01c224370d2 100644
--- a/addons/web/static/src/js/widgets/switch_company_menu.js
+++ b/addons/web/static/src/js/widgets/switch_company_menu.js
@@ -51,7 +51,7 @@ var SwitchCompanyMenu = Widget.extend({
             if (company[0] === session.user_companies.current_company[0]) {
                 a = '<i class="fa fa-check mr8"></i>';
             } else {
-                a = '<span class="mr24"/>';
+                a = '<span style="margin-right: 24px;"/>';
             }
             companiesList += '<li><a href="#" data-menu="company" data-company-id="' +
                             company[0] + '">' + a + company[1] + '</a></li>';
diff --git a/addons/web_editor/static/src/js/editor/snippets.editor.js b/addons/web_editor/static/src/js/editor/snippets.editor.js
index d84a7088fd1..999131020bf 100644
--- a/addons/web_editor/static/src/js/editor/snippets.editor.js
+++ b/addons/web_editor/static/src/js/editor/snippets.editor.js
@@ -74,7 +74,7 @@ var SnippetEditor = Widget.extend({
                 },
                 helper: function () {
                     var $clone = $(this).clone().css({width: '24px', height: '24px', border: 0});
-                    $clone.find('.oe_overlay_options >:not(:contains(.oe_snippet_move)), .oe_handle').remove();
+                    $clone.find('.oe_overlay_options >:not(:contains(.oe_snippet_move)), .o_handle').remove();
                     $clone.find(':not(.glyphicon)').css({position: 'absolute', top: 0, left: 0});
                     $clone.appendTo('body').removeClass('hidden');
                     return $clone;
@@ -123,17 +123,16 @@ var SnippetEditor = Widget.extend({
      * Makes the editor overlay cover the associated snippet.
      */
     cover: function () {
-        var mt = parseInt(this.$target.css('margin-top') || 0);
         var offset = this.$target.offset();
         var manipulatorOffset = this.$el.parent().offset();
-        offset.top -= (manipulatorOffset.top + mt);
+        offset.top -= manipulatorOffset.top;
         offset.left -= manipulatorOffset.left;
         this.$el.css({
             width: this.$target.outerWidth(),
             left: offset.left,
             top: offset.top,
         });
-        this.$('.oe_handles').css('height', this.$target.outerHeight(true));
+        this.$('.o_handles').css('height', this.$target.outerHeight());
         this.$el.toggleClass('o_top_cover', offset.top < 15);
     },
     /**
diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js
index 554806454e8..f6011be282d 100644
--- a/addons/web_editor/static/src/js/editor/snippets.options.js
+++ b/addons/web_editor/static/src/js/editor/snippets.options.js
@@ -355,7 +355,7 @@ var SnippetOption = Widget.extend({
  */
 var registry = {};
 
-registry.marginAndResize = SnippetOption.extend({
+registry.sizing = SnippetOption.extend({
     preventChildPropagation: true,
 
     /**
@@ -363,92 +363,64 @@ registry.marginAndResize = SnippetOption.extend({
      */
     start: function () {
         var self = this;
-        this._super();
+        var def = this._super.apply(this, arguments);
 
-        var resize_values = this._getSize();
-        if (resize_values.n) this.$overlay.find('.oe_handle.n').removeClass('readonly');
-        if (resize_values.s) this.$overlay.find('.oe_handle.s').removeClass('readonly');
-        if (resize_values.e) this.$overlay.find('.oe_handle.e').removeClass('readonly');
-        if (resize_values.w) this.$overlay.find('.oe_handle.w').removeClass('readonly');
-        if (resize_values.size) this.$overlay.find('.oe_handle.size').removeClass('readonly');
-
-        var $auto_size = this.$overlay.find('.oe_handle.size .auto_size');
-        var $fixed_size = this.$overlay.find('.oe_handle.size .size');
-
-        var auto_sized = isNaN(parseInt(self.$target.prop('style').height));
-        $fixed_size.toggleClass('active', !auto_sized);
-        $auto_size.toggleClass('active', auto_sized);
+        this.$handles = this.$overlay.find('.o_handle');
+        var resizeValues = this._getSize();
+        _.each(resizeValues, function (value, key) {
+            self.$handles.filter('.' + key).toggleClass('readonly', !value);
+        });
 
-        $fixed_size.add(this.$overlay.find('.oe_handle:not(.size)')).on('mousedown', function (event) {
-            event.preventDefault();
+        this.$handles.on('mousedown', function (ev) {
+            ev.preventDefault();
 
-            var $handle = $(this);
+            var $handle = $(ev.currentTarget);
 
-            var resize_values = self._getSize();
             var compass = false;
             var XY = false;
             if ($handle.hasClass('n')) {
                 compass = 'n';
                 XY = 'Y';
-            }
-            else if ($handle.hasClass('s')) {
+            } else if ($handle.hasClass('s')) {
                 compass = 's';
                 XY = 'Y';
-            }
-            else if ($handle.hasClass('e')) {
+            } else if ($handle.hasClass('e')) {
                 compass = 'e';
                 XY = 'X';
-            }
-            else if ($handle.hasClass('w')) {
+            } else if ($handle.hasClass('w')) {
                 compass = 'w';
                 XY = 'X';
             }
-            else if ($handle.hasClass('size')) {
-                compass = 'size';
-                XY = 'Y';
-            }
-
-            var resize = resize_values[compass];
-            if (!resize) return;
-
 
-            if (compass === 'size') {
-                var offset = self.$target.offset().top;
-            } else {
-                var xy = event['page'+XY];
-                var current = resize[2] || 0;
-                var margin_dir = {s:'bottom', n: 'top', w: 'left', e: 'right'}[compass];
-                var real_margin = parseInt(self.$target.css('margin-'+margin_dir));
-                _.each(resize[0], function (val, key) {
-                    if (self.$target.hasClass(val)) {
-                        current = key;
-                    } else if (resize[1][key] === real_margin) {
-                        current = key;
-                    }
-                });
-                var begin = current;
-                var beginClass = self.$target.attr('class');
-                var regClass = new RegExp('\\s*' + resize[0][begin].replace(/[-]*[0-9]+/, '[-]*[0-9]+'), 'g');
+            var resize = resizeValues[compass];
+            if (!resize) {
+                return;
             }
 
-            var cursor = $handle.css('cursor')+'-important';
+            var current = 0;
+            var cssProperty = resize[2];
+            var cssPropertyValue = parseInt(self.$target.css(cssProperty));
+            _.each(resize[0], function (val, key) {
+                if (self.$target.hasClass(val)) {
+                    current = key;
+                } else if (resize[1][key] === cssPropertyValue) {
+                    current = key;
+                }
+            });
+            var begin = current;
+            var beginClass = self.$target.attr('class');
+            var regClass = new RegExp('\\s*' + resize[0][begin].replace(/[-]*[0-9]+/, '[-]*[0-9]+'), 'g');
+
+            var cursor = $handle.css('cursor') + '-important';
             var $body = $(document.body);
             $body.addClass(cursor);
 
-            var body_mousemove = function (event) {
-                event.preventDefault();
-                if (compass === 'size') {
-                    var dy = event.pageY-offset;
-                    dy = dy - dy%resize;
-                    if (dy <= 0) dy = resize;
-                    self.$target.css('height', dy+'px');
-                    self.$target.css('overflow', 'hidden');
-                    self._onResize(compass, null, dy);
-                    self.trigger_up('cover_update');
-                    return;
-                }
-                var dd = event['page'+XY] - xy + resize[1][begin];
-                var next = current+1 === resize[1].length ? current : (current+1);
+            var xy = ev['page' + XY];
+            var body_mousemove = function (ev) {
+                ev.preventDefault();
+
+                var dd = ev['page' + XY] - xy + resize[1][begin];
+                var next = current + (current+1 === resize[1].length ? 0 : 1);
                 var prev = current ? (current-1) : 0;
 
                 var change = false;
@@ -468,181 +440,127 @@ registry.marginAndResize = SnippetOption.extend({
                 if (change) {
                     self._onResize(compass, beginClass, current);
                     self.trigger_up('cover_update');
-                    self._adaptMarginsPreviews();
-                    $handle.addClass('oe_handle_change');
+                    $handle.addClass('o_active');
                 }
             };
-
             var body_mouseup = function () {
-                $body.unbind('mousemove', body_mousemove);
-                $body.unbind('mouseup', body_mouseup);
+                $body.off('mousemove', body_mousemove);
+                $body.off('mouseup', body_mouseup);
                 $body.removeClass(cursor);
-                setTimeout(function () {
-                    if (begin !== current) {
-                        self.trigger_up('request_history_undo_record', {
-                            $target: self.$target,
-                            event: 'resize_' + XY,
-                        });
-                    }
-                },0);
-                $handle.removeClass('oe_handle_change');
+                $handle.removeClass('o_active');
 
-                if (compass === 'size') {
-                    $fixed_size.addClass('active');
-                    $auto_size.removeClass('active');
-                } else {
-                    self._highlightMarginsPreviews();
+                // Highlights the previews for a while
+                var $handlers = self.$overlay.find('.o_handle');
+                $handlers.addClass('o_active').delay(300).queue(function () {
+                    $handlers.removeClass('o_active').dequeue();
+                });
+
+                if (begin === current) {
+                    return;
                 }
+                setTimeout(function () {
+                    self.trigger_up('request_history_undo_record', {
+                        $target: self.$target,
+                        event: 'resize_' + XY,
+                    });
+                }, 0);
             };
-            $body.mousemove(body_mousemove);
-            $body.mouseup(body_mouseup);
+            $body.on('mousemove', body_mousemove);
+            $body.on('mouseup', body_mouseup);
         });
-        $auto_size.on('click', function () {
-            self.$target.css('height', '');
-            self.$target.css('overflow', '');
-            self.trigger_up('request_history_undo_record', {
-                $target: self.$target,
-                event: 'resize_Y',
-            });
-            self.trigger_up('cover_update');
-
-            $fixed_size.removeClass('active');
-            $auto_size.addClass('active');
 
-            return false;
-        });
+        return def;
     },
     /**
      * @override
      */
-    onFocus : function () {
-        this._updateCursor();
-        this._adaptMarginsPreviews();
+    onFocus: function () {
+        this._onResize();
     },
 
     //--------------------------------------------------------------------------
-    // Private
+    // Public
     //--------------------------------------------------------------------------
 
     /**
-     * Adapts the margin handles to fit the left, top and bottom margins.
-     *
-     * @private
+     * @override
      */
-    _adaptMarginsPreviews: function () {
-        var self = this;
-        var ml = this.$target.css('margin-left');
-        _.each(this.$overlay.find(".oe_handle.n, .oe_handle.s"), function (handle) {
-            var $handle = $(handle);
-            var direction = $handle.hasClass('n') ? 'top': 'bottom';
-            $handle.height(self.$target.css('margin-' + direction));
-        });
-        this.$overlay.find(".oe_handle.w").css({
-            width: ml,
-            left: '-' + ml,
-        });
+    setTarget: function () {
+        this._super.apply(this, arguments);
+        this._onResize();
     },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
     /**
-     * Returns an object whose keys indicate the different editable dimensions.
+     * Returns an object mapping one or several cardinal direction (n, e, s, w)
+     * to an Array containing:
+     * 1) A list of classes to toggle when using this cardinal direction
+     * 2) A list of values these classes are supposed to set on a given CSS prop
+     * 3) The mentioned CSS prop
      *
+     * Note: this object must also be saved in this.grid before being returned.
+     *
+     * @abstract
      * @private
      * @returns {Object}
      */
-    _getSize: function () {
-        this.grid = {};
-        return this.grid;
-    },
-    /**
-     * Highlights the margins previews for a while.
-     *
-     * @private
-     */
-    _highlightMarginsPreviews: function () {
-        var $handlers = this.$overlay.find(".oe_handle.n, .oe_handle.s, .oe_handle.w");
-        $handlers.addClass('oe_handle_active').delay(300).queue(function () {
-            $handlers.removeClass('oe_handle_active').dequeue();
-        });
-    },
+    _getSize: function () {},
     /**
      * Called when the snippet is being resized and its classes changes.
      *
      * @private
-     * @param {string} compass - resize direction ('n', 's', 'e' or 'w')
-     * @param {?} beginClass - attributes class at the beginning
-     * @param {?} current - curent increment in this.grid
+     * @param {string} [compass] - resize direction ('n', 's', 'e' or 'w')
+     * @param {string} [beginClass] - attributes class at the beginning
+     * @param {integer} [current] - current increment in this.grid
      */
     _onResize: function (compass, beginClass, current) {
-        this._updateCursor();
-    },
-    /**
-     * Adapts the resize handles according to the classes and dimensions.
-     *
-     * @private
-     */
-    _updateCursor : function () {
-        var _class = this.$target.attr('class') || '';
-        var $handle_s = this.$overlay.find('.oe_handle.s');
-        var $handle_n = this.$overlay.find('.oe_handle.n');
-        var $handle_w = this.$overlay.find('.oe_handle.w');
-
-        var col = _class.match(/col-md-([0-9-]+)/i);
-        col = col ? +col[1] : 0;
-
-        var offset = _class.match(/col-md-offset-([0-9-]+)/i);
-        offset = offset ? +offset[1] : 0;
-
-        var overlay_class = this.$overlay.attr('class').replace(/(^|\s+)block-[^\s]*/gi, '');
-        if (col+offset >= 12) overlay_class+= ' block-e-right';
-        if (col === 1) overlay_class+= ' block-w-right block-e-left';
-        if (offset === 0) overlay_class+= ' block-w-left';
-        $handle_w.toggleClass('oe_handle_centered', offset > 0).toggleClass('o_handle_edited', offset >= 1 );
-
-        var mb = _class.match(/mb([0-9-]+)/i);
-        mb = mb ? +mb[1] : parseInt(this.$target.css('margin-bottom'));
-        if (mb >= 128) overlay_class+= ' block-s-bottom';
-        else if (!mb) overlay_class+= ' block-s-top';
-        $handle_s.toggleClass('oe_handle_centered', mb >= 32).toggleClass('o_handle_edited', mb > 0 );
-
-        var mt = _class.match(/mt([0-9-]+)/i);
-        mt = mt ? +mt[1] : parseInt(this.$target.css('margin-top'));
-        if (mt >= 128) overlay_class+= ' block-n-top';
-        else if (!mt) overlay_class+= ' block-n-bottom';
-        $handle_n.toggleClass('oe_handle_centered', mt >= 32).toggleClass('o_handle_edited', mt > 0 );
-
-        this.$overlay.attr('class', overlay_class);
-    },
-});
+        var self = this;
 
-/**
- * Handles the edition of margin-top and margin-bottom.
- */
-registry['margin-y'] = registry.marginAndResize.extend({
+        // Adapt the resize handles according to the classes and dimensions
+        var resizeValues = this._getSize();
+        var $handles = this.$overlay.find('.o_handle');
+        _.each(resizeValues, function (resizeValue, direction) {
+            var classes = resizeValue[0];
+            var values = resizeValue[1];
+            var cssProperty = resizeValue[2];
+
+            var $handle = $handles.filter('.' + direction);
+
+            var current = 0;
+            var cssPropertyValue = parseInt(self.$target.css(cssProperty));
+            _.each(classes, function (className, key) {
+                if (self.$target.hasClass(className)) {
+                    current = key;
+                } else if (values[key] === cssPropertyValue) {
+                    current = key;
+                }
+            });
 
-    //--------------------------------------------------------------------------
-    // Private
-    //--------------------------------------------------------------------------
+            $handle.toggleClass('o_handle_start', current === 0);
+            $handle.toggleClass('o_handle_end', current === classes.length - 1);
+        });
 
-    /**
-     * @override
-     */
-    _getSize: function () {
-        this.grid = this._super();
-        var grid = [0,4,8,16,32,48,64,92,128];
-        this.grid = {
-            // list of class (Array), grid (Array), default value (INT)
-            n: [_.map(grid, function (v) {return 'mt'+v;}), grid],
-            s: [_.map(grid, function (v) {return 'mb'+v;}), grid],
-            // INT if the user can resize the snippet (resizing per INT px)
-            size: null
-        };
-        return this.grid;
+        // Adapt the handles to fit the left, top and bottom sizes
+        var ml = this.$target.css('margin-left');
+        this.$overlay.find('.o_handle.w').css({
+            width: ml,
+            left: '-' + ml,
+        });
+        _.each(this.$overlay.find(".o_handle.n, .o_handle.s"), function (handle) {
+            var $handle = $(handle);
+            var direction = $handle.hasClass('n') ? 'top': 'bottom';
+            $handle.height(self.$target.css('padding-' + direction));
+        });
     },
 });
 
 /**
- * Handles the edition of snippet's height.
+ * Handles the edition of padding-top and padding-bottom.
  */
-registry.resize = registry.marginAndResize.extend({
+registry.sizing_y = registry.sizing.extend({
 
     //--------------------------------------------------------------------------
     // Private
@@ -652,8 +570,26 @@ registry.resize = registry.marginAndResize.extend({
      * @override
      */
     _getSize: function () {
-        this.grid = this._super();
-        this.grid.size = 8;
+        var nClass = 'pt';
+        var nProp = 'padding-top';
+        var sClass = 'pb';
+        var sProp = 'padding-bottom';
+        if (this.$target.is('hr')) {
+            nClass = 'mt';
+            nProp = 'margin-top';
+            sClass = 'mb';
+            sProp = 'margin-bottom';
+        }
+
+        var grid = [];
+        for (var i = 0 ; i <= 256/8 ; i++) {
+            grid.push(i * 8);
+        }
+        grid.splice(1, 0, 4);
+        this.grid = {
+            n: [_.map(grid, function (v) { return nClass + v; }), grid, nProp],
+            s: [_.map(grid, function (v) { return sClass + v; }), grid, sProp],
+        };
         return this.grid;
     },
 });
diff --git a/addons/web_editor/static/src/less/web_editor.common.less b/addons/web_editor/static/src/less/web_editor.common.less
index cfa9f683198..99f6a474397 100644
--- a/addons/web_editor/static/src/less/web_editor.common.less
+++ b/addons/web_editor/static/src/less/web_editor.common.less
@@ -158,57 +158,75 @@ ul.oe_menu_editor {
     }
 }
 
-// Generate all margins for all sizes
-.o-margins-all(@factor: 1) {
-    // Unfortunately, the margins sizes are not
-    // mathematically related by a single function
-    .o-margins(128, @factor);
-    .o-margins(96, @factor);
-    .o-margins(92, @factor);
-    .o-margins(64, @factor);
-    .o-margins(48, @factor);
-    .o-margins(32, @factor);
-    .o-margins(24, @factor);
-    .o-margins(16, @factor);
-    .o-margins(8, @factor);
-    .o-margins(4, @factor);
-    .o-margins(0, @factor);
+// Generate all spacings for all sizes
+.o-spacing-all(@factor: 1) {
+    // Generate vertical margin/padding classes used by the editor
+    .o-generate-spacings(256/8);
+    .o-generate-spacings(@n, @i: 0) when (@i =< @n) {
+        .o-vspacing(@i * 8);
+        .o-generate-spacings(@n, @i + 1);
+    }
+    .o-vspacing(4, @factor);
+
+    // 92px vertical margin is kept for compatibility
+    .o-vmargins(92, @factor);
+
+    // Some horizontal margin classes defined for convenience
+    // (and compatibility)
+    .o-hmargins(0, @factor);
+    .o-hmargins(4, @factor);
+    .o-hmargins(8, @factor);
+    .o-hmargins(16, @factor);
+    .o-hmargins(32, @factor);
+    .o-hmargins(64, @factor);
 }
 
-// Generate all margins for one size, scalled by a
-// given factor (0 <= factor <= 1)
-.o-margins(@name, @factor: 1) {
-    .o-margins-define(@name, @factor * @name);
+// Generate all spacings for one size, scalled by a given factor
+// (0 <= factor <= 1)
+.o-vspacing(@name, @factor: 1) {
+    .o-vmargins(@name, @factor);
+    .o-vpaddings(@name, @factor);
+}
+.o-vmargins(@name, @factor: 1) {
+    .o-vmargins-define(@name, @factor * @name);
+}
+.o-vpaddings(@name, @factor: 1) {
+    .o-vpaddings-define(@name, @factor * @name);
+}
+.o-hspacing(@name, @factor: 1) {
+    .o-hmargins(@name, @factor);
+    .o-hpaddings(@name, @factor);
+}
+.o-hmargins(@name, @factor: 1) {
+    .o-hmargins-define(@name, @factor * @name);
+}
+.o-hpaddings(@name, @factor: 1) {
+    .o-hpaddings-define(@name, @factor * @name);
 }
 
-// Generate all margins for one size, given
-// the name of the margin and intended size
-.o-margins-define(@name, @size: @name) {
-    .mt@{name} {margin-top: ~"@{size}px"!important;}
-    .mb@{name} {margin-bottom: ~"@{size}px"!important;}
-    .ml@{name} {margin-left: ~"@{size}px"!important;}
-    .mr@{name} {margin-right: ~"@{size}px"!important;}
+// Generate all spacings for one size, given the name of the spacing and
+// intended size
+.o-vmargins-define(@name, @size: @name) {
+    .mt@{name} { margin-top: unit(@size, px)!important; }
+    .mb@{name} { margin-bottom: unit(@size, px)!important; }
+}
+.o-vpaddings-define(@name, @size: @name) {
+    .pt@{name} { padding-top: unit(@size, px)!important; }
+    .pb@{name} { padding-bottom: unit(@size, px)!important; }
+}
+.o-hmargins-define(@name, @size: @name) {
+    .ml@{name} { margin-left: unit(@size, px)!important; }
+    .mr@{name} { margin-right: unit(@size, px)!important; }
+}
+.o-hpaddings-define(@name, @size: @name) {
+    .pl@{name} { padding-left: unit(@size, px)!important; }
+    .pr@{name} { padding-right: unit(@size, px)!important; }
 }
 
 // Generate all margins
-.o-margins-all();
-
-// Possibility to change the margins ratio for small screen sizes, e.g.:
-// @media (max-width: 768px) {
-//     .o-margins-all(0.75);
-// }
-// Possibility to only redefine single margins for small screen sizes, e.g.:
-// @media (max-width: 768px) {
-//     .o-margins(64, 0.50);
-//     .o-margins(48, 0.50);
-// }
-// Possibility to directly redefine the size of single margins instead of refering to a factor for small screen sizes, e.g.:
-// @media (max-width: 768px) {
-//     .o-margins-define(128, 48);
-//     .o-margins-define(96, 48);
-//     .o-margins-define(64, 48);
-// }
+.o-spacing-all();
 
+// Underline
 a.o_underline {
     text-decoration: underline;
     &:hover {
diff --git a/addons/web_editor/static/src/less/web_editor.ui.less b/addons/web_editor/static/src/less/web_editor.ui.less
index 1d59c4e2033..e7ba19f332d 100644
--- a/addons/web_editor/static/src/less/web_editor.ui.less
+++ b/addons/web_editor/static/src/less/web_editor.ui.less
@@ -539,62 +539,43 @@ html[lang] > body.editor_enable [data-oe-translation-state] {
         }
 
         // HANDLES
-        > .oe_handles {
+        > .o_handles {
             @o-handles-offset-to-hide: 10000px;
             @o-handless-accent-color: #00e2ff;
             .o-position-absolute(-@o-handles-offset-to-hide, 0, auto, 0);
 
-            &:hover > .oe_handle {
+            &:hover > .o_handle {
                 background-color: fade(@o-handless-accent-color, 5%);
             }
 
-            > .oe_handle {
+            > .o_handle {
                 @o-handle-btn-size: 18px;
-                opacity: 0.5;
-                .o-transition(opacity, 400ms);
-                border: 0 solid @o-handless-accent-color;
-
-                // MARGINS PREVIEW
-                &.n, &.s, &.w {
-                    position: relative;
-                    .o-transition(background, 0.3s);
 
-                    &.oe_handle_change, &.oe_handle_active, &:hover {
-                        background-color: fade(@o-handless-accent-color, 20%);
+                position: relative;
+                border: 0 solid @o-handless-accent-color;
+                .o-transition(background, 300ms);
+
+                &:hover, &.o_active {
+                    background-color: fade(@o-handless-accent-color, 20%);
+
+                    &:before {
+                        content: '';
+                        .o-position-absolute(0, @left:50%);
+                        width: 1px;
+                        height: 100%;
+                        margin-left: -1px;
+                        background-color: fade(@o-handless-accent-color, 50%);
                     }
 
-                    &.o_handle_edited {
-                        opacity: 0.9;
-
-                        &:after {
-                            color: white;
-                            border-color: darken(@o-handless-accent-color, 10%);
-                            background-color: darken(@o-handless-accent-color, 20%);
-                        }
+                    &.w:before {
+                        .o-position-absolute(50%, @left: 0);
+                        width: 100%;
+                        height: 1px;
                     }
 
-                    &.oe_handle_change, &:hover {
-                        opacity: 1;
-
-                        &:before {
-                            .o-position-absolute(0, @left:50%);
-                            width: 1px;
-                            height: 100%;
-                            margin-left: -1px;
-                            background-color: fade(@o-handless-accent-color, 50%);
-                            content:'';
-                        }
-
-                        &.w:before {
-                            .o-position-absolute(50%,@left: 0);
-                            width: 100%;
-                            height: 1px;
-                        }
-
-                        &:after {
-                            border-color: darken(@o-handless-accent-color, 10%);
-                            background-color: darken(@o-handless-accent-color, 20%);
-                        }
+                    &:after {
+                        border-color: darken(@o-handless-accent-color, 10%);
+                        background-color: darken(@o-handless-accent-color, 20%);
                     }
                 }
 
@@ -602,17 +583,13 @@ html[lang] > body.editor_enable [data-oe-translation-state] {
                     display: block;
                     width: @o-handle-btn-size;
                     height: @o-handle-btn-size;
-                    border: solid 1px rgba(0, 0, 0, 0.2);
+                    border: solid 1px darken(@o-handless-accent-color, 10%);
                     line-height: @o-handle-btn-size - 2;
                     font-size: 14px;
                     font-family: FontAwesome;
-                    background-color: @o-we-color-light;
-                    color: @o-we-color-text-light;
-                }
-                &:hover {
-                    opacity: 0.9;
+                    background-color: darken(@o-handless-accent-color, 20%);
+                    color: white;
                 }
-
                 &.w:after, &.e:after {
                     content: "\f07e";
                 }
@@ -620,107 +597,72 @@ html[lang] > body.editor_enable [data-oe-translation-state] {
                     content: "\f07d";
                 }
 
+                &.o_handle_start {
+                    &.w:after, &.e:after {
+                        content: '\f061';
+                    }
+                    &.n:after, &.s:after {
+                        content: '\f063';
+                    }
+                }
+                &.o_handle_end {
+                    &.w:after, &.e:after {
+                        content: '\f060';
+                    }
+                    &.n:after, &.s:after {
+                        content: '\f062';
+                    }
+                }
+
                 &.w {
+                    .o-position-absolute(@o-handles-offset-to-hide, auto, -@o-handles-offset-to-hide, 0);
+                    width: @odoo-handle-edge-size;
                     border-width: @odoo-handle-border-width;
                     border-right-width: 0;
                     cursor: e-resize;
-                    width: @odoo-handle-edge-size;
-                    .o-position-absolute(@o-handles-offset-to-hide, auto, -@o-handles-offset-to-hide, 0);
 
                     &:after {
-                        .o-position-absolute(@top: 50%, @left: 50%);
+                        .o-position-absolute(@top: 50%, @left: 40%);
                         margin-top: -@o-handle-btn-size/2;
                     }
-                    &.oe_handle_centered:after {
-                        margin-left: -@o-handle-btn-size/2;
-                    }
                 }
                 &.e {
+                    .o-position-absolute(@o-handles-offset-to-hide, 0, -@o-handles-offset-to-hide, auto);
+                    width: @odoo-handle-edge-size;
                     border-right-width: @odoo-handle-border-width;
                     cursor: w-resize;
-                    width: @odoo-handle-edge-size;
-                    .o-position-absolute(@o-handles-offset-to-hide, 0, -@o-handles-offset-to-hide, auto);
 
                     &:after {
-                        .o-position-absolute(@top: 50%, @right: -@odoo-handle-border-width);
+                        .o-position-absolute(@top: 50%, @right: 40%);
                         margin-top: -@o-handle-btn-size/2;
                     }
                 }
                 &.n {
-                    border-top-width: @odoo-handle-border-width;
                     .o-position-absolute(@o-handles-offset-to-hide, 0, auto, 0);
+                    border-top-width: @odoo-handle-border-width;
+                    cursor: ns-resize;
 
                     &:after {
-                        .o-position-absolute(@left: 50%, @top: 50%);
+                        .o-position-absolute(@left: 50%, @top: 40%);
                         margin-left: -@o-handle-btn-size/2;
                     }
                 }
                 &.s {
-                    border-bottom-width: @odoo-handle-border-width;
                     .o-position-absolute(auto, 0, -@o-handles-offset-to-hide, 0);
+                    border-bottom-width: @odoo-handle-border-width;
+                    cursor: ns-resize;
 
                     &:after {
-                        .o-position-absolute(@left: 50%, @bottom: 50%);
+                        .o-position-absolute(@left: 50%, @bottom: 40%);
                         margin-left: -@o-handle-btn-size/2;
                     }
                 }
-                &.n, &.s {
-                    cursor: ns-resize;
-
-                    &.oe_handle_centered:after {
-                        .o-position-absolute(@left: 50%, @top: 50%);
-                        margin-top:  -@o-handle-btn-size/2;
-                    }
-                }
-
-                // SIZE HANDLERS
-                &.size {
-                    @o-handle-size-height: 15px;
-
-                    height: 0;
-                    background: transparent;
-                    .o-position-absolute(@bottom: -@o-handles-offset-to-hide + @o-handle-size-height, @left: 50%);
-                    width: 250px;
-                    margin-left: -125px;
-
-                    > .oe_handle_button {
-                        position: relative;
-                        display: block;
-                        width: 100px;
-                        height: @o-handle-size-height;
-                        padding-top: 2px;
-                        font-weight: 600;
-                        font-size: 9px;
-                        text-transform: uppercase;
-                        background-color: @o-we-color-light;
-                        color: @o-we-color-text-light;
-                        &:hover {
-                            background-color: @o-we-color-dark;
-                            color: white;
-                        }
-                        &.auto_size {
-                            cursor: pointer;
-                            float: left;
-                        }
-                        &.size {
-                            cursor: row-resize;
-                            float: right;
-                        }
-                        &.active:before {
-                            content: "\f00c";
-                            font-family: "FontAwesome";
-                            color: @odoo-brand-optional;
-                            .o-position-absolute(@top: 0, @left: 3px);
-                            font-size: 11px;
-                        }
-                    }
-                }
 
                 &.readonly {
-                    cursor: auto !important;
+                    cursor: auto!important;
 
-                    &:after, &.size {
-                        display: none !important;
+                    &:after {
+                        display: none!important;
                     }
                     &:hover {
                         opacity: 0.5;
@@ -728,38 +670,6 @@ html[lang] > body.editor_enable [data-oe-translation-state] {
                 }
             }
         }
-
-        // HANDLERS ICONS
-        &.block-w-left .w:after {
-            content: "" !important;
-        }
-        &.block-w-right .w:after {
-            content: "" !important;
-        }
-        &.block-w-left.block-w-right .w:after {
-            display: none !important;
-        }
-        &.block-e-left .e:after {
-            content: "" !important;
-        }
-        &.block-e-right .e:after {
-            content: "" !important;
-        }
-        &.block-e-left.block-e-right .e:after {
-            display: none !important;
-        }
-        &.block-s-bottom .s, &.block-n-top .n {
-            cursor: n-resize!important;
-            &:after {
-                content: "\f062" !important;
-            }
-        }
-        &.block-s-top .s, &.block-n-bottom .n {
-            cursor: s-resize!important;
-            &:after {
-                content: "\f063" !important;
-            }
-        }
     }
 }
 
@@ -779,17 +689,6 @@ html[lang] > body.editor_enable [data-oe-translation-state] {
     cursor: move !important;
 }
 
-.block-s-top .s,
-.block-s-bottom .s,
-.block-n-top .n,
-.block-n-bottom .n,
-.block-w-left .w,
-.block-e-right .e {
-    &:before {
-        font-size: 10px;
-    }
-}
-
 // NOTE EDITOR
 .note-popover .popover {
     height: @odoo-navbar-height;
diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml
index ccf56129ad1..594a7615951 100644
--- a/addons/web_editor/static/src/xml/snippets.xml
+++ b/addons/web_editor/static/src/xml/snippets.xml
@@ -2,15 +2,11 @@
 <templates id="template" xml:space="preserve">
     <t t-name="web_editor.snippet_overlay">
         <div class="oe_overlay">
-            <div class="oe_handles">
-                <div class="oe_handle n readonly"/>
-                <div class="oe_handle e readonly"/>
-                <div class="oe_handle w readonly"/>
-                <div class="oe_handle s readonly"/>
-                <div class="oe_handle size readonly">
-                    <div class="oe_handle_button auto_size">Auto size</div>
-                    <div class="oe_handle_button size" title="Resize to force the height of this block">Fixed size</div>
-                </div>
+            <div class="o_handles">
+                <div class="o_handle n readonly"/>
+                <div class="o_handle e readonly"/>
+                <div class="o_handle w readonly"/>
+                <div class="o_handle s readonly"/>
             </div>
             <div class="oe_overlay_options" contentEditable="false">
                 <div class="btn-group">
diff --git a/addons/website/static/src/js/content/snippets.animation.js b/addons/website/static/src/js/content/snippets.animation.js
index 3556ebd8fc7..d7c29359b95 100644
--- a/addons/website/static/src/js/content/snippets.animation.js
+++ b/addons/website/static/src/js/content/snippets.animation.js
@@ -431,6 +431,23 @@ registry.slider = Animation.extend({
      * @override
      */
     start: function () {
+        if (!this.editableMode) {
+            var maxHeight = 0;
+            var $items = this.$('.item');
+            _.each($items, function (el) {
+                var $item = $(el);
+                var isActive =  $item.hasClass('active');
+                $item.addClass('active');
+                var height = $item.outerHeight();
+                if (height > maxHeight) {
+                    maxHeight = height;
+                }
+                $item.toggleClass('active', isActive);
+            });
+            _.each($items, function (el) {
+                $(el).css('min-height', maxHeight);
+            });
+        }
         this.$target.carousel();
         return this._super.apply(this, arguments);
     },
@@ -441,6 +458,9 @@ registry.slider = Animation.extend({
         this._super.apply(this, arguments);
         this.$target.carousel('pause');
         this.$target.removeData('bs.carousel');
+        _.each(this.$('.item'), function (el) {
+            $(el).css('min-height', '');
+        });
     },
 });
 
diff --git a/addons/website/static/src/js/editor/snippets.options.js b/addons/website/static/src/js/editor/snippets.options.js
index e0dced9caa1..7601dea6b6c 100644
--- a/addons/website/static/src/js/editor/snippets.options.js
+++ b/addons/website/static/src/js/editor/snippets.options.js
@@ -122,12 +122,11 @@ options.registry.carousel = options.Class.extend({
         this.$target.on('slid.bs.carousel', function () {
             self.$target.carousel('pause');
             self.trigger_up('option_update', {
-                optionNames: ['background', 'background_position', 'colorpicker'],
+                optionNames: ['background', 'background_position', 'colorpicker', 'sizing_y'],
                 name: 'target',
                 data: self.$target.find('.item.active'),
             });
         });
-        this.$target.trigger('slid.bs.carousel');
 
         return def;
     },
@@ -144,6 +143,14 @@ options.registry.carousel = options.Class.extend({
         this._rebindEvents();
     },
     /**
+     * @override
+     */
+    onFocus: function () {
+        // Needs to be done on focus, not on start, as all other options are
+        // maybe not all initialized in start
+        this.$target.trigger('slid.bs.carousel');
+    },
+    /**
      * Associates unique ID on cloned slider elements.
      *
      * @override
@@ -161,7 +168,7 @@ options.registry.carousel = options.Class.extend({
         this._super.apply(this, arguments);
         this.$target.find('.item').removeClass('next prev left right active')
             .first().addClass('active');
-        this.$target.find('.carousel-indicators').find('li').removeClass('active')
+        this.$target.find('.carousel-indicators').find('li').removeClass('active').html('')
             .first().addClass('active');
         this.$target.removeClass('oe_img_bg ' + this._class).css('background-image', '');
     },
@@ -262,9 +269,7 @@ options.registry.carousel = options.Class.extend({
     },
 });
 
-options.registry['margin-x'] = options.registry.marginAndResize.extend({
-    preventChildPropagation: true,
-
+options.registry.sizing_x = options.registry.sizing.extend({
     /**
      * @override
      */
@@ -286,15 +291,13 @@ options.registry['margin-x'] = options.registry.marginAndResize.extend({
      * @override
      */
     _getSize: function () {
-        this.grid = this._super();
-        var width = this.$target.parents('.row:first').first().outerWidth();
-
-        var grid = [1,2,3,4,5,6,7,8,9,10,11,12];
-        this.grid.e = [_.map(grid, function (v) {return 'col-md-'+v;}), _.map(grid, function (v) {return width/12*v;})];
-
-        grid = [-12,-11,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,11];
-        this.grid.w = [_.map(grid, function (v) {return 'col-md-offset-'+v;}), _.map(grid, function (v) {return width/12*v;}), 12];
-
+        var width = this.$target.closest('.row').width();
+        var gridE = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+        var gridW = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
+        this.grid = {
+            e: [_.map(gridE, function (v) { return 'col-md-' + v; }), _.map(gridE, function (v) { return width/12*v; }), 'width'],
+            w: [_.map(gridW, function (v) { return 'col-md-offset-' + v; }), _.map(gridW, function (v) { return width/12*v; }), 'margin-left'],
+        };
         return this.grid;
     },
     /**
@@ -321,7 +324,7 @@ options.registry['margin-x'] = options.registry.marginAndResize.extend({
                 this.$target.addClass('col-md-offset-' + offset);
             }
         }
-        this._super(compass, beginClass, current);
+        this._super.apply(this, arguments);
     },
 });
 
diff --git a/addons/website/static/src/less/website.snippets.less b/addons/website/static/src/less/website.snippets.less
index 59cbc47b9dc..388a7180d96 100644
--- a/addons/website/static/src/less/website.snippets.less
+++ b/addons/website/static/src/less/website.snippets.less
@@ -436,9 +436,6 @@ div.carousel {
         background-attachment: fixed;
     }
 }
-.s_parallax {
-    min-height: 200px;
-}
 
 // Company Team
 
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 6867b32ae2c..54c0c6a047c 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 <template id="s_cover" name="Cover">
-    <section class="s_text_block_image_fw oe_img_bg oe_custom_bg" style="background-image: url(/web/image/website.s_cover_default_image); background-position: 50% 100%">
+    <section class="s_text_block_image_fw oe_img_bg oe_custom_bg pt64 pb64" style="background-image: url(/web/image/website.s_cover_default_image); background-position: 50% 100%">
         <div class="container">
             <div class="row">
-                <div class="col-md-6 mt64 mb64 bg-black-25">
+                <div class="col-md-6 bg-black-25 pt32 pb32">
                     <h2 style="font-size:62px">Headline</h2>
                     <h4>With a great subtitle</h4>
                     <p>Write one or two paragraphs describing your product, services or a specific feature. To be successful your content needs to be useful to your readers.</p>
@@ -15,21 +15,21 @@
 </template>
 
 <template id="s_banner" name="Slider">
-    <div id="myCarousel" class="carousel slide s_banner" data-interval="10000" style="height: 400px;">
+    <div id="myCarousel" class="carousel slide s_banner" data-interval="10000">
         <!-- Indicators -->
         <ol class="carousel-indicators hidden">
             <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
         </ol>
         <div class="carousel-inner">
-            <div class="item oe_img_bg active bg-alpha">
+            <div class="item oe_img_bg active bg-alpha pt48 pb48">
                 <div class="container">
                     <div class="row content">
-                        <div class="carousel-content col-md-4 col-md-offset-1 mt128 mb96">
+                        <div class="carousel-content col-md-4 col-md-offset-1 mt64">
                             <h2>Your Slide Title</h2>
                             <h4>Click to customize this text</h4>
                             <p><a href="/contactus" class="btn btn-warning btn-large">Contact us</a></p>
                         </div>
-                        <div class="carousel-img col-md-6 col-md-offset-1 hidden-sm hidden-xs mt48">
+                        <div class="carousel-img col-md-6 col-md-offset-1 hidden-sm hidden-xs">
                             <img class="img-responsive" src="/web/image/website.s_banner_default_image" alt="Slider Odoo Image"/>
                         </div>
                     </div>
@@ -42,10 +42,10 @@
 </template>
 
 <template id="s_text_image" name="Text-Image">
-    <section class="s_text_image">
+    <section class="s_text_image pt32 pb32">
         <div class="container">
             <div class="row">
-                <div class="col-md-6 mt64 mb32">
+                <div class="col-md-6 mt32">
                     <h3 style="text-align: right;">A Section Subtitle</h3>
                     <p style="text-align: right;">
                         Write one or two paragraphs describing your product or
@@ -56,7 +56,7 @@
                         and give it to them.
                     </p>
                 </div>
-                <div class="col-md-6 mt32 mb32">
+                <div class="col-md-6">
                   <img class="img img-responsive pull-left mb16" src="/web/image/website.s_text_image_default_image" alt="Odoo text and image block"/>
                 </div>
             </div>
@@ -65,13 +65,13 @@
 </template>
 
 <template id="s_image_text" name="Image-Text">
-    <section class="s_image_text">
+    <section class="s_image_text pt32 pb32">
         <div class="container">
             <div class="row">
-                <div class="col-md-6 mt32 mb32">
+                <div class="col-md-6">
                   <img class="img img-responsive center-block mb16" src="/web/image/website.s_image_text_default_image"  alt="Odoo image and text block"/>
                 </div>
-                <div class="col-md-6 mt64 mb32">
+                <div class="col-md-6 mt32">
                     <h3>A Section Subtitle</h3>
                     <p>
                         Write one or two paragraphs describing your product,
@@ -88,10 +88,10 @@
 </template>
 
 <template id="s_big_message" name="Big Message">
-    <section class="jumbotron s_big_message oe_img_bg oe_custom_bg" style="background-image: url('/web/image/website.s_background_image_01');">
+    <section class="jumbotron s_big_message oe_img_bg oe_custom_bg pb32" style="background-image: url('/web/image/website.s_background_image_01');">
         <div class="container">
             <div class="row">
-                <div class="mb32 col-md-offset-1 col-md-8">
+                <div class="col-md-offset-1 col-md-8">
                     <h1>Sell Online. Easily.</h1>
                     <p>Write one sentence to convince visitor about your message.</p>
                     <a class="btn btn-warning btn-lg" href="/contactus">Contact us</a>
@@ -102,12 +102,12 @@
 </template>
 
 <template id="s_text_block" name="Text Block">
-    <section class="s_text_block">
+    <section class="s_text_block pt16 pb16">
         <div class="container">
             <h2 class="text-center">A Great Headline</h2>
             <h3 class="text-center text-muted">A good subtitle</h3>
             <div class="row">
-                <div class="col-md-12 mb16 mt16">
+                <div class="col-md-12">
                     <p>
                         A great way to catch your reader's attention is to tell a story.
                         Everything you consider writing can be told as a story.
@@ -144,9 +144,9 @@
 </template>
 
 <template id="s_features" name="Features">
-    <section class="s_features">
+    <section class="s_features pt16 pb16">
         <div class="container">
-            <div class="row mt16 mb16">
+            <div class="row">
                 <div class="col-md-4 text-center">
                     <span class="fa fa-suitcase fa-5x"></span>
                     <div>
@@ -174,14 +174,14 @@
 </template>
 
 <template id="s_big_picture" name="Big Picture">
-    <section class="s_big_picture bg-gray-lighter">
+    <section class="s_big_picture bg-gray-lighter pb16">
         <div class="container">
             <h2 class="text-center">A Punchy Headline</h2>
             <div class="row">
                 <div class="col-md-12">
                   <img class="img img-responsive" src="/web/image/website.s_big_picture_default_image" style="margin: 0 auto;"  alt="Odoo CMS - a big picture"/>
                 </div>
-                <div class="col-md-6 col-md-offset-3 mb16 mt16">
+                <div class="col-md-6 col-md-offset-3 mt16">
                     <p class="text-center">
                         <b>A Small Subtitle</b>
                     </p>
@@ -200,10 +200,10 @@
 </template>
 
 <template id="s_three_columns" name="Three Columns">
-    <section class="s_three_columns">
+    <section class="s_three_columns pt32 pb48">
         <div class="container">
             <div class="row">
-                <div class="col-md-4 mt32 mb48">
+                <div class="col-md-4">
                     <img class="img img-responsive" src="/web/image/website.library_image_11" alt="Odoo - Sample 1 for three columns"/>
                     <h4 class="mt16">Feature One</h4>
                     <p>
@@ -212,7 +212,7 @@
                         column and use the top icons to perform your action.
                     </p>
                 </div>
-                <div class="col-md-4 mt32 mb48">
+                <div class="col-md-4">
                     <img class="img img-responsive" src="/web/image/website.library_image_13" alt="Odoo - Sample 2 for three columns"/>
                     <h4 class="mt16">Feature Two</h4>
                     <p>
@@ -222,7 +222,7 @@
                         one as a copy.
                     </p>
                 </div>
-                <div class="col-md-4 mt32 mb48">
+                <div class="col-md-4">
                     <img class="img img-responsive" src="/web/image/website.library_image_07" alt="Odoo - Sample 3 for three columns"/>
                     <h4 class="mt16">Feature Three</h4>
                     <p>
@@ -384,11 +384,11 @@
 <template id="s_company_team" name="Company Team">
     <section class="s_company_team">
         <div class="container">
-            <h1 class="text-center mb32">
+            <h1 class="text-center mb16">
                 Meet the Executive Team
             </h1>
             <div class="row">
-                <div class="col-md-6 mb32">
+                <div class="col-md-6 pt16 pb16">
                     <div class="row s_no_resize_cols">
                         <div class="col-md-4">
                             <img src="/web/image/website.s_company_team_image_1" class="img-responsive img-circle center-block shadow"/>
@@ -403,7 +403,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-md-6 mb32">
+                <div class="col-md-6 pt16 pb16">
                     <div class="row s_no_resize_cols">
                         <div class="col-md-4">
                             <img src="/web/image/website.s_company_team_image_2" class="img-responsive img-circle center-block shadow"/>
@@ -418,7 +418,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-md-6 mb32">
+                <div class="col-md-6 pt16 pb16">
                     <div class="row s_no_resize_cols">
                         <div class="col-md-4">
                             <img src="/web/image/website.s_company_team_image_3" class="img-responsive img-circle center-block shadow"/>
@@ -433,7 +433,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-md-6 mb32">
+                <div class="col-md-6 pt16 pb16">
                     <div class="row s_no_resize_cols">
                         <div class="col-md-4">
                             <img src="/web/image/website.s_company_team_image_4" class="img-responsive img-circle center-block shadow"/>
@@ -540,25 +540,25 @@
 </template>
 
 <template id="s_references" name="References">
-    <section class="s_references bg-gray-lighter">
+    <section class="s_references bg-gray-lighter pt16 pb16">
         <div class="container">
             <div class="row">
-                <div class="col-md-2 mt48">
-                  <h4 class="text-center mt16">Our References</h4>
+                <div class="col-md-2 mt32">
+                  <h4 class="text-center">Our References</h4>
                 </div>
-                <div class="col-md-2 col-sm-3 col-xs-6 mt16 mb16">
+                <div class="col-md-2 col-sm-3 col-xs-6">
                   <img src="/web/image/website.s_reference_demo_image_1" class="img img-responsive " alt="Demo Logo"/>
                 </div>
-                <div class="col-md-2 col-sm-3 col-xs-6 mt16 mb16">
+                <div class="col-md-2 col-sm-3 col-xs-6">
                   <img src="/web/image/website.s_reference_demo_image_2" class="img img-responsive " alt="Demo Logo"/>
                 </div>
-                <div class="col-md-2 col-sm-3 col-xs-6 mt16 mb16">
+                <div class="col-md-2 col-sm-3 col-xs-6">
                   <img src="/web/image/website.s_reference_demo_image_3" class="img img-responsive " alt="Demo Logo"/>
                 </div>
-                <div class="col-md-2 col-sm-3 col-xs-6 mt16 mb16">
+                <div class="col-md-2 col-sm-3 col-xs-6">
                   <img src="/web/image/website.s_reference_demo_image_4" class="img img-responsive " alt="Demo Logo"/>
                 </div>
-                <div class="col-md-2 col-sm-3 col-xs-6 mt16 mb16">
+                <div class="col-md-2 col-sm-3 col-xs-6">
                   <img src="/web/image/website.s_reference_demo_image_5" class="img img-responsive " alt="Demo Logo"/>
                 </div>
             </div>
@@ -567,14 +567,14 @@
 </template>
 
 <template id="s_feature_grid" name="Feature Grid">
-    <section class="s_feature_grid">
+    <section class="s_feature_grid pt16">
         <div class="container">
             <div class="row">
                 <div class="col-md-5 col-md-offset-1">
                     <div class="row">
-                        <div class="col-md-12 mt16 mb16">
+                        <div class="col-md-12 pb16">
                             <h3 class="mb0">List of Features</h3>
-                            <h5 class="text-muted mb16">Add a great slogan</h5>
+                            <h5 class="text-muted">Add a great slogan</h5>
                         </div>
                         <div class="col-md-12">
                             <span style="min-width: 45px" class="fa fa-2x fa-comment pull-left mb16"></span>
@@ -595,9 +595,9 @@
                 </div>
                 <div class="col-md-5">
                     <div class="row">
-                        <div class="col-md-12 mt16 mb16">
+                        <div class="col-md-12 pb16">
                             <h3 class="mb0">Second List</h3>
-                            <h5 class="text-muted mb16">Add a great slogan</h5>
+                            <h5 class="text-muted">Add a great slogan</h5>
                         </div>
                         <div class="col-md-12">
                             <span style="min-width: 45px" class="fa fa-2x fa-magic pull-left mb16"></span>
@@ -622,7 +622,7 @@
 </template>
 
 <template id="s_parallax" name="Parallax">
-    <section class="parallax s_parallax oe_img_bg"
+    <section class="parallax s_parallax oe_img_bg pt96 pb96"
         style="background-image: url(/web/image/website.s_background_image_04);"
         data-scroll-background-ratio="1.6"><div class="oe_structure"/></section>
 </template>
@@ -903,16 +903,14 @@
         <li data-remove-slide="true" data-no-preview="true"><a href="#" ><i class="fa fa-trash-o"/>Remove Slide</a></li>
     </div>
 
-    <div data-js='margin-y'
-        data-selector="section, .row:not(.s_no_resize_cols) > [class*='col-md-'], :not(.o_gallery > .container) > .carousel, .parallax, hr">
-    </div>
+    <div data-selector="section, :not(.o_gallery > .container) > .carousel, .parallax"
+        data-drop-in=":not(p).oe_structure, :not(p)[data-oe-type=html]"/>
 
-    <div data-js='resize'
-        data-selector="section, :not(.o_gallery > .container) > .carousel, .parallax"
-        data-drop-in=":not(p).oe_structure, :not(p)[data-oe-type=html]">
+    <div data-js="sizing_y"
+        data-selector="section, .row:not(.s_no_resize_cols) > [class*='col-md-'], :not(.o_gallery > .container) > .carousel, .parallax, hr">
     </div>
 
-    <div data-js='margin-x'
+    <div data-js="sizing_x"
         data-selector=".row:not(.s_no_resize_cols) > [class*='col-md-']"
         data-drop-near=".row:not(.s_no_resize_cols) > [class*='col-md-']">
     </div>