Merge pull request #209 from antonio-ortega/LPD-20726

LPD-20726 Always set a width to images
liferay · Mar 19, 2024 · 94a2c5d · 94a2c5d
2 parents 92516fe + 9f4745a
commit 94a2c5d
Show file tree

Hide file tree

Showing 39 changed files with 60 additions and 39 deletions.
diff --git a/ckeditor/ckeditor.js b/ckeditor/ckeditor.js
diff --git a/ckeditor/skins/kama/editor.css b/ckeditor/skins/kama/editor.css
diff --git a/ckeditor/skins/kama/editor_ie.css b/ckeditor/skins/kama/editor_ie.css
diff --git a/ckeditor/skins/kama/editor_ie7.css b/ckeditor/skins/kama/editor_ie7.css
diff --git a/ckeditor/skins/kama/editor_ie8.css b/ckeditor/skins/kama/editor_ie8.css
diff --git a/ckeditor/skins/kama/editor_iequirks.css b/ckeditor/skins/kama/editor_iequirks.css
diff --git a/ckeditor/skins/moono-lexicon/editor.css b/ckeditor/skins/moono-lexicon/editor.css
diff --git a/ckeditor/skins/moono-lexicon/editor_gecko.css b/ckeditor/skins/moono-lexicon/editor_gecko.css
diff --git a/ckeditor/skins/moono-lexicon/editor_ie.css b/ckeditor/skins/moono-lexicon/editor_ie.css
diff --git a/ckeditor/skins/moono-lexicon/editor_ie8.css b/ckeditor/skins/moono-lexicon/editor_ie8.css
diff --git a/ckeditor/skins/moono-lexicon/editor_iequirks.css b/ckeditor/skins/moono-lexicon/editor_iequirks.css
diff --git a/ckeditor/skins/moono-lisa/editor.css b/ckeditor/skins/moono-lisa/editor.css
diff --git a/ckeditor/skins/moono-lisa/editor_gecko.css b/ckeditor/skins/moono-lisa/editor_gecko.css
diff --git a/ckeditor/skins/moono-lisa/editor_ie.css b/ckeditor/skins/moono-lisa/editor_ie.css
diff --git a/ckeditor/skins/moono-lisa/editor_ie8.css b/ckeditor/skins/moono-lisa/editor_ie8.css
diff --git a/ckeditor/skins/moono-lisa/editor_iequirks.css b/ckeditor/skins/moono-lisa/editor_iequirks.css
diff --git a/ckeditor/skins/moono/editor.css b/ckeditor/skins/moono/editor.css
diff --git a/ckeditor/skins/moono/editor_gecko.css b/ckeditor/skins/moono/editor_gecko.css
diff --git a/ckeditor/skins/moono/editor_ie.css b/ckeditor/skins/moono/editor_ie.css
diff --git a/ckeditor/skins/moono/editor_ie7.css b/ckeditor/skins/moono/editor_ie7.css
diff --git a/ckeditor/skins/moono/editor_ie8.css b/ckeditor/skins/moono/editor_ie8.css
diff --git a/ckeditor/skins/moono/editor_iequirks.css b/ckeditor/skins/moono/editor_iequirks.css
diff --git a/patches/0001-LPS-89596-Cannot-Drag-Image-from-top-content-line-in.patch b/patches/0001-LPS-89596-Cannot-Drag-Image-from-top-content-line-in.patch
@@ -1,4 +1,4 @@
-From 1ef4515f4817cfb1d6f81e491d3538ce95630d79 Mon Sep 17 00:00:00 2001
+From fc4aab05fb04539c2c288ae930a5a39b33eff5a2 Mon Sep 17 00:00:00 2001
 From: Julien Castelain <julien.castelain@liferay.com>
 Date: Tue, 14 May 2019 10:47:25 +0200
 Subject: [PATCH] LPS-89596 Cannot Drag Image from top content line in IE11

diff --git a/patches/0002-LPS-95472-Tabs-in-popups-not-appears-correctly-in-ma.patch b/patches/0002-LPS-95472-Tabs-in-popups-not-appears-correctly-in-ma.patch
@@ -1,4 +1,4 @@
-From 9db3dbc4aab97cdbbfddea51b105ee43db478c8f Mon Sep 17 00:00:00 2001
+From 8dbf9f02c14c92f99b2f40192e2bf5f56f24f0cf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Roland=20P=C3=A1kai?= <roland.pakai@liferay.com>
 Date: Tue, 21 May 2019 09:38:15 +0200
 Subject: [PATCH] LPS-95472 Tabs in popups not appears correctly in maximized

diff --git a/patches/0003-LPS-85326-Remove-check-for-Webkit-browsers.patch b/patches/0003-LPS-85326-Remove-check-for-Webkit-browsers.patch
@@ -1,4 +1,4 @@
-From 0292ac124a330ac582a75b34756d849af0e7316a Mon Sep 17 00:00:00 2001
+From 6ad86cdfcbb7be834d38acb9d39ebd1bdff28e37 Mon Sep 17 00:00:00 2001
 From: Julien Castelain <julien.castelain@liferay.com>
 Date: Wed, 25 Mar 2020 12:58:15 +0100
 Subject: [PATCH] LPS-85326 Remove check for Webkit browsers

