diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-05-16 12:24:30 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:36:54 +0200 |
| commit | ed1b18f10348244ce26b8b27edbd59d91cee7772 (patch) | |
| tree | 03b5b2ddc4838d9da52e7945a9d526ee4541dba9 /addons/website/static/src/js | |
| parent | 66289d639c80780fe01b514296ea6b86a63afba3 (diff) | |
[REF] *: BS4, adapt col-related classes
col-lg-* -> col-xl-*
col-md-* -> col-lg-*
col-sm-* -> col-md-*
col-xs-* -> col-*
col-lg-offset-* -> offset-xl-*
col-md-offset-* -> offset-lg-*
col-sm-offset-* -> offset-md-*
col-xs-offset-* -> offset-*
col-lg-pull-* -> order-xl-1
col-md-pull-* -> order-lg-1
col-sm-pull-* -> order-md-1
col-xs-pull-* -> order-1
col-lg-push-* -> order-xl-2
col-md-push-* -> order-lg-2
col-sm-push-* -> order-md-2
col-xs-push-* -> order-2
Diffstat (limited to 'addons/website/static/src/js')
4 files changed, 22 insertions, 22 deletions
diff --git a/addons/website/static/src/js/backend/dashboard.js b/addons/website/static/src/js/backend/dashboard.js index 09881b4ec1b..9ece194ab1e 100644 --- a/addons/website/static/src/js/backend/dashboard.js +++ b/addons/website/static/src/js/backend/dashboard.js @@ -200,7 +200,7 @@ var Dashboard = AbstractAction.extend(ControlPanelMixin, { $analytics_components.empty(); // 1. Authorize component - var $analytics_auth = $('<div>').addClass('col-md-12'); + var $analytics_auth = $('<div>').addClass('col-lg-12'); window.onOriginError = function () { $analytics_components.find('.js_unauthorized_message').remove(); self.display_unauthorized_message($analytics_components, 'not_initialized'); @@ -350,7 +350,7 @@ var Dashboard = AbstractAction.extend(ControlPanelMixin, { $analytics_users.appendTo($analytics_components); // 3. View Selector - var $analytics_view_selector = $('<div>').addClass('col-md-12 o_properties_selection'); + var $analytics_view_selector = $('<div>').addClass('col-lg-12 o_properties_selection'); var viewSelector = new gapi.analytics.ViewSelector({ container: $analytics_view_selector[0], }); @@ -364,7 +364,7 @@ var Dashboard = AbstractAction.extend(ControlPanelMixin, { } else if (this.date_range === 'year') { start_date = '365daysAgo'; } - var $analytics_chart_2 = $('<div>').addClass('col-md-6 col-xs-12'); + var $analytics_chart_2 = $('<div>').addClass('col-lg-6 col-12'); var breakdownChart = new gapi.analytics.googleCharts.DataChart({ query: { 'dimensions': 'ga:date', @@ -384,7 +384,7 @@ var Dashboard = AbstractAction.extend(ControlPanelMixin, { $analytics_chart_2.appendTo($analytics_components); // 5. Chart table - var $analytics_chart_1 = $('<div>').addClass('col-md-6 col-xs-12'); + var $analytics_chart_1 = $('<div>').addClass('col-lg-6 col-12'); var mainChart = new gapi.analytics.googleCharts.DataChart({ query: { 'dimensions': 'ga:medium', diff --git a/addons/website/static/src/js/editor/snippets.options.js b/addons/website/static/src/js/editor/snippets.options.js index 6806d53be23..c71afc1085f 100644 --- a/addons/website/static/src/js/editor/snippets.options.js +++ b/addons/website/static/src/js/editor/snippets.options.js @@ -279,7 +279,7 @@ options.registry.sizing_x = options.registry.sizing.extend({ // Below condition is added to remove offset of target element only // and not its children to avoid design alteration of a container/block. if (options.isCurrent) { - var _class = this.$target.attr('class').replace(/\s*(col-lg-offset-|col-md-offset-)([0-9-]+)/g, ''); + var _class = this.$target.attr('class').replace(/\s*(offset-xl-|offset-lg-)([0-9-]+)/g, ''); this.$target.attr('class', _class); } }, @@ -296,8 +296,8 @@ options.registry.sizing_x = options.registry.sizing.extend({ 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'], + e: [_.map(gridE, function (v) { return 'col-lg-' + v; }), _.map(gridE, function (v) { return width/12*v; }), 'width'], + w: [_.map(gridW, function (v) { return 'offset-lg-' + v; }), _.map(gridW, function (v) { return width/12*v; }), 'margin-left'], }; return this.grid; }, @@ -307,9 +307,9 @@ options.registry.sizing_x = options.registry.sizing.extend({ _onResize: function (compass, beginClass, current) { if (compass === 'w') { // don't change the right border position when we change the offset (replace col size) - var beginCol = Number(beginClass.match(/col-md-([0-9]+)|$/)[1] || 0); - var beginOffset = Number(beginClass.match(/col-md-offset-([0-9-]+)|$/)[1] || beginClass.match(/col-lg-offset-([0-9-]+)|$/)[1] || 0); - var offset = Number(this.grid.w[0][current].match(/col-md-offset-([0-9-]+)|$/)[1] || 0); + var beginCol = Number(beginClass.match(/col-lg-([0-9]+)|$/)[1] || 0); + var beginOffset = Number(beginClass.match(/offset-lg-([0-9-]+)|$/)[1] || beginClass.match(/offset-xl-([0-9-]+)|$/)[1] || 0); + var offset = Number(this.grid.w[0][current].match(/offset-lg-([0-9-]+)|$/)[1] || 0); if (offset < 0) { offset = 0; } @@ -318,11 +318,11 @@ options.registry.sizing_x = options.registry.sizing.extend({ colSize = 1; offset = beginOffset + beginCol - 1; } - this.$target.attr('class',this.$target.attr('class').replace(/\s*(col-lg-offset-|col-md-offset-|col-md-)([0-9-]+)/g, '')); + this.$target.attr('class',this.$target.attr('class').replace(/\s*(offset-xl-|offset-lg-|col-lg-)([0-9-]+)/g, '')); - this.$target.addClass('col-md-' + (colSize > 12 ? 12 : colSize)); + this.$target.addClass('col-lg-' + (colSize > 12 ? 12 : colSize)); if (offset > 0) { - this.$target.addClass('col-md-offset-' + offset); + this.$target.addClass('offset-lg-' + offset); } } this._super.apply(this, arguments); @@ -387,14 +387,14 @@ options.registry.layout_column = options.Class.extend({ var colsLength = $columns.length; var colSize = Math.floor(12 / colsLength) || 1; var colOffset = Math.floor((12 - colSize * colsLength) / 2); - var colClass = 'col-md-' + colSize; + var colClass = 'col-lg-' + colSize; _.each($columns, function (column) { var $column = $(column); - $column.attr('class', $column.attr('class').replace(/\bcol-md-(offset-)?\d+\b/g, '')); + $column.attr('class', $column.attr('class').replace(/\bcol-lg-(offset-)?\d+\b/g, '')); $column.addClass(colClass); }); if (colOffset) { - $columns.first().addClass('col-md-offset-' + colOffset); + $columns.first().addClass('offset-lg-' + colOffset); } }, /** @@ -907,7 +907,7 @@ options.registry.gallery = options.Class.extend({ var imgs = this._getImages(); var $row = $('<div/>', {class: 'row'}); var columns = this._getColumns(); - var colClass = 'col-md-' + (12 / columns); + var colClass = 'col-lg-' + (12 / columns); var $container = this._replaceContent($row); _.each(imgs, function (img, index) { @@ -934,7 +934,7 @@ options.registry.gallery = options.Class.extend({ masonry: function () { var imgs = this._getImages(); var columns = this._getColumns(); - var colClass = 'col-md-' + (12 / columns); + var colClass = 'col-lg-' + (12 / columns); var cols = []; var $row = $('<div/>', {class: 'row'}); @@ -985,9 +985,9 @@ options.registry.gallery = options.Class.extend({ this._replaceContent($row); _.each(imgs, function (img) { - var wrapClass = 'col-md-3'; + var wrapClass = 'col-lg-3'; if (img.width >= img.height * 2 || img.width > 600) { - wrapClass = 'col-md-6'; + wrapClass = 'col-lg-6'; } var $wrap = $('<div/>', {class: wrapClass}).append(img); $row.append($wrap); diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js index 6595f9ba625..378b35f1cdf 100644 --- a/addons/website/static/src/js/menu/content.js +++ b/addons/website/static/src/js/menu/content.js @@ -374,7 +374,7 @@ var MenuEntryDialog = weWidgets.LinkDialog.extend({ this.$('.o_link_dialog_preview').remove(); this.$('input[name="is_new_window"], .link-style').closest('.form-group').remove(); this.$modal.find('.modal-lg').removeClass('modal-lg') - .find('.col-md-8').removeClass('col-md-8').addClass('col-xs-12'); + .find('.col-lg-8').removeClass('col-lg-8').addClass('col-12'); // Adapt URL label this.$('label[for="o_link_dialog_label_input"]').text(_t("Menu Label")); diff --git a/addons/website/static/src/js/menu/new_content.js b/addons/website/static/src/js/menu/new_content.js index c577858f3eb..314ecec51b4 100644 --- a/addons/website/static/src/js/menu/new_content.js +++ b/addons/website/static/src/js/menu/new_content.js @@ -46,7 +46,7 @@ var NewContentMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({ $group.removeClass('mb0'); var $add = $('<div/>', {'class': 'form-group mb0'}) - .append($('<span/>', {'class': 'col-sm-offset-3 col-sm-9 text-left'}) + .append($('<span/>', {'class': 'offset-md-3 col-md-9 text-left'}) .append(qweb.render('web_editor.components.switch', {id: 'switch_addTo_menu', label: _t("Add page in menu")}))); $add.find('input').prop('checked', true); $group.after($add); |
