From 028d4941ab52dab61f2b657a348ba4dff7adfcbd Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 14 Sep 2020 15:32:06 +0200 Subject: [PATCH 1/2] CkEditor export --- customize.dist/ckeditor-contents.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/customize.dist/ckeditor-contents.css b/customize.dist/ckeditor-contents.css index 4d2abae08..000162c00 100644 --- a/customize.dist/ckeditor-contents.css +++ b/customize.dist/ckeditor-contents.css @@ -205,3 +205,11 @@ a > img { .cp-link-clicked a { cursor: pointer; } + +media-tag { + display: inline-block; +} +media-tag * { + width: 100%; + height: 100%; +} From 74b49adae52e583ba67f770c5bf0e7350758d9c5 Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 15 Sep 2020 11:07:03 +0200 Subject: [PATCH 2/2] Fix flexbox issue --- www/common/common-ui-elements.js | 2 +- www/common/inner/share.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 7f9e94423..dc5d054f5 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -418,7 +418,7 @@ define([ var localStore = window.cryptpadStore; localStore.get('hide-alert-teamInvite', function (val) { if (val === '1') { return; } - $(linkWarning).show(); + $(linkWarning).css('display', 'flex'); $(dismissButton).on('click', function () { localStore.put('hide-alert-teamInvite', '1'); diff --git a/www/common/inner/share.js b/www/common/inner/share.js index 457befc22..34b258109 100644 --- a/www/common/inner/share.js +++ b/www/common/inner/share.js @@ -341,7 +341,7 @@ define([ localStore.get('hide-alert-shareLinkWarning', function (val) { if (val === '1') { return; } - $(shareLinkWarning).show(); + $(shareLinkWarning).css('display', 'flex'); $(dismissButton).on('click', function () { localStore.put('hide-alert-shareLinkWarning', '1'); @@ -737,7 +737,7 @@ define([ localStore.get('hide-alert-shareLinkWarning', function (val) { if (val === '1') { return; } - $(shareLinkWarning).show(); + $(shareLinkWarning).css('display', 'flex'); $(dismissButton).on('click', function () { localStore.put('hide-alert-shareLinkWarning', '1');