diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index f7acbcab2419a4acbe08fbe9ede70b7eaf37242c..fbf38c40186a0b931d0322ae6cdcc0d9bb41d319 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -147,14 +147,6 @@ &.btn-danger { @include btn-outline($white, $red-500, $red-500, $red-100, $red-700, $red-500, $red-200, $red-600, $red-800); } - - &.btn-primary { - @include btn-outline($white, $blue-500, $blue-500, $blue-100, $blue-700, $blue-500, $blue-200, $blue-600, $blue-800); - } - } - - &.btn-primary { - @include btn-blue; } &.btn-danger { diff --git a/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss b/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss index 856f7fae975810610e38bfb28624aa6e1ae2803b..34f79f75b9da3e664ca54dc8b12286daf25309d9 100644 --- a/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss +++ b/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss @@ -337,24 +337,6 @@ border-color: var(--ide-dropdown-hover-background, $gray-100) !important; } - // todo: remove this block after all primary/info buttons have been migrated to gl-button - .btn-primary:not(.gl-button) { - background-color: var(--ide-btn-primary-background, $blue-500); - border-color: var(--ide-btn-primary-border, $blue-600) !important; - - &:hover, - &:focus { - background-color: var(--ide-btn-primary-background, $blue-600); - border-color: var(--ide-btn-primary-hover-border, $blue-700) !important; - } - - &:active, - &.active { - background-color: var(--ide-btn-primary-background, $blue-700); - border-color: var(--ide-btn-primary-hover-border, $blue-800) !important; - } - } - // todo: remove this block after all disabled buttons have been migrated to gl-button .btn[disabled]:not(.gl-button) { background-color: var(--ide-btn-default-background, $gray-10) !important; @@ -399,10 +381,6 @@ @include ide-gl-button(default, $white, $gray-50, $gray-100, $gray-200, $gray-300, $gray-300, $gray-400); } - .btn-primary.gl-button.gl-button { - @include ide-gl-button(primary, $blue-500, $blue-600, $blue-800, $blue-600, $blue-800, $blue-800, $blue-900); - } - .btn-danger.btn-danger-secondary.gl-button.gl-button { color: var(--ide-input-color, $red-500); diff --git a/doc/development/testing_guide/frontend_testing.md b/doc/development/testing_guide/frontend_testing.md index 1afa151848713334f99a906a194ae9ce36041261..48e736b5f2d5f5adaa147ee4b8b38d48beaf1d28 100644 --- a/doc/development/testing_guide/frontend_testing.md +++ b/doc/development/testing_guide/frontend_testing.md @@ -228,7 +228,7 @@ it('exists', () => { // Bad wrapper.find({ ref: 'foo'}); wrapper.find('.js-foo'); - wrapper.find('.btn-primary'); + wrapper.find('.gl-button'); }); ```