From 4617f665b97d267220e8f1de7f3adcd71a4220c0 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Fri, 21 Nov 2014 18:23:22 +0100 Subject: [FIX] website_editor: smallest pictogram was unselectable. --- addons/website/static/src/js/website.editor.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/website/static/src') diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index a339ea6d63a..addc414b25b 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1785,7 +1785,8 @@ .attr('data-size', size) .addClass(size) .addClass(no_sizes); - if ((size && _.contains(classes, size)) || (classes[2] === "" && !selected)) { + + if ((size && _.contains(classes, size)) || (size === "" && !selected)) { this.$preview.append($p.clone()); this.$('#fa-size').val(size); $p.addClass('font-icons-selected'); -- cgit v1.2.3 From 6f21306dbaf26fd87c208d9473bf8e7c7ab4331b Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 1 Dec 2014 18:23:34 +0100 Subject: [FIX] website: responsive images in table for Firefox only It looks there is a bug in Firefox concerning responsive images in table. See bugzilla https://bugzilla.mozilla.org/show_bug.cgi?id=975632 Bootstrap advises to use width: 100% for .img-responsive as workaround were needed. The @moz-document is to apply this for Mozilla only. opw-617582 opw-618659 --- addons/website/static/src/css/website.css | 5 +++++ addons/website/static/src/css/website.sass | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'addons/website/static/src') diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index e58d2b77262..54faf97838e 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -194,6 +194,11 @@ footer { width: 100%; } +@-moz-document url-prefix() { + .table .img-responsive { + width: 100%; + } +} /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */ .oe_structure.oe_editable.oe_empty:empty, .oe_editable[data-oe-type=html]:empty, .oe_structure.oe_editable.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child { background-image: url("/website/static/src/img/drag_here.png") !important; diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 8f322c517c6..fc11a0c21b7 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -147,6 +147,10 @@ footer float: left width: 100% +@-moz-document url-prefix() + .table .img-responsive + width: 100% + /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */ .oe_structure.oe_editable.oe_empty:empty, .oe_editable[data-oe-type=html]:empty, .oe_structure.oe_editable.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child -- cgit v1.2.3