Skip to content

Commit

Permalink
Merge pull request #211 from fortunatomaldonado/LPD-33712
Browse files Browse the repository at this point in the history
LPD-33712 Add css to combopanel when maximized
  • Loading branch information
markocikos committed Aug 23, 2024
2 parents af48244 + 62fe441 commit 6dd0fb9
Show file tree
Hide file tree
Showing 52 changed files with 350 additions and 321 deletions.
2 changes: 1 addition & 1 deletion ckeditor/ckeditor.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

551 changes: 275 additions & 276 deletions ckeditor/plugins/codemirror/vendors/vendors.js

Large diffs are not rendered by default.

Binary file modified ckeditor/plugins/icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ckeditor/plugins/icons_hidpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions ckeditor/plugins/stylescombo/plugin.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor_ie.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor_ie7.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor_ie8.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor_iequirks.css

Large diffs are not rendered by default.

Binary file modified ckeditor/skins/kama/icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ckeditor/skins/kama/icons_hidpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lexicon/editor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lexicon/editor_gecko.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lexicon/editor_ie.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lexicon/editor_ie8.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lexicon/editor_iequirks.css

Large diffs are not rendered by default.

Binary file modified ckeditor/skins/moono-lexicon/icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ckeditor/skins/moono-lexicon/icons_hidpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor_gecko.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor_ie.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor_ie8.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor_iequirks.css

Large diffs are not rendered by default.

Binary file modified ckeditor/skins/moono-lisa/icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ckeditor/skins/moono-lisa/icons_hidpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_gecko.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_ie.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_ie7.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_ie8.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_iequirks.css

Large diffs are not rendered by default.

