BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Unverified Commit bed783ac by Annabel Dunstone Gray
Options

Rename btn-secondary to btn-default

parent e42f7e2a
Showing with 141 additions and 146 deletions
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"
>
......
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() {
......
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"
......
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>
......
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()"
>
......
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
......
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"
......
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"
......
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
......
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>
......
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>
......
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"
>
......
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"
......
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>
......
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"
......
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"
......
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"
......
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">
......
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>
......
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') }}
......
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') }}
......
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"
......
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") }}
......
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"
......
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"
>
......
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") }}
......
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
......
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>
......
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>
......
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',
},
},
};
......
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"
......
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
......
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>
......
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;
......
app/assets/stylesheets/pages/note_form.scss
......@@ -266,7 +266,7 @@
.discussion-actions {
display: table;
.btn-secondary path {
.btn-default path {
fill: $gray-darkest;
}
......
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;
}
......
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;
}
}
......
app/assets/stylesheets/pages/runners.scss
......@@ -41,7 +41,7 @@
padding: 4px 9px;
}
.btn-secondary {
.btn-default {
color: $gl-text-color-secondary;
}
......
app/views/admin/conversational_development_index/_callout.html.haml
.prepend-top-default
.user-callout{ data: { uid: 'convdev_intro_callout_dismissed' } }
.bordered-box.landing.content-block
%button.btn.btn-secondary.close.js-close-callout{ type: 'button',
%button.btn.btn-default.close.js-close-callout{ type: 'button',
'aria-label' => 'Dismiss ConvDev introduction' }
= icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true')
.user-callout-copy
......
app/views/admin/health_check/_failing_storages.html.haml
......@@ -12,4 +12,4 @@
= _("Access to failing storages has been temporarily disabled to allow the mount to recover. Reset storage information after the issue has been resolved to allow access again.")
.prepend-top-10
= button_to _("Reset git storage health information"), reset_storage_health_admin_health_check_path,
method: :post, class: 'btn btn-secondary'
method: :post, class: 'btn btn-default'
app/views/admin/health_check/show.html.haml
......@@ -11,7 +11,7 @@
%code#health-check-token= Gitlab::CurrentSettings.health_check_access_token
.prepend-top-10
= button_to _("Reset health check access token"), reset_health_check_token_admin_application_settings_path,
method: :put, class: 'btn btn-secondary',
method: :put, class: 'btn btn-default',
data: { confirm: _('Are you sure you want to reset the health check token?') }
%p.light
#{ _('Health information can be retrieved from the following endpoints. More information is available') }
......
app/views/admin/hook_logs/show.html.haml
......@@ -4,7 +4,7 @@
%hr
= link_to 'Resend Request', retry_admin_hook_hook_log_path(@hook, @hook_log), class: "btn btn-secondary float-right prepend-left-10"
= link_to 'Resend Request', retry_admin_hook_hook_log_path(@hook, @hook_log), class: "btn btn-default float-right prepend-left-10"
= render partial: 'shared/hook_logs/content', locals: { hook_log: @hook_log }
app/views/admin/runners/_runner.html.haml
......@@ -38,14 +38,14 @@
Never
%td.admin-runner-btn-group-cell
.float-right.btn-group
= link_to admin_runner_path(runner), class: 'btn btn-sm btn-secondary has-tooltip', title: 'Edit', ref: 'tooltip', aria: { label: 'Edit' }, data: { placement: 'top', container: 'body'} do
= link_to admin_runner_path(runner), class: 'btn btn-sm btn-default has-tooltip', title: 'Edit', ref: 'tooltip', aria: { label: 'Edit' }, data: { placement: 'top', container: 'body'} do
= icon('pencil')
&nbsp;
- if runner.active?
= link_to [:pause, :admin, runner], method: :get, class: 'btn btn-sm btn-secondary has-tooltip', title: 'Pause', ref: 'tooltip', aria: { label: 'Pause' }, data: { placement: 'top', container: 'body', confirm: "Are you sure?" } do
= link_to [:pause, :admin, runner], method: :get, class: 'btn btn-sm btn-default has-tooltip', title: 'Pause', ref: 'tooltip', aria: { label: 'Pause' }, data: { placement: 'top', container: 'body', confirm: "Are you sure?" } do
= icon('pause')
- else
= link_to [:resume, :admin, runner], method: :get, class: 'btn btn-secondary btn-sm has-tooltip', title: 'Resume', ref: 'tooltip', aria: { label: 'Resume' }, data: { placement: 'top', container: 'body'} do
= link_to [:resume, :admin, runner], method: :get, class: 'btn btn-default btn-sm has-tooltip', title: 'Resume', ref: 'tooltip', aria: { label: 'Resume' }, data: { placement: 'top', container: 'body'} do
= icon('play')
= link_to [:admin, runner], method: :delete, class: 'btn btn-danger btn-sm has-tooltip', title: 'Remove', ref: 'tooltip', aria: { label: 'Remove' }, data: { placement: 'top', container: 'body', confirm: "Are you sure?" } do
= icon('remove')
app/views/admin/runners/index.html.haml
......@@ -35,7 +35,7 @@
You can reset runners registration token by pressing a button below.
.prepend-top-10
= button_to _("Reset runners registration token"), reset_runners_token_admin_application_settings_path,
method: :put, class: 'btn btn-secondary',
method: :put, class: 'btn btn-default',
data: { confirm: _("Are you sure you want to reset registration token?") }
= render partial: 'ci/runner/how_to_setup_shared_runner',
......
app/views/admin/users/_user.html.haml
......@@ -18,7 +18,7 @@
= link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: 'btn'
- unless user == current_user
.dropdown.inline
%a.dropdown-new.btn.btn-secondary#project-settings-button{ href: '#', data: { toggle: 'dropdown' } }
%a.dropdown-new.btn.btn-default#project-settings-button{ href: '#', data: { toggle: 'dropdown' } }
= icon('cog')
= icon('caret-down')
%ul.dropdown-menu.dropdown-menu-right
......
app/views/discussions/_jump_to_next.html.haml
......@@ -2,7 +2,7 @@
- if current_user
%jump-to-discussion{ "inline-template" => true, ":discussion-id" => "'#{discussion.try(:id)}'" }
.btn-group{ role: "group", "v-show" => "!allResolved", "v-if" => "showButton" }
%button.btn.btn-secondary.discussion-next-btn.has-tooltip{ "@click" => "jumpToNextUnresolvedDiscussion",
%button.btn.btn-default.discussion-next-btn.has-tooltip{ "@click" => "jumpToNextUnresolvedDiscussion",
":title" => "buttonText",
":aria-label" => "buttonText",
data: { container: "body" } }
......
app/views/discussions/_new_issue_for_all_discussions.html.haml
......@@ -5,4 +5,4 @@
title: 'Resolve all discussions in new issue',
aria: { label: 'Resolve all discussions in new issue' },
data: { container: 'body' },
class: 'new-issue-for-discussion btn btn-secondary discussion-create-issue-btn has-tooltip'
class: 'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip'
app/views/discussions/_new_issue_for_discussion.html.haml
......@@ -7,4 +7,4 @@
title: 'Resolve this discussion in a new issue',
aria: { label: 'Resolve this discussion in a new issue' },
data: { container: 'body' },
class: 'new-issue-for-discussion btn btn-secondary discussion-create-issue-btn has-tooltip'
class: 'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip'
app/views/discussions/_resolve_all.html.haml
......@@ -3,6 +3,6 @@
":can-resolve" => discussion.can_resolve?(current_user),
"inline-template" => true }
.btn-group{ role: "group", "v-if" => "showButton" }
%button.btn.btn-secondary{ type: "button", "@click" => "resolve", ":disabled" => "loading", "v-cloak" => "true" }
%button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading", "v-cloak" => "true" }
= icon("spinner spin", "v-show" => "loading")
{{ buttonText }}
app/views/help/ui.html.haml
......@@ -205,7 +205,7 @@
%h2#buttons Buttons
.example
%button.btn.btn-secondary{ :type => "button" } Secondary
%button.btn.btn-default{ :type => "button" } Secondary
%button.btn.btn-primary{ :type => "button" } Primary
%button.btn.btn-success{ :type => "button" } Success
%button.btn.btn-info{ :type => "button" } Info
......@@ -477,7 +477,7 @@
Remember me
.form-group.row
.offset-sm-2.col-sm-10
%button.btn.btn-secondary{ :type => "submit" } Sign in
%button.btn.btn-default{ :type => "submit" } Sign in
.lead
Form when label rendered above input
......@@ -495,7 +495,7 @@
%label
%input{ :type => "checkbox" }/
Remember me
%button.btn.btn-secondary{ :type => "submit" } Sign in
%button.btn.btn-default{ :type => "submit" } Sign in
%h2#file File
%h4
......
app/views/projects/_export.html.haml
......@@ -33,9 +33,9 @@
Once the exported file is ready, you will receive a notification email with a download link, or you can download it from this page.
- if project.export_project_path
= link_to 'Download export', download_export_project_path(project),
rel: 'nofollow', download: '', method: :get, class: "btn btn-secondary"
rel: 'nofollow', download: '', method: :get, class: "btn btn-default"
= link_to 'Generate new export', generate_new_export_project_path(project),
method: :post, class: "btn btn-secondary"
method: :post, class: "btn btn-default"
- else
= link_to 'Export project', export_project_path(project),
method: :post, class: "btn btn-secondary"
method: :post, class: "btn btn-default"
app/views/projects/_project_templates.html.haml
......@@ -7,7 +7,7 @@
%label.btn.btn-success.template-button.choose-template.append-right-10{ for: template.name }
%input{ type: "radio", autocomplete: "off", name: "project[template_name]", id: template.name, value: template.name }
%span Use template
%a.btn.btn-secondary{ href: template.preview, rel: 'noopener noreferrer', target: '_blank' } Preview
%a.btn.btn-default{ href: template.preview, rel: 'noopener noreferrer', target: '_blank' } Preview
.project-fields-form
.form-group
......@@ -20,6 +20,6 @@
- Gitlab::ProjectTemplate.all.each do |template|
= custom_icon(template.logo)
.selected-template
%button.btn.btn-secondary.change-template{ type: "button" } Change template
%button.btn.btn-default.change-template{ type: "button" } Change template
= render 'new_project_fields', f: f, project_name_id: "template-project-name"
app/views/projects/artifacts/browse.html.haml
......@@ -17,7 +17,7 @@
.tree-controls
= link_to download_project_job_artifacts_path(@project, @build),
rel: 'nofollow', download: '', class: 'btn btn-secondary download' do
rel: 'nofollow', download: '', class: 'btn btn-default download' do
= sprite_icon('download')
Download artifacts archive
......
app/views/projects/blob/_viewer_switcher.html.haml
......@@ -4,9 +4,9 @@
.btn-group.js-blob-viewer-switcher{ role: "group" }
- simple_label = "Display #{simple_viewer.switcher_title}"
%button.btn.btn-secondary.btn-sm.js-blob-viewer-switch-btn.has-tooltip{ 'aria-label' => simple_label, title: simple_label, data: { viewer: 'simple', container: 'body' } }>
%button.btn.btn-default.btn-sm.js-blob-viewer-switch-btn.has-tooltip{ 'aria-label' => simple_label, title: simple_label, data: { viewer: 'simple', container: 'body' } }>
= icon(simple_viewer.switcher_icon)
- rich_label = "Display #{rich_viewer.switcher_title}"
%button.btn.btn-secondary.btn-sm.js-blob-viewer-switch-btn.has-tooltip{ 'aria-label' => rich_label, title: rich_label, data: { viewer: 'rich', container: 'body' } }>
%button.btn.btn-default.btn-sm.js-blob-viewer-switch-btn.has-tooltip{ 'aria-label' => rich_label, title: rich_label, data: { viewer: 'rich', container: 'body' } }>
= icon(rich_viewer.switcher_icon)
app/views/projects/blob/viewers/_stl.html.haml
......@@ -3,7 +3,7 @@
= icon('spinner spin 2x', class: 'prepend-top-default append-bottom-default', 'aria-hidden' => 'true', 'aria-label' => 'Loading')
.text-center.prepend-top-default.append-bottom-default.stl-controls
.btn-group
%button.btn.btn-secondary.btn-sm.js-material-changer{ data: { type: 'wireframe' } }
%button.btn.btn-default.btn-sm.js-material-changer{ data: { type: 'wireframe' } }
Wireframe
%button.btn.btn-secondary.btn-sm.active.js-material-changer{ data: { type: 'default' } }
%button.btn.btn-default.btn-sm.active.js-material-changer{ data: { type: 'default' } }
Solid
app/views/projects/branches/_branch.html.haml
......@@ -41,12 +41,12 @@
.controls.d-none.d-sm-block<
- if merge_project && create_mr_button?(@repository.root_ref, branch.name)
= link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-secondary' do
= link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-default' do
= _('Merge request')
- if branch.name != @repository.root_ref
= link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name),
class: "btn btn-secondary #{'prepend-left-10' unless merge_project}",
class: "btn btn-default #{'prepend-left-10' unless merge_project}",
method: :post,
title: s_('Branches|Compare') do
= s_('Branches|Compare')
......
app/views/projects/buttons/_fork.html.haml
......@@ -7,7 +7,7 @@
- else
- can_create_fork = current_user.can?(:create_fork)
= link_to new_project_fork_path(@project),
class: "btn btn-secondary #{'has-tooltip disabled' unless can_create_fork}",
class: "btn btn-default #{'has-tooltip disabled' unless can_create_fork}",
title: (_('You have reached your project limit') unless can_create_fork) do
= custom_icon('icon_fork')
%span= s_('CreateNewFork|Fork')
......
app/views/projects/buttons/_star.html.haml
- if current_user
%button.btn.btn-secondary.star-btn.toggle-star{ type: "button", data: { endpoint: toggle_star_project_path(@project, :json) } }
%button.btn.btn-default.star-btn.toggle-star{ type: "button", data: { endpoint: toggle_star_project_path(@project, :json) } }
- if current_user.starred?(@project)
= sprite_icon('star')
%span.starred= _('Unstar')
......
app/views/projects/ci/lints/show.html.haml
......@@ -19,7 +19,7 @@
.float-left.prepend-top-10
= submit_tag('Validate', class: 'btn btn-success submit-yml')
.float-right.prepend-top-10
= button_tag('Clear', type: 'button', class: 'btn btn-secondary clear-yml')
= button_tag('Clear', type: 'button', class: 'btn btn-default clear-yml')
.row.prepend-top-20
.col-sm-12
......
app/views/projects/clusters/gcp/_show.html.haml
......@@ -4,7 +4,7 @@
.input-group
%input.form-control.cluster-name.js-select-on-focus{ value: @cluster.name, readonly: true }
%span.input-group-append
= clipboard_button(text: @cluster.name, title: s_('ClusterIntegration|Copy Kubernetes cluster name'), class: 'input-group-text btn-secondary')
= clipboard_button(text: @cluster.name, title: s_('ClusterIntegration|Copy Kubernetes cluster name'), class: 'input-group-text btn-default')
= form_for @cluster, url: namespace_project_cluster_path(@project.namespace, @project, @cluster), as: :cluster do |field|
= form_errors(@cluster)
......@@ -15,7 +15,7 @@
.input-group
= platform_kubernetes_field.text_field :api_url, class: 'form-control js-select-on-focus', placeholder: s_('ClusterIntegration|API URL'), readonly: true
%span.input-group-append
= clipboard_button(text: @cluster.platform_kubernetes.api_url, title: s_('ClusterIntegration|Copy API URL'), class: 'input-group-text btn-secondary')
= clipboard_button(text: @cluster.platform_kubernetes.api_url, title: s_('ClusterIntegration|Copy API URL'), class: 'input-group-text btn-default')
.form-group
= platform_kubernetes_field.label :ca_cert, s_('ClusterIntegration|CA Certificate')
......@@ -29,9 +29,9 @@
.input-group
= platform_kubernetes_field.text_field :token, class: 'form-control js-cluster-token js-select-on-focus', type: 'password', placeholder: s_('ClusterIntegration|Token'), readonly: true
%span.input-group-append
%button.btn.btn-secondary.input-group-text.js-show-cluster-token{ type: 'button' }
%button.btn.btn-default.input-group-text.js-show-cluster-token{ type: 'button' }
= s_('ClusterIntegration|Show')
= clipboard_button(text: @cluster.platform_kubernetes.token, title: s_('ClusterIntegration|Copy Token'), class: 'btn-secondary')
= clipboard_button(text: @cluster.platform_kubernetes.token, title: s_('ClusterIntegration|Copy Token'), class: 'btn-default')
.form-group
= platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)')
......
app/views/projects/commit/_commit_box.html.haml
......@@ -24,10 +24,10 @@
%span.btn.disabled.btn-grouped.d-none.d-sm-block.append-right-10
= icon('comment')
= @notes_count
= link_to project_tree_path(@project, @commit), class: "btn btn-secondary append-right-10 d-none d-sm-none d-md-inline" do
= link_to project_tree_path(@project, @commit), class: "btn btn-default append-right-10 d-none d-sm-none d-md-inline" do
#{ _('Browse files') }
.dropdown.inline
%a.btn.btn-secondary.dropdown-toggle{ data: { toggle: "dropdown" } }
%a.btn.btn-default.dropdown-toggle{ data: { toggle: "dropdown" } }
%span= _('Options')
= icon('caret-down')
%ul.dropdown-menu.dropdown-menu-right
......
app/views/projects/commits/_commit.html.haml
......@@ -60,5 +60,5 @@
.commit-sha-group
.label.label-monospace
= commit.short_id
= clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"), class: "btn btn-secondary", container: "body")
= clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"), class: "btn btn-default", container: "body")
= link_to_browse_code(project, commit)
app/views/projects/deployments/_actions.haml
......@@ -3,7 +3,7 @@
- if actions.present?
.btn-group
.dropdown
%button.dropdown.dropdown-new.btn.btn-secondary{ type: 'button', 'data-toggle' => 'dropdown' }
%button.dropdown.dropdown-new.btn.btn-default{ type: 'button', 'data-toggle' => 'dropdown' }
= custom_icon('icon_play')
= icon('caret-down')
%ul.dropdown-menu.dropdown-menu-right
......
app/views/projects/diffs/_diffs.html.haml
......@@ -8,7 +8,7 @@
.files-changed-inner
.inline-parallel-buttons.d-none.d-sm-none.d-md-block
- if !diffs_expanded? && diff_files.any? { |diff_file| diff_file.collapsed? }
= link_to 'Expand all', url_for(safe_params.merge(expanded: 1, format: nil)), class: 'btn btn-secondary'
= link_to 'Expand all', url_for(safe_params.merge(expanded: 1, format: nil)), class: 'btn btn-default'
- if show_whitespace_toggle
- if current_controller?(:commit)
= commit_diff_whitespace_link(diffs.project, @commit, class: 'd-none d-sm-inline-block')
......
app/views/projects/edit.html.haml
......@@ -104,7 +104,7 @@
%p
Runs a number of housekeeping tasks within the current repository, such as compressing file revisions and removing unreachable objects.
= link_to 'Run housekeeping', housekeeping_project_path(@project),
method: :post, class: "btn btn-secondary"
method: :post, class: "btn btn-default"
- if can? current_user, :archive_project, @project
.sub-section
%h4.warning-title
......
app/views/projects/environments/terminal.html.haml
......@@ -15,7 +15,7 @@
.col-sm-6
.nav-controls
- if @environment.external_url.present?
= link_to @environment.external_url, class: 'btn btn-secondary', target: '_blank', rel: 'noopener noreferrer nofollow' do
= link_to @environment.external_url, class: 'btn btn-default', target: '_blank', rel: 'noopener noreferrer nofollow' do
= icon('external-link')
= render 'projects/deployments/actions', deployment: @environment.last_deployment
......
app/views/projects/hook_logs/show.html.haml
......@@ -4,6 +4,6 @@
Request details
.col-lg-9
= link_to 'Resend Request', retry_project_hook_hook_log_path(@project, @hook, @hook_log), class: "btn btn-secondary float-right prepend-left-10"
= link_to 'Resend Request', retry_project_hook_hook_log_path(@project, @hook, @hook_log), class: "btn btn-default float-right prepend-left-10"
= render partial: 'shared/hook_logs/content', locals: { hook_log: @hook_log }
app/views/projects/issues/_nav_btns.html.haml
= link_to safe_params.merge(rss_url_options), class: 'btn btn-secondary append-right-10 has-tooltip', title: 'Subscribe' do
= link_to safe_params.merge(rss_url_options), class: 'btn btn-default append-right-10 has-tooltip', title: 'Subscribe' do
= icon('rss')
- if @can_bulk_update
= button_tag "Edit issues", class: "btn btn-secondary append-right-10 js-bulk-update-toggle"
= button_tag "Edit issues", class: "btn btn-default append-right-10 js-bulk-update-toggle"
- if show_new_issue_link?(@project)
= link_to "New issue", new_project_issue_path(@project,
issue: { assignee_id: finder.assignee.try(:id),
......
app/views/projects/issues/show.html.haml
......@@ -26,12 +26,12 @@
.issuable-warning-icon.inline= sprite_icon('lock', size: 16, css_class: 'icon')
= issuable_meta(@issue, @project, "Issue")
%a.btn.btn-secondary.float-right.d-block.d-sm-none.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" }
%a.btn.btn-default.float-right.d-block.d-sm-none.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" }
= icon('angle-double-left')
.detail-page-header-actions.js-issuable-actions
.clearfix.issue-btn-group.dropdown
%button.btn.btn-secondary.float-left.d-md-none.d-lg-none.d-xl-none{ type: "button", data: { toggle: "dropdown" } }
%button.btn.btn-default.float-left.d-md-none.d-lg-none.d-xl-none{ type: "button", data: { toggle: "dropdown" } }
Options
= icon('caret-down')
.dropdown-menu.dropdown-menu-right.d-lg-none.d-xl-none
......
app/views/projects/jobs/_header.html.haml
......@@ -27,5 +27,5 @@
= link_to "New issue", new_project_issue_path(@project, issue: build_failed_issue_options), class: 'btn btn-new btn-inverted'
- if can?(current_user, :update_build, @build) && @build.retryable?
= link_to "Retry job", retry_project_job_path(@project, @build), class: 'btn btn-inverted-secondary', method: :post
%button.btn.btn-secondary.float-right.d-block.d-sm-none.d-md-none.build-gutter-toggle.js-sidebar-build-toggle{ role: "button", type: "button" }
%button.btn.btn-default.float-right.d-block.d-sm-none.d-md-none.build-gutter-toggle.js-sidebar-build-toggle{ role: "button", type: "button" }
= icon('angle-double-left')
app/views/projects/jobs/_sidebar.html.haml
......@@ -20,14 +20,14 @@
- if @build.artifacts?
.btn-group.btn-group.d-flex{ role: :group }
- if @build.has_expiring_artifacts? && can?(current_user, :update_build, @build)
= link_to keep_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-secondary', method: :post do
= link_to keep_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default', method: :post do
Keep
= link_to download_project_job_artifacts_path(@project, @build), rel: 'nofollow', download: '', class: 'btn btn-sm btn-secondary' do
= link_to download_project_job_artifacts_path(@project, @build), rel: 'nofollow', download: '', class: 'btn btn-sm btn-default' do
Download
- if @build.browsable_artifacts?
= link_to browse_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-secondary' do
= link_to browse_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default' do
Browse
- if @build.trigger_request
......
app/views/projects/jobs/index.html.haml
......@@ -15,7 +15,7 @@
- unless @repository.gitlab_ci_yml
= link_to 'Get started with Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
= link_to project_ci_lint_path(@project), class: 'btn btn-secondary' do
= link_to project_ci_lint_path(@project), class: 'btn btn-default' do
%span CI lint
.content-list.builds-content-list
......
app/views/projects/merge_requests/_discussion.html.haml
......@@ -5,7 +5,7 @@
- if @merge_request.reopenable?
= link_to 'Reopen merge request', merge_request_path(@merge_request, merge_request: { state_event: :reopen }), method: :put, class: "btn btn-nr btn-comment btn-reopen reopen-mr-link js-note-target-close js-note-target-reopen", title: "Reopen merge request", data: { original_text: "Reopen merge request", alternative_text: "Comment & reopen merge request"}
%comment-and-resolve-btn{ "inline-template" => true }
%button.btn.btn-nr.btn-secondary.append-right-10.js-comment-resolve-button{ "v-if" => "showButton", type: "submit", data: { project_path: "#{project_path(@merge_request.project)}" } }
%button.btn.btn-nr.btn-default.append-right-10.js-comment-resolve-button{ "v-if" => "showButton", type: "submit", data: { project_path: "#{project_path(@merge_request.project)}" } }
{{ buttonText }}
#notes= render "shared/notes/notes_with_form", :autocomplete => true
app/views/projects/merge_requests/_mr_title.html.haml
......@@ -16,12 +16,12 @@
.issuable-warning-icon.inline= sprite_icon('lock', size: 16, css_class: 'icon')
= issuable_meta(@merge_request, @project, "Merge request")
%a.btn.btn-secondary.float-right.d-block.d-sm-none.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" }
%a.btn.btn-default.float-right.d-block.d-sm-none.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" }
= icon('angle-double-left')
.detail-page-header-actions.js-issuable-actions
.clearfix.issue-btn-group.dropdown
%button.btn.btn-secondary.float-left.d-md-none.d-lg-none.d-xl-none{ type: "button", data: { toggle: "dropdown" } }
%button.btn.btn-default.float-left.d-md-none.d-lg-none.d-xl-none{ type: "button", data: { toggle: "dropdown" } }
Options
= icon('caret-down')
.dropdown-menu.dropdown-menu-right.d-lg-none.d-xl-none
......
app/views/projects/merge_requests/diffs/_version_controls.html.haml
......@@ -3,7 +3,7 @@
.mr-version-menus-container.content-block
Changes between
%span.dropdown.inline.mr-version-dropdown
%a.dropdown-toggle.btn.btn-secondary{ data: {toggle: :dropdown} }
%a.dropdown-toggle.btn.btn-default{ data: {toggle: :dropdown} }
%span
- if @merge_request_diff.latest?
latest version
......@@ -36,7 +36,7 @@
- if @merge_request_diff.base_commit_sha
and
%span.dropdown.inline.mr-version-compare-dropdown
%a.btn.btn-secondary.dropdown-toggle{ data: {toggle: :dropdown} }
%a.btn.btn-default.dropdown-toggle{ data: {toggle: :dropdown} }
- if @start_version
version #{version_index(@start_version)}
- else
......
app/views/projects/milestones/show.html.haml
......@@ -56,7 +56,7 @@
#delete-milestone-modal
%a.btn.btn-secondary.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: "#" }
%a.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: "#" }
= icon('angle-double-left')
.detail-page-description.milestone-detail
......
app/views/projects/project_members/_new_project_member.html.haml
......@@ -18,4 +18,4 @@
= text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Expiration date'
%i.clear-icon.js-clear-input
= f.submit "Add to project", class: "btn btn-create"
= link_to "Import", import_project_project_members_path(@project), class: "btn btn-secondary", title: "Import members from another project"
= link_to "Import", import_project_project_members_path(@project), class: "btn btn-default", title: "Import members from another project"
app/views/projects/releases/edit.html.haml
......@@ -18,4 +18,4 @@
.error-alert
.prepend-top-default
= f.submit 'Save changes', class: 'btn btn-save'
= link_to "Cancel", project_tag_path(@project, @tag.name), class: "btn btn-secondary btn-cancel"
= link_to "Cancel", project_tag_path(@project, @tag.name), class: "btn btn-default btn-cancel"
app/views/projects/snippets/_actions.html.haml
......@@ -14,7 +14,7 @@
= link_to 'Submit as spam', mark_as_spam_project_snippet_path(@project, @snippet), method: :post, class: 'btn btn-grouped btn-spam', title: 'Submit as spam'
- if can?(current_user, :create_project_snippet, @project) || can?(current_user, :update_project_snippet, @snippet)
.d-block.d-sm-none.dropdown
%button.btn.btn-secondary.btn-block.append-bottom-0.prepend-top-5{ data: { toggle: "dropdown" } }
%button.btn.btn-default.btn-block.append-bottom-0.prepend-top-5{ data: { toggle: "dropdown" } }
Options
= icon('caret-down')
.dropdown-menu.dropdown-menu-full-width
......
app/views/projects/tree/_tree_header.html.haml
......@@ -82,7 +82,7 @@
- if can_collaborate
= succeed " " do
= link_to ide_edit_path(@project, @id, ""), class: 'btn btn-secondary' do
= link_to ide_edit_path(@project, @id, ""), class: 'btn btn-default' do
= _('Web IDE')
= render 'projects/buttons/download', project: @project, ref: @ref
app/views/projects/triggers/_trigger.html.haml
......@@ -33,10 +33,10 @@
- take_ownership_confirmation = "By taking ownership you will bind this trigger to your user account. With this the trigger will have access to all your projects as if it was you. Are you sure?"
- revoke_trigger_confirmation = "By revoking a trigger you will break any processes making use of it. Are you sure?"
- if trigger.owner != current_user && can?(current_user, :manage_trigger, trigger)
= link_to 'Take ownership', take_ownership_project_trigger_path(@project, trigger), data: { confirm: take_ownership_confirmation }, method: :post, class: "btn btn-secondary btn-sm btn-trigger-take-ownership"
= link_to 'Take ownership', take_ownership_project_trigger_path(@project, trigger), data: { confirm: take_ownership_confirmation }, method: :post, class: "btn btn-default btn-sm btn-trigger-take-ownership"
- if can?(current_user, :admin_trigger, trigger)
= link_to edit_project_trigger_path(@project, trigger), method: :get, title: "Edit", class: "btn btn-secondary btn-sm" do
= link_to edit_project_trigger_path(@project, trigger), method: :get, title: "Edit", class: "btn btn-default btn-sm" do
%i.fa.fa-pencil
- if can?(current_user, :manage_trigger, trigger)
= link_to project_trigger_path(@project, trigger), data: { confirm: revoke_trigger_confirmation }, method: :delete, title: "Revoke", class: "btn btn-secondary btn-warning btn-sm btn-trigger-revoke" do
= link_to project_trigger_path(@project, trigger), data: { confirm: revoke_trigger_confirmation }, method: :delete, title: "Revoke", class: "btn btn-default btn-warning btn-sm btn-trigger-revoke" do
%i.fa.fa-trash
app/views/projects/wikis/edit.html.haml
......@@ -4,7 +4,7 @@
= wiki_page_errors(@error)
.wiki-page-header.has-sidebar-toggle
%button.btn.btn-secondary.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
%button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
= icon('angle-double-left')
.nav-text
......
app/views/projects/wikis/git_access.html.haml
......@@ -2,7 +2,7 @@
- page_title s_("WikiClone|Git Access"), _("Wiki")
.wiki-page-header.has-sidebar-toggle
%button.btn.btn-secondary.d-block.d-sm-block.d-md-none.float-right.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
%button.btn.btn-default.d-block.d-sm-block.d-md-none.float-right.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
= icon('angle-double-left')
.git-access-header
......
app/views/projects/wikis/history.html.haml
- page_title _("History"), @page.title.capitalize, _("Wiki")
.wiki-page-header.has-sidebar-toggle
%button.btn.btn-secondary.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
%button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
= icon('angle-double-left')
.nav-text
......
app/views/projects/wikis/show.html.haml
......@@ -5,7 +5,7 @@
- add_to_breadcrumbs _("Wiki"), get_project_wiki_path(@project)
.wiki-page-header.has-sidebar-toggle
%button.btn.btn-secondary.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
%button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
= icon('angle-double-left')
.nav-text
......
app/views/shared/_clone_panel.html.haml
......@@ -19,4 +19,4 @@
= text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true, aria: { label: 'Project clone URL' }
.input-group-append
= clipboard_button(target: '#project_clone', title: _("Copy URL to clipboard"), class: "input-group-text btn-secondary btn-clipboard")
= clipboard_button(target: '#project_clone', title: _("Copy URL to clipboard"), class: "input-group-text btn-default btn-clipboard")
app/views/shared/_delete_label_modal.html.haml
......@@ -11,7 +11,7 @@
%span will be permanently deleted from #{label.is_a?(ProjectLabel)? label.project.name : label.group.name}. This cannot be undone.
.modal-footer
%a{ href: '#', data: { dismiss: 'modal' }, class: 'btn btn-secondary' } Cancel
%a{ href: '#', data: { dismiss: 'modal' }, class: 'btn btn-default' } Cancel
= link_to 'Delete label',
destroy_label_path(label),
......
app/views/shared/_label.html.haml
......@@ -9,7 +9,7 @@
= render "shared/label_row", label: label
.d-inline-block.d-sm-none.dropdown
%button.btn.btn-secondary.label-options-toggle{ type: 'button', data: { toggle: "dropdown" } }
%button.btn.btn-default.label-options-toggle{ type: 'button', data: { toggle: "dropdown" } }
Options
= icon('caret-down')
.dropdown-menu.dropdown-menu-right
......@@ -71,7 +71,7 @@
- if current_user
.label-subscription.inline
- if can_subscribe_to_label_in_different_levels?(label)
%button.js-unsubscribe-button.label-subscribe-button.btn.btn-secondary{ type: 'button', class: ('hidden' if status.unsubscribed?), data: { url: toggle_subscription_path } }
%button.js-unsubscribe-button.label-subscribe-button.btn.btn-default{ type: 'button', class: ('hidden' if status.unsubscribed?), data: { url: toggle_subscription_path } }
%span Unsubscribe
= icon('spinner spin', class: 'label-subscribe-button-loading')
......@@ -86,7 +86,7 @@
%a.js-subscribe-button{ class: ('hidden' unless status.unsubscribed?), data: { url: toggle_subscription_group_label_path(label.group, label) } }
Group level
- else
%button.js-subscribe-button.label-subscribe-button.btn.btn-secondary{ type: 'button', data: { status: status, url: toggle_subscription_path } }
%button.js-subscribe-button.label-subscribe-button.btn.btn-default{ type: 'button', data: { status: status, url: toggle_subscription_path } }
%span= label_subscription_toggle_button_text(label, @project)
= icon('spinner spin', class: 'label-subscribe-button-loading')
......
app/views/shared/boards/components/_board.html.haml
......@@ -28,7 +28,7 @@
%span.issue-count-badge-count.float-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' }
{{ list.issuesSize }}
- if can?(current_user, :admin_list, current_board_parent)
%button.issue-count-badge-add-button.btn.btn-sm.btn-secondary.has-tooltip.js-no-trigger-collapse{ type: "button",
%button.issue-count-badge-add-button.btn.btn-sm.btn-default.has-tooltip.js-no-trigger-collapse{ type: "button",
"@click" => "showNewIssueForm",
"v-if" => 'list.type !== "closed"',
"aria-label" => "New issue",
......
app/views/shared/issuable/_bulk_update_sidebar.html.haml
......@@ -6,7 +6,7 @@
.block.issuable-sidebar-header
.filter-item.inline.update-issues-btn.float-left
= button_tag "Update all", class: "btn update-selected-issues btn-info", disabled: true
= button_tag "Cancel", class: "btn btn-secondary js-bulk-update-menu-hide float-right"
= button_tag "Cancel", class: "btn btn-default js-bulk-update-menu-hide float-right"
.block
.title
Status
......
app/views/shared/issuable/_label_page_create.html.haml
......@@ -14,5 +14,5 @@
.clearfix
%button.btn.btn-primary.float-left.js-new-label-btn{ type: "button" }
= _('Create')
%button.btn.btn-secondary.float-right.js-cancel-label-btn{ type: "button" }
%button.btn.btn-default.float-right.js-cancel-label-btn{ type: "button" }
= _('Cancel')
app/views/shared/issuable/_sidebar.html.haml
......@@ -146,7 +146,7 @@
.sidebar-collapsed-icon{ data: { toggle: 'tooltip', placement: 'left', container: 'body' }, title: _('Move issue') }
= custom_icon('icon_arrow_right')
.dropdown.sidebar-move-issue-dropdown.hide-collapsed
%button.btn.btn-secondary.btn-block.js-sidebar-dropdown-toggle.js-move-issue{ type: 'button',
%button.btn.btn-default.btn-block.js-sidebar-dropdown-toggle.js-move-issue{ type: 'button',
data: { toggle: 'dropdown', display: 'static' } }
= _('Move issue')
.dropdown-menu.dropdown-menu-selectable
......
app/views/shared/issuable/_sidebar_todo.html.haml
......@@ -3,7 +3,7 @@
- todo_content = is_collapsed ? icon('plus-square') : _('Add todo')
%button.issuable-todo-btn.js-issuable-todo{ type: 'button',
class: (is_collapsed ? 'btn-blank sidebar-collapsed-icon dont-change-state has-tooltip' : 'btn btn-secondary issuable-header-btn float-right'),
class: (is_collapsed ? 'btn-blank sidebar-collapsed-icon dont-change-state has-tooltip' : 'btn btn-default issuable-header-btn float-right'),
title: (todo.nil? ? _('Add todo') : _('Mark todo as done')),
'aria-label' => (todo.nil? ? _('Add todo') : _('Mark todo as done')),
data: issuable_todo_button_data(issuable, todo, is_collapsed) }
......
app/views/shared/members/_member.html.haml
......@@ -53,7 +53,7 @@
- if member.can_resend_invite?
= link_to icon('paper-plane'), polymorphic_path([:resend_invite, member]),
method: :post,
class: 'btn btn-secondary prepend-left-10 d-none d-sm-block',
class: 'btn btn-default prepend-left-10 d-none d-sm-block',
title: 'Resend invite'
- if user != current_user && member.can_update?
......
app/views/shared/milestones/_top.html.haml
......@@ -5,7 +5,7 @@
- is_dynamic_milestone = milestone.legacy_group_milestone? || milestone.dashboard_milestone?
.detail-page-header
%a.btn.btn-secondary.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: "#" }
%a.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: "#" }
= icon('angle-double-left')
.status-box{ class: "status-box-#{milestone.closed? ? 'closed' : 'open'}" }
......
app/views/shared/notes/_hints.html.haml
......@@ -32,4 +32,4 @@
= icon('file-image-o', class: 'toolbar-button-icon')
Attach a file
%button.btn.btn-secondary.btn-sm.hide.button-cancel-uploading-files{ type: 'button' } Cancel
%button.btn.btn-default.btn-sm.hide.button-cancel-uploading-files{ type: 'button' } Cancel
app/views/shared/notifications/_button.html.haml
......@@ -6,14 +6,14 @@
.js-notification-toggle-btns
%div{ class: ("btn-group" if notification_setting.custom?) }
- if notification_setting.custom?
%button.dropdown-new.btn.btn-secondary.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting) } }
%button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting) } }
= icon("bell", class: "js-notification-loading")
= notification_title(notification_setting.level)
%button.btn.dropdown-toggle{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting) } }
= icon('caret-down')
.sr-only Toggle dropdown
- else
%button.dropdown-new.btn.btn-secondary.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting) } }
%button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting) } }
= icon("bell", class: "js-notification-loading")
= notification_title(notification_setting.level)
= icon("caret-down")
......
app/views/snippets/_actions.html.haml
......@@ -12,7 +12,7 @@
- if @snippet.submittable_as_spam_by?(current_user)
= link_to 'Submit as spam', mark_as_spam_snippet_path(@snippet), method: :post, class: 'btn btn-grouped btn-spam', title: 'Submit as spam'
.d-block.d-sm-none.dropdown
%button.btn.btn-secondary.btn-block.append-bottom-0.prepend-top-5{ data: { toggle: "dropdown" } }
%button.btn.btn-default.btn-block.append-bottom-0.prepend-top-5{ data: { toggle: "dropdown" } }
Options
= icon('caret-down')
.dropdown-menu.dropdown-menu-full-width
......
spec/features/merge_request/user_sees_versions_spec.rb
......@@ -54,7 +54,7 @@ describe 'Merge request > User sees versions', :js do
describe 'switch between versions' do
before do
page.within '.mr-version-dropdown' do
find('.btn-secondary').click
find('.btn-default').click
click_link 'version 1'
end
......@@ -93,7 +93,7 @@ describe 'Merge request > User sees versions', :js do
describe 'compare with older version' do
before do
page.within '.mr-version-compare-dropdown' do
find('.btn-secondary').click
find('.btn-default').click
click_link 'version 1'
end
......@@ -151,7 +151,7 @@ describe 'Merge request > User sees versions', :js do
describe 'compare with same version' do
before do
page.within '.mr-version-compare-dropdown' do
find('.btn-secondary').click
find('.btn-default').click
click_link 'version 1'
end
end
......@@ -162,7 +162,7 @@ describe 'Merge request > User sees versions', :js do
end
page.within '.mr-version-dropdown' do
find('.btn-secondary').click
find('.btn-default').click
click_link 'version 1'
end
expect(page).to have_content '0 changed files'
......@@ -172,7 +172,7 @@ describe 'Merge request > User sees versions', :js do
describe 'compare with newer version' do
before do
page.within '.mr-version-compare-dropdown' do
find('.btn-secondary').click
find('.btn-default').click
click_link 'version 2'
end
end
......@@ -183,7 +183,7 @@ describe 'Merge request > User sees versions', :js do
end
page.within '.mr-version-dropdown' do
find('.btn-secondary').click
find('.btn-default').click
click_link 'version 1'
end
......
spec/features/projects/pipelines/pipelines_spec.rb
......@@ -211,7 +211,7 @@ describe 'Pipelines', :js do
end
it 'has a dropdown with play button' do
expect(page).to have_selector('.dropdown-new.btn.btn-secondary .icon-play')
expect(page).to have_selector('.dropdown-new.btn.btn-default .icon-play')
end
it 'has link to the manual action' do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment