From 42188e42b4eb896d15d520fa23b9bbb33bb421d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 26 Jun 2021 08:12:49 +0200 Subject: [PATCH 1/3] Remove weird padding on stickers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/css/views/messages/_MStickerBody.scss | 4 ---- src/components/views/messages/MStickerBody.js | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/res/css/views/messages/_MStickerBody.scss b/res/css/views/messages/_MStickerBody.scss index 162ee7da86b..d16c37747f3 100644 --- a/res/css/views/messages/_MStickerBody.scss +++ b/res/css/views/messages/_MStickerBody.scss @@ -14,10 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -.mx_MStickerBody_wrapper { - padding: 20px 0px; -} - .mx_MStickerBody_tooltip { position: absolute; top: 50%; diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js index 54eb7649b42..25a5d8fcf92 100644 --- a/src/components/views/messages/MStickerBody.js +++ b/src/components/views/messages/MStickerBody.js @@ -36,7 +36,7 @@ export default class MStickerBody extends MImageBody { if (!this.state.showImage) { onClick = this.onClick; } - return
{ children }
; + return
{ children }
; } // Placeholder to show in place of the sticker image if From 8533e3c6f44081dcea2309a0b2ef47b840c14cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Tue, 8 Feb 2022 07:55:53 +0100 Subject: [PATCH 2/3] Revert "Remove weird padding on stickers" This reverts commit 42188e42b4eb896d15d520fa23b9bbb33bb421d1. --- res/css/views/messages/_MStickerBody.scss | 4 ++++ src/components/views/messages/MStickerBody.tsx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/res/css/views/messages/_MStickerBody.scss b/res/css/views/messages/_MStickerBody.scss index d16c37747f3..162ee7da86b 100644 --- a/res/css/views/messages/_MStickerBody.scss +++ b/res/css/views/messages/_MStickerBody.scss @@ -14,6 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ +.mx_MStickerBody_wrapper { + padding: 20px 0px; +} + .mx_MStickerBody_tooltip { position: absolute; top: 50%; diff --git a/src/components/views/messages/MStickerBody.tsx b/src/components/views/messages/MStickerBody.tsx index 1c2366af60a..8496001f2c2 100644 --- a/src/components/views/messages/MStickerBody.tsx +++ b/src/components/views/messages/MStickerBody.tsx @@ -38,7 +38,7 @@ export default class MStickerBody extends MImageBody { if (!this.state.showImage) { onClick = this.onClick; } - return
{ children }
; + return
{ children }
; } // Placeholder to show in place of the sticker image if From 2572336584a60ad01e59c611e6072d9a3123dd0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Tue, 8 Feb 2022 07:57:49 +0100 Subject: [PATCH 3/3] Change sticker padding to 12 px MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/css/views/messages/_MStickerBody.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/messages/_MStickerBody.scss b/res/css/views/messages/_MStickerBody.scss index 162ee7da86b..165dcd8208c 100644 --- a/res/css/views/messages/_MStickerBody.scss +++ b/res/css/views/messages/_MStickerBody.scss @@ -15,7 +15,7 @@ limitations under the License. */ .mx_MStickerBody_wrapper { - padding: 20px 0px; + padding: 12px 0px; } .mx_MStickerBody_tooltip {