Rename btn-secondary to btn-default

38 files changed, 49 insertions, 54 deletions

diff --git a/app/assets/javascripts/boards/components/board_new_issue.vue b/app/assets/javascripts/boards/components/board_new_issue.vue
index 6b5b5fef157..e8dfd95f7ae 100644
--- a/app/assets/javascripts/boards/components/board_new_issue.vue
+++ b/app/assets/javascripts/boards/components/board_new_issue.vue
@@ -130,7 +130,7 @@ export default {
             Submit issue
           </button>
           <button
-            class="btn btn-secondary float-right"
+            class="btn btn-default float-right"
             type="button"
             @click="cancel"
           >
diff --git a/app/assets/javascripts/deploy_keys/components/action_btn.vue b/app/assets/javascripts/deploy_keys/components/action_btn.vue
index 42ab0b67d11..67dda0e29cb 100644
--- a/app/assets/javascripts/deploy_keys/components/action_btn.vue
+++ b/app/assets/javascripts/deploy_keys/components/action_btn.vue
@@ -18,7 +18,7 @@ export default {
     btnCssClass: {
       type: String,
       required: false,
-      default: 'btn-secondary',
+      default: 'btn-default',
     },
   },
   data() {
diff --git a/app/assets/javascripts/environments/components/environment_actions.vue b/app/assets/javascripts/environments/components/environment_actions.vue
index 4584897a117..0b3fef9fcca 100644
--- a/app/assets/javascripts/environments/components/environment_actions.vue
+++ b/app/assets/javascripts/environments/components/environment_actions.vue
@@ -53,7 +53,7 @@
     <button
       v-tooltip
       type="button"
-      class="dropdown btn btn-secondary dropdown-new js-dropdown-play-icon-container"
+      class="dropdown btn btn-default dropdown-new js-dropdown-play-icon-container"
       data-container="body"
       data-toggle="dropdown"
       :title="title"
diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue
index e48601882fc..22863e926d4 100644
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@@ -117,7 +117,7 @@ export default {
             <div class="text-center prepend-top-10">
               <a
                 :href="folderUrl(model)"
-                class="btn btn-secondary"
+                class="btn btn-default"
               >
                 {{ s__("Environments|Show all") }}
               </a>
diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue
index b278b1fd84b..f0b29702497 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/index.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue
@@ -62,7 +62,7 @@ export default {
     >
       <button
         type="button"
-        class="btn btn-sm btn-secondary dropdown-toggle add-to-tree"
+        class="btn btn-sm btn-default dropdown-toggle add-to-tree"
         aria-label="Create new file or directory"
         @click.stop="openDropdown()"
       >
diff --git a/app/assets/javascripts/issue_show/components/edit_actions.vue b/app/assets/javascripts/issue_show/components/edit_actions.vue
index cf80422d59b..7ef5e679881 100644
--- a/app/assets/javascripts/issue_show/components/edit_actions.vue
+++ b/app/assets/javascripts/issue_show/components/edit_actions.vue
@@ -64,7 +64,7 @@
       </i>
     </button>
     <button
-      class="btn btn-secondary float-right"
+      class="btn btn-default float-right"
       type="button"
       @click="closeForm">
       Cancel
diff --git a/app/assets/javascripts/issue_show/components/title.vue b/app/assets/javascripts/issue_show/components/title.vue
index faaeaab2f35..aec890a2ff6 100644
--- a/app/assets/javascripts/issue_show/components/title.vue
+++ b/app/assets/javascripts/issue_show/components/title.vue
@@ -79,7 +79,7 @@
       v-tooltip
       v-if="showInlineEditButton && canUpdate"
       type="button"
-      class="btn btn-secondary btn-edit btn-svg js-issuable-edit"
+      class="btn btn-default btn-edit btn-svg js-issuable-edit"
       v-html="pencilIcon"
       title="Edit title and description"
       data-placement="bottom"
diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue
index 50a35b96c59..82fec7e936b 100644
--- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue
+++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue
@@ -212,7 +212,7 @@ export default {
           class="btn-group prepend-top-5"
           role="group">
           <a
-            class="js-cancel-job btn btn-sm btn-secondary"
+            class="js-cancel-job btn btn-sm btn-default"
             :href="job.cancel_path"
             data-method="post"
             rel="nofollow"
diff --git a/app/assets/javascripts/notes/components/diff_file_header.vue b/app/assets/javascripts/notes/components/diff_file_header.vue
index 492c4804928..94d9dc69964 100644
--- a/app/assets/javascripts/notes/components/diff_file_header.vue
+++ b/app/assets/javascripts/notes/components/diff_file_header.vue
@@ -35,7 +35,7 @@ export default {
         <clipboard-button
           title="Copy file path to clipboard"
           :text="diffFile.submoduleLink"
-          css-class="btn-secondary btn-transparent btn-clipboard"
+          css-class="btn-default btn-transparent btn-clipboard"
         />
       </span>
     </div>
@@ -80,7 +80,7 @@ export default {
       <clipboard-button
         title="Copy file path to clipboard"
         :text="diffFile.filePath"
-        css-class="btn-secondary btn-transparent btn-clipboard"
+        css-class="btn-default btn-transparent btn-clipboard"
       />
 
       <small
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue
index a6d5adaff12..cbe4774a360 100644
--- a/app/assets/javascripts/notes/components/discussion_counter.vue
+++ b/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -99,7 +99,7 @@ export default {
           v-tooltip
           title="Resolve all discussions in new issue"
           data-container="body"
-          class="new-issue-for-discussion btn btn-secondary discussion-create-issue-btn">
+          class="new-issue-for-discussion btn btn-default discussion-create-issue-btn">
           <span v-html="mrIssueSvg"></span>
         </a>
       </div>
@@ -112,7 +112,7 @@ export default {
           v-tooltip
           title="Jump to first unresolved discussion"
           data-container="body"
-          class="btn btn-secondary discussion-next-btn">
+          class="btn btn-default discussion-next-btn">
           <span v-html="nextDiscussionSvg"></span>
         </button>
       </div>
diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue
index d03743a1b63..c59a2e7a406 100644
--- a/app/assets/javascripts/notes/components/note_form.vue
+++ b/app/assets/javascripts/notes/components/note_form.vue
@@ -191,7 +191,7 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea"
         <button
           v-if="note.resolvable"
           @click.prevent="handleUpdate(true)"
-          class="btn btn-nr btn-secondary append-right-10 js-comment-resolve-button"
+          class="btn btn-nr btn-default append-right-10 js-comment-resolve-button"
         >
           {{ resolveButtonTitle }}
         </button>
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index 7b9ff2b14f1..7f5aacaa3a2 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -281,7 +281,7 @@ Please check your network connection and try again.`;
                         <button
                           @click="resolveHandler()"
                           type="button"
-                          class="btn btn-secondary"
+                          class="btn btn-default"
                         >
                           <i
                             v-if="isResolving"
@@ -304,7 +304,7 @@ Please check your network connection and try again.`;
                             :href="note.resolve_with_issue_path"
                             v-tooltip
                             class="new-issue-for-discussion btn
-                              btn-secondary discussion-create-issue-btn"
+                              btn-default discussion-create-issue-btn"
                             title="Resolve this discussion in a new issue"
                             data-container="body"
                           >
@@ -318,7 +318,7 @@ Please check your network connection and try again.`;
                           <button
                             @click="jumpToDiscussion"
                             v-tooltip
-                            class="btn btn-secondary discussion-next-btn"
+                            class="btn btn-default discussion-next-btn"
                             title="Jump to next unresolved discussion"
                             data-container="body"
                           >
diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue
index 5edbec08975..77508e62cef 100644
--- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue
+++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue
@@ -34,7 +34,7 @@
     <div class="bordered-box landing content-block">
       <button
         id="dismiss-callout-btn"
-        class="btn btn-secondary close"
+        class="btn btn-default close"
         @click="dismissCallout">
         <i
           aria-hidden="true"
diff --git a/app/assets/javascripts/pipelines/components/nav_controls.vue b/app/assets/javascripts/pipelines/components/nav_controls.vue
index 944c3fbefbc..eba5678e3e5 100644
--- a/app/assets/javascripts/pipelines/components/nav_controls.vue
+++ b/app/assets/javascripts/pipelines/components/nav_controls.vue
@@ -52,14 +52,14 @@
       v-if="resetCachePath"
       @click="onClickResetCache"
       :loading="isResetCacheButtonLoading"
-      class="btn btn-secondary js-clear-cache"
+      class="btn btn-default js-clear-cache"
       :label="s__('Pipelines|Clear Runner Caches')"
     />
 
     <a
       v-if="ciLintPath"
       :href="ciLintPath"
-      class="btn btn-secondary js-ci-lint"
+      class="btn btn-default js-ci-lint"
     >
       {{ s__('Pipelines|CI Lint') }}
     </a>
diff --git a/app/assets/javascripts/pipelines/components/pipelines_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_actions.vue
index 56cac290b81..e9bc3cf14ca 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_actions.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_actions.vue
@@ -45,7 +45,7 @@
     <button
       v-tooltip
       type="button"
-      class="dropdown-new btn btn-secondary js-pipeline-dropdown-manual-actions"
+      class="dropdown-new btn btn-default js-pipeline-dropdown-manual-actions"
       title="Manual job"
       data-toggle="dropdown"
       data-placement="top"
diff --git a/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue b/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
index 57227324b42..31fcc9dd412 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
@@ -24,7 +24,7 @@
   >
     <button
       v-tooltip
-      class="dropdown-toggle btn btn-secondary build-artifacts js-pipeline-dropdown-download"
+      class="dropdown-toggle btn btn-default build-artifacts js-pipeline-dropdown-download"
       title="Artifacts"
       data-placement="top"
       data-toggle="dropdown"
diff --git a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
index 8f65ec75992..0dcda8a2234 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
@@ -303,7 +303,7 @@
         <async-button-component
           v-if="pipeline.flags.retryable"
           :endpoint="pipeline.retry_path"
-          css-class="js-pipelines-retry-button btn-secondary btn-retry"
+          css-class="js-pipelines-retry-button btn-default btn-retry"
           title="Retry"
           icon="repeat"
           :pipeline-id="pipeline.id"
diff --git a/app/assets/javascripts/registry/components/collapsible_container.vue b/app/assets/javascripts/registry/components/collapsible_container.vue
index 3028df300c5..fc65f1a714e 100644
--- a/app/assets/javascripts/registry/components/collapsible_container.vue
+++ b/app/assets/javascripts/registry/components/collapsible_container.vue
@@ -86,7 +86,7 @@
         v-if="repo.location"
         :text="clipboardText"
         :title="repo.location"
-        css-class="btn-secondary btn-transparent btn-clipboard"
+        css-class="btn-default btn-transparent btn-clipboard"
       />
 
       <div class="controls d-none d-sm-block float-right">
diff --git a/app/assets/javascripts/registry/components/table_registry.vue b/app/assets/javascripts/registry/components/table_registry.vue
index b2f0e3bf314..90f2493724d 100644
--- a/app/assets/javascripts/registry/components/table_registry.vue
+++ b/app/assets/javascripts/registry/components/table_registry.vue
@@ -90,7 +90,7 @@
               v-if="item.location"
               :title="item.location"
               :text="clipboardText(item.location)"
-              css-class="btn-secondary btn-transparent btn-clipboard"
+              css-class="btn-default btn-transparent btn-clipboard"
             />
           </td>
           <td>
diff --git a/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue b/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue
index 79ebf04fe25..38b1ddbfd5b 100644
--- a/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue
+++ b/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue
@@ -38,7 +38,7 @@ export default {
   <div class="sidebar-item-warning-message-actions">
     <button
       type="button"
-      class="btn btn-secondary append-right-10"
+      class="btn btn-default append-right-10"
       @click="closeForm"
     >
       {{ __('Cancel') }}
diff --git a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue
index 2fe4c1d4208..5e7b8f9698f 100644
--- a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue
+++ b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue
@@ -42,7 +42,7 @@ export default {
   <div class="sidebar-item-warning-message-actions">
     <button
       type="button"
-      class="btn btn-secondary append-right-10"
+      class="btn btn-default append-right-10"
       @click="closeForm"
     >
       {{ __('Cancel') }}
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
index 9fbcfa89b68..7bc13d428a8 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
@@ -127,7 +127,7 @@ export default {
           </span>
           <loading-button
             v-if="deployment.stop_url"
-            container-class="btn btn-secondary btn-sm prepend-left-default"
+            container-class="btn btn-default btn-sm prepend-left-default"
             label="Stop environment"
             :loading="isStopping"
             @click="stopEnvironment"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
index e02cdf6c6e5..51a0fda6555 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
@@ -71,7 +71,7 @@ export default {
         <clipboard-button
           :text="branchNameClipboardData"
           :title="__('Copy branch name to clipboard')"
-          css-class="btn-secondary btn-transparent btn-clipboard"
+          css-class="btn-default btn-transparent btn-clipboard"
         />
 
         {{ s__("mrWidget|into") }}
@@ -103,7 +103,7 @@ export default {
       <a
         v-if="!mr.sourceBranchRemoved"
         :href="webIdePath"
-        class="btn btn-sm btn-secondary inline js-web-ide"
+        class="btn btn-sm btn-default inline js-web-ide"
       >
         {{ s__("mrWidget|Web IDE") }}
       </a>
@@ -111,7 +111,7 @@ export default {
         data-target="#modal_merge_info"
         data-toggle="modal"
         :disabled="mr.sourceBranchRemoved"
-        class="btn btn-sm btn-secondary inline js-check-out-branch"
+        class="btn btn-sm btn-default inline js-check-out-branch"
         type="button"
       >
         {{ s__("mrWidget|Check out branch") }}
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue
index 2e6871b3c8a..b404a592234 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue
@@ -42,7 +42,7 @@
         @click="refreshWidget"
         :disabled="isRefreshing"
         type="button"
-        class="btn btn-sm btn-secondary"
+        class="btn btn-sm btn-default"
       >
         <loading-icon
           v-if="isRefreshing"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
index 4a818e967a9..5c1500ab801 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
@@ -43,13 +43,13 @@ To merge this request, first rebase locally.`) }}
         <a
           v-if="mr.canMerge && mr.conflictResolutionPath"
           :href="mr.conflictResolutionPath"
-          class="js-resolve-conflicts-button btn btn-secondary btn-sm"
+          class="js-resolve-conflicts-button btn btn-default btn-sm"
         >
           {{ s__("mrWidget|Resolve conflicts") }}
         </a>
         <button
           v-if="mr.canMerge"
-          class="js-merge-locally-button btn btn-secondary btn-sm"
+          class="js-merge-locally-button btn btn-default btn-sm"
           data-toggle="modal"
           data-target="#modal_merge_info"
         >
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
index 8f4022846f1..05fecd4de35 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
@@ -98,7 +98,7 @@ export default {
         </span>
         <button
           @click="refresh"
-          class="btn btn-secondary btn-sm js-refresh-button"
+          class="btn btn-default btn-sm js-refresh-button"
           type="button"
         >
           {{ s__("mrWidget|Refresh now") }}
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
index 0abbe711be6..231e0536b5f 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
@@ -94,7 +94,7 @@
           :disabled="isCancellingAutoMerge"
           role="button"
           href="#"
-          class="btn btn-sm btn-secondary js-cancel-auto-merge">
+          class="btn btn-sm btn-default js-cancel-auto-merge">
           <i
             v-if="isCancellingAutoMerge"
             class="fa fa-spinner fa-spin"
@@ -129,7 +129,7 @@
             :disabled="isRemovingSourceBranch"
             @click.prevent="removeSourceBranch"
             role="button"
-            class="btn btn-sm btn-secondary js-remove-source-branch"
+            class="btn btn-sm btn-default js-remove-source-branch"
             href="#"
           >
             <i
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
index 96b50b034ea..8c7e0664559 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
@@ -139,7 +139,7 @@
         <a
           v-if="mr.canCherryPickInCurrentMR"
           v-tooltip
-          class="btn btn-secondary btn-sm"
+          class="btn btn-default btn-sm"
           href="#modal-cherry-pick-commit"
           data-toggle="modal"
           data-container="body"
@@ -150,7 +150,7 @@
         <a
           v-else-if="mr.cherryPickInForkPath"
           v-tooltip
-          class="btn btn-secondary btn-sm"
+          class="btn btn-default btn-sm"
           data-method="post"
           :href="mr.cherryPickInForkPath"
           :title="cherryPickTitle"
@@ -189,7 +189,7 @@
             @click="removeSourceBranch"
             :disabled="isMakingRequest"
             type="button"
-            class="btn btn-sm btn-secondary js-remove-branch-button"
+            class="btn btn-sm btn-default js-remove-branch-button"
           >
             {{ s__("mrWidget|Remove Source Branch") }}
           </button>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
index b9305b8f741..8ea3f22ecc2 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
@@ -28,7 +28,7 @@ export default {
       <a
         v-if="mr.createIssueToResolveDiscussionsPath"
         :href="mr.createIssueToResolveDiscussionsPath"
-        class="btn btn-secondary btn-sm js-create-issue"
+        class="btn btn-default btn-sm js-create-issue"
       >
         {{ s__("mrWidget|Create an issue to resolve them later") }}
       </a>
diff --git a/app/assets/javascripts/vue_shared/components/clipboard_button.vue b/app/assets/javascripts/vue_shared/components/clipboard_button.vue
index 901c349cdcb..cb2cc3901ad 100644
--- a/app/assets/javascripts/vue_shared/components/clipboard_button.vue
+++ b/app/assets/javascripts/vue_shared/components/clipboard_button.vue
@@ -41,7 +41,7 @@ export default {
     cssClass: {
       type: String,
       required: false,
-      default: 'btn-secondary',
+      default: 'btn-default',
     },
   },
 };
diff --git a/app/assets/javascripts/vue_shared/components/header_ci_component.vue b/app/assets/javascripts/vue_shared/components/header_ci_component.vue
index 474be04db31..ca17fa06a00 100644
--- a/app/assets/javascripts/vue_shared/components/header_ci_component.vue
+++ b/app/assets/javascripts/vue_shared/components/header_ci_component.vue
@@ -163,7 +163,7 @@ export default {
       <button
         v-if="hasSidebarButton"
         type="button"
-        class="btn btn-secondary d-block d-sm-none d-md-none
+        class="btn btn-default d-block d-sm-none d-md-none
 sidebar-toggle-btn js-sidebar-build-toggle js-sidebar-build-toggle-header"
         aria-label="Toggle Sidebar"
         id="toggleSidebar"
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
index 49a7a8a4915..d63318f3da6 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
@@ -111,7 +111,7 @@
         Attach a file
       </button>
       <button
-        class="btn btn-secondary btn-sm hide button-cancel-uploading-files"
+        class="btn btn-default btn-sm hide button-cancel-uploading-files"
         type="button"
       >
         Cancel
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue
index 253d6b13230..3c400afdc1d 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue
@@ -83,7 +83,7 @@ export default {
         </button>
         <button
           type="button"
-          class="btn btn-secondary float-right js-cancel-label-btn"
+          class="btn btn-default float-right js-cancel-label-btn"
         >
           {{ __('Cancel') }}
         </button>
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index c55260c7b06..0115f542c88 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -253,11 +253,6 @@
   }
 }
 
-.btn-secondary {
-  // btn-default has been renamed btn-secondary; need to change all instances of btn-default
-  @include btn-default;
-}
-
 .btn-terminal {
   svg {
     height: 14px;
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 6f09d949a51..3b037d066dc 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -266,7 +266,7 @@
   .discussion-actions {
     display: table;
 
-    .btn-secondary path {
+    .btn-default path {
       fill: $gray-darkest;
     }
 
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 15e26033197..f7a4a574595 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -37,7 +37,7 @@
     .pipeline-actions {
       min-width: 170px; //Guarantees buttons don't break in several lines.
 
-      .btn-secondary {
+      .btn-default {
         color: $gl-text-color-secondary;
       }
 
@@ -68,7 +68,7 @@
 
       .btn-group {
         &.open {
-          .btn-secondary {
+          .btn-default {
             background-color: $white-normal;
             border-color: $border-white-normal;
           }
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 68add42a637..a6d5d9b1459 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -64,7 +64,7 @@
     }
 
     + .select2 a,
-    + .btn-secondary {
+    + .btn-default {
       border-radius: 0 $border-radius-base $border-radius-base 0;
     }
   }
diff --git a/app/assets/stylesheets/pages/runners.scss b/app/assets/stylesheets/pages/runners.scss
index ecb5219994d..2734faec558 100644
--- a/app/assets/stylesheets/pages/runners.scss
+++ b/app/assets/stylesheets/pages/runners.scss
@@ -41,7 +41,7 @@
     padding: 4px 9px;
   }
 
-  .btn-secondary {
+  .btn-default {
     color: $gl-text-color-secondary;
   }