diff --git a/app/assets/stylesheets/page_bundles/ide_themes/_dark.scss b/app/assets/stylesheets/page_bundles/ide_themes/_dark.scss index 41f9a8e6db7997154dc8fe16c362f91bc3ac1081..5f31d554c197d62edc3edba3f5671183e574fe08 100644 --- a/app/assets/stylesheets/page_bundles/ide_themes/_dark.scss +++ b/app/assets/stylesheets/page_bundles/ide_themes/_dark.scss @@ -35,6 +35,13 @@ --ide-btn-success-hover-border-width: 2px; --ide-btn-success-focus-box-shadow: 0 0 0 1px #2da160; + // Danger styles should be the same as default styles in dark theme + --ide-btn-danger-secondary-background: var(--ide-btn-default-background); + --ide-btn-danger-secondary-border: var(--ide-btn-default-border); + --ide-btn-danger-secondary-hover-border: var(--ide-btn-default-hover-border); + --ide-btn-danger-secondary-hover-border-width: var(--ide-btn-default-hover-border-width); + --ide-btn-danger-secondary-focus-box-shadow: var(--ide-btn-default-focus-box-shadow); + --ide-btn-disabled-background: transparent; --ide-btn-disabled-border: rgba(223, 223, 223, 0.24); --ide-btn-disabled-hover-border: rgba(223, 223, 223, 0.24); diff --git a/app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss b/app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss index ccb6f7a333bbe292a3cc134a507bf8744e0132f8..83c55310063372be53f9ad5be5a1743bbdd3d359 100644 --- a/app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss +++ b/app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss @@ -35,6 +35,13 @@ --ide-btn-success-hover-border-width: 2px; --ide-btn-success-focus-box-shadow: 0 0 0 1px #2da160; + // Danger styles should be the same as default styles in dark theme + --ide-btn-danger-secondary-background: var(--ide-btn-default-background); + --ide-btn-danger-secondary-border: var(--ide-btn-default-border); + --ide-btn-danger-secondary-hover-border: var(--ide-btn-default-hover-border); + --ide-btn-danger-secondary-hover-border-width: var(--ide-btn-default-hover-border-width); + --ide-btn-danger-secondary-focus-box-shadow: var(--ide-btn-default-focus-box-shadow); + --ide-btn-disabled-background: transparent; --ide-btn-disabled-border: rgba(223, 223, 223, 0.24); --ide-btn-disabled-hover-border: rgba(223, 223, 223, 0.24); diff --git a/changelogs/unreleased/himkp-fix-ide-discard.yml b/changelogs/unreleased/himkp-fix-ide-discard.yml new file mode 100644 index 0000000000000000000000000000000000000000..ead221539ebf0b43d7eeabe642dc4a4c4ff2a8ad --- /dev/null +++ b/changelogs/unreleased/himkp-fix-ide-discard.yml @@ -0,0 +1,5 @@ +--- +title: Fix danger-secondary button in the Web IDE dark theme +merge_request: 45714 +author: +type: fixed