From 8a5ef4cb3e79fae7cdaac258d75cd1778b5d892e Mon Sep 17 00:00:00 2001 From: Evan Simkowitz Date: Mon, 16 Dec 2024 18:10:06 -0800 Subject: [PATCH] Update button class name so it doesn't conflict with Monaco (#1536) Avoids this: ![image](https://github.com/user-attachments/assets/49b214e4-7dde-4c3a-be5d-0de7afe30dcc) --- frontend/app/block/block.scss | 16 ++++++++-------- frontend/app/element/button.scss | 2 +- frontend/app/element/button.tsx | 2 +- frontend/app/element/iconbutton.scss | 2 +- frontend/app/element/iconbutton.tsx | 2 +- frontend/app/element/menubutton.scss | 2 +- frontend/app/modals/about.scss | 2 +- frontend/app/modals/modal.scss | 2 +- frontend/app/tab/tab.scss | 2 +- frontend/app/tab/updatebanner.scss | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/frontend/app/block/block.scss b/frontend/app/block/block.scss index 9ad0482d6..58a69c26e 100644 --- a/frontend/app/block/block.scss +++ b/frontend/app/block/block.scss @@ -124,9 +124,9 @@ opacity: 0.7; flex-grow: 1; - &.flex-nogrow { - flex-grow: 0; - } + &.flex-nogrow { + flex-grow: 0; + } &.preview-filename { direction: rtl; @@ -166,7 +166,7 @@ flex: 1 2 auto; overflow: hidden; padding-right: 4px; - @include mixins.ellipsis() + @include mixins.ellipsis(); } .connecting-svg { @@ -211,12 +211,12 @@ } } - .button { + .wave-button { margin-left: 3px; } // webview specific. for refresh button - .iconbutton { + .wave-iconbutton { height: 100%; width: 27px; display: flex; @@ -226,7 +226,7 @@ } .menubutton { - .button { + .wave-button { font-size: 11px; } } @@ -373,7 +373,7 @@ } } - .button:last-child { + .wave-button:last-child { margin-top: 1.5px; } } diff --git a/frontend/app/element/button.scss b/frontend/app/element/button.scss index 24a327a43..f547cf991 100644 --- a/frontend/app/element/button.scss +++ b/frontend/app/element/button.scss @@ -3,7 +3,7 @@ @use "../mixins.scss"; -.button { +.wave-button { // override default button appearance border: 1px solid transparent; outline: 1px solid transparent; diff --git a/frontend/app/element/button.tsx b/frontend/app/element/button.tsx index 499bcdb8f..7cf501c86 100644 --- a/frontend/app/element/button.tsx +++ b/frontend/app/element/button.tsx @@ -32,7 +32,7 @@ const Button = memo( diff --git a/frontend/app/element/iconbutton.scss b/frontend/app/element/iconbutton.scss index 2cb4a688b..571a0e4ab 100644 --- a/frontend/app/element/iconbutton.scss +++ b/frontend/app/element/iconbutton.scss @@ -1,4 +1,4 @@ -.iconbutton { +.wave-iconbutton { display: flex; cursor: pointer; opacity: 0.7; diff --git a/frontend/app/element/iconbutton.tsx b/frontend/app/element/iconbutton.tsx index b0a5a794f..85986314e 100644 --- a/frontend/app/element/iconbutton.tsx +++ b/frontend/app/element/iconbutton.tsx @@ -16,7 +16,7 @@ export const IconButton = memo( return (