diff --git a/patches/0004-LPP-36989-Remove-obsolete-summary-field-from-table-e.patch b/patches/0004-LPP-36989-Remove-obsolete-summary-field-from-table-e.patch
@@ -1,4 +1,4 @@
-From 942aed4201647d554571d557b806e7475d298cde Mon Sep 17 00:00:00 2001
+From 0d96f16b21036609efbc134ce2c63fbed82e1a8c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Roland=20P=C3=A1kai?= <roland.pakai@liferay.com>
 Date: Tue, 14 Apr 2020 10:15:56 +0200
 Subject: [PATCH] LPP-36989 Remove obsolete summary field from table elements

diff --git a/patches/0005-LPS-112982-Add-additional-resource-URL-parameters.patch b/patches/0005-LPS-112982-Add-additional-resource-URL-parameters.patch
@@ -1,4 +1,4 @@
-From 7983fb718bb9d2d7c29a1880c6d5a31380d2902c Mon Sep 17 00:00:00 2001
+From 21257438b6bb09380711834d3ddcb91cafcf89a9 Mon Sep 17 00:00:00 2001
 From: Julien Castelain <julien.castelain@liferay.com>
 Date: Tue, 7 Jul 2020 09:47:27 +0200
 Subject: [PATCH] LPS-112982 Add additional resource URL parameters

diff --git a/patches/0006-LPS-118624-Don-t-pass-languageId-to-css-files-reques.patch b/patches/0006-LPS-118624-Don-t-pass-languageId-to-css-files-reques.patch
@@ -1,4 +1,4 @@
-From 0677bd02e0e1d60aa7bf6b00d653753c3fead5ce Mon Sep 17 00:00:00 2001
+From 32e8fe78d794d0b01b1de4eecaa51b41cce2038a Mon Sep 17 00:00:00 2001
 From: Carlos Lancha <carlos.lancha@liferay.com>
 Date: Thu, 6 Aug 2020 14:42:21 +0200
 Subject: [PATCH] LPS-118624 Don't pass languageId to css files requests

diff --git a/patches/0007-LPS-124728-Avoid-breaking-IE11.patch b/patches/0007-LPS-124728-Avoid-breaking-IE11.patch
@@ -1,4 +1,4 @@
-From 84d3daa5c9b00fa59ec15978a2c888d93f1a6cda Mon Sep 17 00:00:00 2001
+From 8f89ed6852ace5060193c2354de1063ff0718b0f Mon Sep 17 00:00:00 2001
 From: Julien Castelain <julien.castelain@liferay.com>
 Date: Mon, 21 Dec 2020 09:12:53 +0100
 Subject: [PATCH] LPS-124728 Avoid breaking IE11

diff --git a/patches/0008-LPS-125559-Fix-width-for-the-following-fields-Cell-s.patch b/patches/0008-LPS-125559-Fix-width-for-the-following-fields-Cell-s.patch
@@ -1,4 +1,4 @@
-From 336001359acd4c8bc61419d9039ddef54a75eda0 Mon Sep 17 00:00:00 2001
+From bebcb56bd2fa6c6f0c8f3476205b537732373ac2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Roland=20P=C3=A1kai?= <roland.pakai@liferay.com>
 Date: Fri, 8 Jan 2021 10:58:23 +0100
 Subject: [PATCH] LPS-125559 Fix width for the following fields Cell spacing,

diff --git a/patches/0009-LPS-131699-Add-null-check.patch b/patches/0009-LPS-131699-Add-null-check.patch
@@ -1,4 +1,4 @@
-From af4bb2e9e421ef3d1034f98e369a3e48d0ce5b76 Mon Sep 17 00:00:00 2001
+From 22ca0d2cd1f4101c5d646b72db1abaaf1f30af50 Mon Sep 17 00:00:00 2001
 From: IstvanD <istvan.dezsi@liferay.com>
 Date: Wed, 19 May 2021 17:43:17 +0200
 Subject: [PATCH] LPS-131699 Add null check

diff --git a/patches/0010-LPS-136119-Set-id-on-first-render-instead-of-changin.patch b/patches/0010-LPS-136119-Set-id-on-first-render-instead-of-changin.patch
@@ -1,4 +1,4 @@
-From 7c5adca769384ed6495e28148789c82cc8193f89 Mon Sep 17 00:00:00 2001
+From 01268beea2e88a5a35b4f09de67297d90839161b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= <marko.cikos@liferay.com>
 Date: Mon, 9 Aug 2021 18:04:44 +0200
 Subject: [PATCH] LPS-136119 Set `id` on first render, instead of changing it

diff --git a/patches/0011-LPS-136998-Avoid-breaking-the-UI-in-firefox.patch b/patches/0011-LPS-136998-Avoid-breaking-the-UI-in-firefox.patch
@@ -1,4 +1,4 @@
-From 79917297e641bf5fd3930f7397366d93e5751211 Mon Sep 17 00:00:00 2001
+From f129774cb256801e9eb437d2ae480c6899ea4819 Mon Sep 17 00:00:00 2001
 From: Norbert Nemeth <norbert.nemeth@liferay.com>
 Date: Tue, 17 Aug 2021 11:20:58 +0200
 Subject: [PATCH] LPS-136998 Avoid breaking the UI in firefox

diff --git a/patches/0012-LPS-137425-Don-t-check-selection-on-focus.patch b/patches/0012-LPS-137425-Don-t-check-selection-on-focus.patch
@@ -1,4 +1,4 @@
-From db3a90ffce66ba561e4b944585e0ded441626fb0 Mon Sep 17 00:00:00 2001
+From 4547f1cf7a5e75715f5235cee8973790819f3c1e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= <marko.cikos@liferay.com>
 Date: Mon, 16 Aug 2021 18:36:20 +0200
 Subject: [PATCH] LPS-137425 Don't check selection on focus

diff --git a/patches/0013-LPS-139565-When-upgrading-from-6.2-to-7.1-image-widt.patch b/patches/0013-LPS-139565-When-upgrading-from-6.2-to-7.1-image-widt.patch
@@ -1,4 +1,4 @@
-From 96dc0b60767717079d0d9a1ffa8cae2849f25564 Mon Sep 17 00:00:00 2001
+From 8ea000cb5aa18ceb08f19ac955268c0452b922a8 Mon Sep 17 00:00:00 2001
 From: Minhchau <minhchau.dang@liferay.com>
 Date: Tue, 28 Sep 2021 11:18:40 -0700
 Subject: [PATCH] LPS-139565 When upgrading from 6.2 to 7.1, image width/height

diff --git a/patches/0014-LPS-137763-If-contentsElement-is-defined-use-it-as-a.patch b/patches/0014-LPS-137763-If-contentsElement-is-defined-use-it-as-a.patch
@@ -1,4 +1,4 @@
-From b65cde0db7ad3271b8b6f5be231485d5b362c699 Mon Sep 17 00:00:00 2001
+From 67d247ecc4e95b27d19565ded80a76c8f65c7642 Mon Sep 17 00:00:00 2001
 From: Diego Nascimento <diego.nascimento@liferay.com>
 Date: Mon, 18 Oct 2021 17:45:43 -0300
 Subject: [PATCH] LPS-137763 If contentsElement is defined, use it as a

diff --git a/patches/0015-LPS-166086-Make-dialog-close-button-accessible-with-.patch b/patches/0015-LPS-166086-Make-dialog-close-button-accessible-with-.patch
@@ -1,4 +1,4 @@
-From bc9a890fcb94a4edc0a9aa0f53bcf4ded63f14cb Mon Sep 17 00:00:00 2001
+From a63e02e7619a64f4aca4837dd93c5e2e597eeca6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= <marko.cikos@liferay.com>
 Date: Fri, 21 Oct 2022 15:28:58 +0200
 Subject: [PATCH] LPS-166086 Make dialog close button accessible with keyboard

diff --git a/patches/0016-LPD-19992-Validate-id-and-name-fields-according-to-s.patch b/patches/0016-LPD-19992-Validate-id-and-name-fields-according-to-s.patch
@@ -1,4 +1,4 @@
-From 99941c63a380b2de53182e73a0adb615fcf9618c Mon Sep 17 00:00:00 2001
+From b426b4b037b6bc20d94efeecdb9e0fa669a790c8 Mon Sep 17 00:00:00 2001
 From: Antonio Ortega <60252917@liferay.com>
 Date: Fri, 15 Mar 2024 16:01:20 +0100
 Subject: [PATCH] LPD-19992 Validate id and name fields according to spec

diff --git a/patches/0017-LPD-20726-Always-set-some-width-to-img-container.patch b/patches/0017-LPD-20726-Always-set-some-width-to-img-container.patch
@@ -0,0 +1,21 @@
+From 75d4a9af69bb250569c57ad5e49398d13f6e645e Mon Sep 17 00:00:00 2001
+From: Antonio Ortega <60252917@liferay.com>
+Date: Mon, 18 Mar 2024 15:20:47 +0100
+Subject: [PATCH] LPD-20726 Always set some width to img container
+
+---
+ plugins/image2/plugin.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/image2/plugin.js b/plugins/image2/plugin.js
+index bcf986bad4..c41fdad41c 100644
+--- a/plugins/image2/plugin.js
++++ b/plugins/image2/plugin.js
+@@ -31,6 +31,7 @@
+ 				// wrapper is displayed property.
+ 				'line-height:0' +
+ 			'}' +
++			'.cke_widget_wrapper.cke_widget_image {width: 100%;}' +
+ 			'.cke_editable.cke_image_sw, .cke_editable.cke_image_sw *{cursor:sw-resize !important}' +
+ 			'.cke_editable.cke_image_se, .cke_editable.cke_image_se *{cursor:se-resize !important}' +
+ 			'.cke_image_resizer{' +