Binary file modified ckeditor/skins/moono/icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ckeditor/skins/moono/icons_hidpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fc4aab05fb04539c2c288ae930a5a39b33eff5a2 Mon Sep 17 00:00:00 2001
From 4e6a1e754c6d8d9e3b945712e028fa850923ed60 Mon Sep 17 00:00:00 2001
From: Julien Castelain <[email protected]>
Date: Tue, 14 May 2019 10:47:25 +0200
Subject: [PATCH] LPS-89596 Cannot Drag Image from top content line in IE11
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8dbf9f02c14c92f99b2f40192e2bf5f56f24f0cf Mon Sep 17 00:00:00 2001
From d4002ae449caace68634cf32fdab524f7019a70c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20P=C3=A1kai?= <[email protected]>
Date: Tue, 21 May 2019 09:38:15 +0200
Subject: [PATCH] LPS-95472 Tabs in popups not appears correctly in maximized
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6ad86cdfcbb7be834d38acb9d39ebd1bdff28e37 Mon Sep 17 00:00:00 2001
From 5be7f58fa18c42758c3155c09db16eea8b9efeba Mon Sep 17 00:00:00 2001
From: Julien Castelain <[email protected]>
Date: Wed, 25 Mar 2020 12:58:15 +0100
Subject: [PATCH] LPS-85326 Remove check for Webkit browsers
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0d96f16b21036609efbc134ce2c63fbed82e1a8c Mon Sep 17 00:00:00 2001
From 44b9d9c981eca1f1a4c0fdc6cf1a734d61dfec74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20P=C3=A1kai?= <[email protected]>
Date: Tue, 14 Apr 2020 10:15:56 +0200
Subject: [PATCH] LPP-36989 Remove obsolete summary field from table elements
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 21257438b6bb09380711834d3ddcb91cafcf89a9 Mon Sep 17 00:00:00 2001
From 64355688ed5e16681f662e93259fbbf1b68e6a76 Mon Sep 17 00:00:00 2001
From: Julien Castelain <[email protected]>
Date: Tue, 7 Jul 2020 09:47:27 +0200
Subject: [PATCH] LPS-112982 Add additional resource URL parameters
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 32e8fe78d794d0b01b1de4eecaa51b41cce2038a Mon Sep 17 00:00:00 2001
From e235c4c779763e3d6c0b0352fac456cdf0ed8b75 Mon Sep 17 00:00:00 2001
From: Carlos Lancha <[email protected]>
Date: Thu, 6 Aug 2020 14:42:21 +0200
Subject: [PATCH] LPS-118624 Don't pass languageId to css files requests
Expand Down
2 changes: 1 addition & 1 deletion patches/0007-LPS-124728-Avoid-breaking-IE11.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8f89ed6852ace5060193c2354de1063ff0718b0f Mon Sep 17 00:00:00 2001
From f96902e7a7c4e809484f0c4df77e30fc8e52ae42 Mon Sep 17 00:00:00 2001
From: Julien Castelain <[email protected]>
Date: Mon, 21 Dec 2020 09:12:53 +0100
Subject: [PATCH] LPS-124728 Avoid breaking IE11
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From bebcb56bd2fa6c6f0c8f3476205b537732373ac2 Mon Sep 17 00:00:00 2001
From 9620d70679ad4801b6d0c6df0fa8a8126298943c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20P=C3=A1kai?= <[email protected]>
Date: Fri, 8 Jan 2021 10:58:23 +0100
Subject: [PATCH] LPS-125559 Fix width for the following fields Cell spacing,
Expand Down
2 changes: 1 addition & 1 deletion patches/0009-LPS-131699-Add-null-check.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 22ca0d2cd1f4101c5d646b72db1abaaf1f30af50 Mon Sep 17 00:00:00 2001
From 187c4f35ab3672d9b2ef3a01227ca5bb911ff3b0 Mon Sep 17 00:00:00 2001
From: IstvanD <[email protected]>
Date: Wed, 19 May 2021 17:43:17 +0200
Subject: [PATCH] LPS-131699 Add null check
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 01268beea2e88a5a35b4f09de67297d90839161b Mon Sep 17 00:00:00 2001
From 294a7856f4320586d07de518c49a876e2926993c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= <[email protected]>
Date: Mon, 9 Aug 2021 18:04:44 +0200
Subject: [PATCH] LPS-136119 Set `id` on first render, instead of changing it
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f129774cb256801e9eb437d2ae480c6899ea4819 Mon Sep 17 00:00:00 2001
From bf1bd95673b082d7aff200e6e31c429955eff414 Mon Sep 17 00:00:00 2001
From: Norbert Nemeth <[email protected]>
Date: Tue, 17 Aug 2021 11:20:58 +0200
Subject: [PATCH] LPS-136998 Avoid breaking the UI in firefox
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4547f1cf7a5e75715f5235cee8973790819f3c1e Mon Sep 17 00:00:00 2001
From 627b1426e32df71727ca7432638644db084a6781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= <[email protected]>
Date: Mon, 16 Aug 2021 18:36:20 +0200
Subject: [PATCH] LPS-137425 Don't check selection on focus
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8ea000cb5aa18ceb08f19ac955268c0452b922a8 Mon Sep 17 00:00:00 2001
From 4f1e089ff23db77bf14c31581c9e79b41e196caa Mon Sep 17 00:00:00 2001
From: Minhchau <[email protected]>
Date: Tue, 28 Sep 2021 11:18:40 -0700
Subject: [PATCH] LPS-139565 When upgrading from 6.2 to 7.1, image width/height
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 67d247ecc4e95b27d19565ded80a76c8f65c7642 Mon Sep 17 00:00:00 2001
From 4d84016b0f50d006d0c1110e910e5200d14a354f Mon Sep 17 00:00:00 2001
From: Diego Nascimento <[email protected]>
Date: Mon, 18 Oct 2021 17:45:43 -0300
Subject: [PATCH] LPS-137763 If contentsElement is defined, use it as a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a63e02e7619a64f4aca4837dd93c5e2e597eeca6 Mon Sep 17 00:00:00 2001
From 7e0c2aff55d27c80d08a524a7c9eea6e6949c22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= <[email protected]>
Date: Fri, 21 Oct 2022 15:28:58 +0200
Subject: [PATCH] LPS-166086 Make dialog close button accessible with keyboard
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b426b4b037b6bc20d94efeecdb9e0fa669a790c8 Mon Sep 17 00:00:00 2001
From 6c0de704ccbb815f1bb5b42c55a831172ddaba05 Mon Sep 17 00:00:00 2001
From: Antonio Ortega <[email protected]>
Date: Fri, 15 Mar 2024 16:01:20 +0100
Subject: [PATCH] LPD-19992 Validate id and name fields according to spec
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 75d4a9af69bb250569c57ad5e49398d13f6e645e Mon Sep 17 00:00:00 2001
From 7a013b45c52958522de2e10c3f45b79a7173eb4a Mon Sep 17 00:00:00 2001
From: Antonio Ortega <[email protected]>
Date: Mon, 18 Mar 2024 15:20:47 +0100
Subject: [PATCH] LPD-20726 Always set some width to img container
Expand Down
30 changes: 30 additions & 0 deletions patches/0018-LPD-33712-Add-css-to-combopanel-when-maximized.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From a2a9be1ae0a0070e9c1ae71c56d8f6e057dac9c1 Mon Sep 17 00:00:00 2001
From: Fortunato <[email protected]>
Date: Thu, 22 Aug 2024 11:20:50 -0600
Subject: [PATCH] LPD-33712 Add css to combopanel when maximized

---
plugins/stylescombo/plugin.js | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/plugins/stylescombo/plugin.js b/plugins/stylescombo/plugin.js
index 8b2b24d681..21840d5d60 100644
--- a/plugins/stylescombo/plugin.js
+++ b/plugins/stylescombo/plugin.js
@@ -184,6 +184,16 @@

if ( !counter[ CKEDITOR.STYLE_OBJECT ] )
this.hideGroup( lang[ 'panelTitle' + String( CKEDITOR.STYLE_OBJECT ) ] );
+
+ var combopanel = document.querySelector('.cke_panel.cke_combopanel');
+
+ var maximizedEditor = document.querySelector('.cke_inner.cke_maximized');
+
+ if (combopanel && maximizedEditor) {
+ combopanel.classList.add('lfr-maximized');
+ } else {
+ combopanel.classList.remove('lfr-maximized');
+ }
},

refresh: function() {

0 comments on commit 6dd0fb9

Please sign in to comment.