[skip ci] Convert btn-xs to btn-sm
This commit is contained in:
parent
ac2f11410c
commit
b292359c48
|
@ -89,7 +89,7 @@ export default {
|
||||||
v-show="hasError"
|
v-show="hasError"
|
||||||
class="btn-group"
|
class="btn-group"
|
||||||
>
|
>
|
||||||
<div class="btn btn-default btn-xs disabled">
|
<div class="btn btn-default btn-sm disabled">
|
||||||
<icon
|
<icon
|
||||||
class="prepend-left-8 append-right-8"
|
class="prepend-left-8 append-right-8"
|
||||||
name="doc_image"
|
name="doc_image"
|
||||||
|
@ -98,7 +98,7 @@ export default {
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="btn btn-default btn-xs disabled"
|
class="btn btn-default btn-sm disabled"
|
||||||
>
|
>
|
||||||
<span class="prepend-left-8 append-right-8">{{ s__('Badges|No badge image') }}</span>
|
<span class="prepend-left-8 append-right-8">{{ s__('Badges|No badge image') }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
@ -106,7 +106,7 @@ export default {
|
||||||
|
|
||||||
<button
|
<button
|
||||||
v-show="hasError"
|
v-show="hasError"
|
||||||
class="btn btn-transparent btn-xs text-primary"
|
class="btn btn-transparent btn-sm text-primary"
|
||||||
type="button"
|
type="button"
|
||||||
v-tooltip
|
v-tooltip
|
||||||
:title="s__('Badges|Reload badge image')"
|
:title="s__('Badges|Reload badge image')"
|
||||||
|
|
|
@ -39,7 +39,7 @@ export default {
|
||||||
v-if="!file.binary"
|
v-if="!file.binary"
|
||||||
:href="file.blamePath"
|
:href="file.blamePath"
|
||||||
:title="__('Blame')"
|
:title="__('Blame')"
|
||||||
class="btn btn-xs btn-transparent blame"
|
class="btn btn-sm btn-transparent blame"
|
||||||
>
|
>
|
||||||
<icon
|
<icon
|
||||||
name="blame"
|
name="blame"
|
||||||
|
@ -50,7 +50,7 @@ export default {
|
||||||
v-tooltip
|
v-tooltip
|
||||||
:href="file.commitsPath"
|
:href="file.commitsPath"
|
||||||
:title="__('History')"
|
:title="__('History')"
|
||||||
class="btn btn-xs btn-transparent history"
|
class="btn btn-sm btn-transparent history"
|
||||||
>
|
>
|
||||||
<icon
|
<icon
|
||||||
name="history"
|
name="history"
|
||||||
|
@ -61,7 +61,7 @@ export default {
|
||||||
v-tooltip
|
v-tooltip
|
||||||
:href="file.permalink"
|
:href="file.permalink"
|
||||||
:title="__('Permalink')"
|
:title="__('Permalink')"
|
||||||
class="btn btn-xs btn-transparent permalink"
|
class="btn btn-sm btn-transparent permalink"
|
||||||
>
|
>
|
||||||
<icon
|
<icon
|
||||||
name="link"
|
name="link"
|
||||||
|
@ -72,7 +72,7 @@ export default {
|
||||||
v-tooltip
|
v-tooltip
|
||||||
:href="file.rawPath"
|
:href="file.rawPath"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
class="btn btn-xs btn-transparent prepend-left-10 raw"
|
class="btn btn-sm btn-transparent prepend-left-10 raw"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
:title="rawDownloadButtonLabel">
|
:title="rawDownloadButtonLabel">
|
||||||
<icon
|
<icon
|
||||||
|
|
|
@ -5,7 +5,7 @@ document.addEventListener('DOMContentLoaded', () => {
|
||||||
const twoFactorNode = document.querySelector('.js-two-factor-auth');
|
const twoFactorNode = document.querySelector('.js-two-factor-auth');
|
||||||
const skippable = twoFactorNode.dataset.twoFactorSkippable === 'true';
|
const skippable = twoFactorNode.dataset.twoFactorSkippable === 'true';
|
||||||
if (skippable) {
|
if (skippable) {
|
||||||
const button = `<a class="btn btn-xs btn-warning float-right" data-method="patch" href="${twoFactorNode.dataset.two_factor_skip_url}">Configure it later</a>`;
|
const button = `<a class="btn btn-sm btn-warning float-right" data-method="patch" href="${twoFactorNode.dataset.two_factor_skip_url}">Configure it later</a>`;
|
||||||
const flashAlert = document.querySelector('.flash-alert .container-fluid');
|
const flashAlert = document.querySelector('.flash-alert .container-fluid');
|
||||||
if (flashAlert) flashAlert.insertAdjacentHTML('beforeend', button);
|
if (flashAlert) flashAlert.insertAdjacentHTML('beforeend', button);
|
||||||
}
|
}
|
||||||
|
|
|
@ -127,7 +127,7 @@ export default {
|
||||||
</span>
|
</span>
|
||||||
<loading-button
|
<loading-button
|
||||||
v-if="deployment.stop_url"
|
v-if="deployment.stop_url"
|
||||||
container-class="btn btn-secondary btn-xs prepend-left-default"
|
container-class="btn btn-secondary btn-sm prepend-left-default"
|
||||||
label="Stop environment"
|
label="Stop environment"
|
||||||
:loading="isStopping"
|
:loading="isStopping"
|
||||||
@click="stopEnvironment"
|
@click="stopEnvironment"
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
@click="refreshWidget"
|
@click="refreshWidget"
|
||||||
:disabled="isRefreshing"
|
:disabled="isRefreshing"
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-xs btn-secondary"
|
class="btn btn-sm btn-secondary"
|
||||||
>
|
>
|
||||||
<loading-icon
|
<loading-icon
|
||||||
v-if="isRefreshing"
|
v-if="isRefreshing"
|
||||||
|
|
|
@ -43,13 +43,13 @@ To merge this request, first rebase locally.`) }}
|
||||||
<a
|
<a
|
||||||
v-if="mr.canMerge && mr.conflictResolutionPath"
|
v-if="mr.canMerge && mr.conflictResolutionPath"
|
||||||
:href="mr.conflictResolutionPath"
|
:href="mr.conflictResolutionPath"
|
||||||
class="js-resolve-conflicts-button btn btn-secondary btn-xs"
|
class="js-resolve-conflicts-button btn btn-secondary btn-sm"
|
||||||
>
|
>
|
||||||
{{ s__("mrWidget|Resolve conflicts") }}
|
{{ s__("mrWidget|Resolve conflicts") }}
|
||||||
</a>
|
</a>
|
||||||
<button
|
<button
|
||||||
v-if="mr.canMerge"
|
v-if="mr.canMerge"
|
||||||
class="js-merge-locally-button btn btn-secondary btn-xs"
|
class="js-merge-locally-button btn btn-secondary btn-sm"
|
||||||
data-toggle="modal"
|
data-toggle="modal"
|
||||||
data-target="#modal_merge_info"
|
data-target="#modal_merge_info"
|
||||||
>
|
>
|
||||||
|
|
|
@ -94,7 +94,7 @@
|
||||||
</span>
|
</span>
|
||||||
<button
|
<button
|
||||||
@click="refresh"
|
@click="refresh"
|
||||||
class="btn btn-secondary btn-xs js-refresh-button"
|
class="btn btn-secondary btn-sm js-refresh-button"
|
||||||
type="button"
|
type="button"
|
||||||
>
|
>
|
||||||
{{ s__("mrWidget|Refresh now") }}
|
{{ s__("mrWidget|Refresh now") }}
|
||||||
|
|
|
@ -94,7 +94,7 @@
|
||||||
:disabled="isCancellingAutoMerge"
|
:disabled="isCancellingAutoMerge"
|
||||||
role="button"
|
role="button"
|
||||||
href="#"
|
href="#"
|
||||||
class="btn btn-xs btn-secondary js-cancel-auto-merge">
|
class="btn btn-sm btn-secondary js-cancel-auto-merge">
|
||||||
<i
|
<i
|
||||||
v-if="isCancellingAutoMerge"
|
v-if="isCancellingAutoMerge"
|
||||||
class="fa fa-spinner fa-spin"
|
class="fa fa-spinner fa-spin"
|
||||||
|
@ -129,7 +129,7 @@
|
||||||
:disabled="isRemovingSourceBranch"
|
:disabled="isRemovingSourceBranch"
|
||||||
@click.prevent="removeSourceBranch"
|
@click.prevent="removeSourceBranch"
|
||||||
role="button"
|
role="button"
|
||||||
class="btn btn-xs btn-secondary js-remove-source-branch"
|
class="btn btn-sm btn-secondary js-remove-source-branch"
|
||||||
href="#"
|
href="#"
|
||||||
>
|
>
|
||||||
<i
|
<i
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
<a
|
<a
|
||||||
v-if="mr.canRevertInCurrentMR"
|
v-if="mr.canRevertInCurrentMR"
|
||||||
v-tooltip
|
v-tooltip
|
||||||
class="btn btn-close btn-xs"
|
class="btn btn-close btn-sm"
|
||||||
href="#modal-revert-commit"
|
href="#modal-revert-commit"
|
||||||
data-toggle="modal"
|
data-toggle="modal"
|
||||||
data-container="body"
|
data-container="body"
|
||||||
|
@ -127,7 +127,7 @@
|
||||||
<a
|
<a
|
||||||
v-else-if="mr.revertInForkPath"
|
v-else-if="mr.revertInForkPath"
|
||||||
v-tooltip
|
v-tooltip
|
||||||
class="btn btn-close btn-xs"
|
class="btn btn-close btn-sm"
|
||||||
data-method="post"
|
data-method="post"
|
||||||
:href="mr.revertInForkPath"
|
:href="mr.revertInForkPath"
|
||||||
:title="revertTitle"
|
:title="revertTitle"
|
||||||
|
@ -137,7 +137,7 @@
|
||||||
<a
|
<a
|
||||||
v-if="mr.canCherryPickInCurrentMR"
|
v-if="mr.canCherryPickInCurrentMR"
|
||||||
v-tooltip
|
v-tooltip
|
||||||
class="btn btn-secondary btn-xs"
|
class="btn btn-secondary btn-sm"
|
||||||
href="#modal-cherry-pick-commit"
|
href="#modal-cherry-pick-commit"
|
||||||
data-toggle="modal"
|
data-toggle="modal"
|
||||||
data-container="body"
|
data-container="body"
|
||||||
|
@ -148,7 +148,7 @@
|
||||||
<a
|
<a
|
||||||
v-else-if="mr.cherryPickInForkPath"
|
v-else-if="mr.cherryPickInForkPath"
|
||||||
v-tooltip
|
v-tooltip
|
||||||
class="btn btn-secondary btn-xs"
|
class="btn btn-secondary btn-sm"
|
||||||
data-method="post"
|
data-method="post"
|
||||||
:href="mr.cherryPickInForkPath"
|
:href="mr.cherryPickInForkPath"
|
||||||
:title="cherryPickTitle"
|
:title="cherryPickTitle"
|
||||||
|
@ -175,7 +175,7 @@
|
||||||
@click="removeSourceBranch"
|
@click="removeSourceBranch"
|
||||||
:disabled="isMakingRequest"
|
:disabled="isMakingRequest"
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-xs btn-secondary js-remove-branch-button"
|
class="btn btn-sm btn-secondary js-remove-branch-button"
|
||||||
>
|
>
|
||||||
{{ s__("mrWidget|Remove Source Branch") }}
|
{{ s__("mrWidget|Remove Source Branch") }}
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -306,7 +306,7 @@ export default {
|
||||||
v-else
|
v-else
|
||||||
@click="toggleCommitMessageEditor"
|
@click="toggleCommitMessageEditor"
|
||||||
:disabled="isMergeButtonDisabled"
|
:disabled="isMergeButtonDisabled"
|
||||||
class="js-modify-commit-message-button btn btn-default btn-xs"
|
class="js-modify-commit-message-button btn btn-default btn-sm"
|
||||||
type="button">
|
type="button">
|
||||||
Modify commit message
|
Modify commit message
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -54,7 +54,7 @@ export default {
|
||||||
@click="removeWIP"
|
@click="removeWIP"
|
||||||
:disabled="isMakingRequest"
|
:disabled="isMakingRequest"
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-default btn-xs js-remove-wip">
|
class="btn btn-default btn-sm js-remove-wip">
|
||||||
<i
|
<i
|
||||||
v-if="isMakingRequest"
|
v-if="isMakingRequest"
|
||||||
class="fa fa-spinner fa-spin"
|
class="fa fa-spinner fa-spin"
|
||||||
|
|
|
@ -28,7 +28,7 @@ export default {
|
||||||
<a
|
<a
|
||||||
v-if="mr.createIssueToResolveDiscussionsPath"
|
v-if="mr.createIssueToResolveDiscussionsPath"
|
||||||
:href="mr.createIssueToResolveDiscussionsPath"
|
:href="mr.createIssueToResolveDiscussionsPath"
|
||||||
class="btn btn-secondary btn-xs js-create-issue"
|
class="btn btn-secondary btn-sm js-create-issue"
|
||||||
>
|
>
|
||||||
{{ s__("mrWidget|Create an issue to resolve them later") }}
|
{{ s__("mrWidget|Create an issue to resolve them later") }}
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -111,7 +111,7 @@
|
||||||
Attach a file
|
Attach a file
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
class="btn btn-secondary btn-xs d-none button-cancel-uploading-files"
|
class="btn btn-secondary btn-sm d-none button-cancel-uploading-files"
|
||||||
type="button"
|
type="button"
|
||||||
>
|
>
|
||||||
Cancel
|
Cancel
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
%td
|
%td
|
||||||
= message.ends_at
|
= message.ends_at
|
||||||
%td
|
%td
|
||||||
= link_to icon('pencil-square-o'), edit_admin_broadcast_message_path(message), title: 'Edit', class: 'btn btn-xs'
|
= link_to icon('pencil-square-o'), edit_admin_broadcast_message_path(message), title: 'Edit', class: 'btn btn-sm'
|
||||||
= link_to icon('times'), admin_broadcast_message_path(message), method: :delete, remote: true, title: 'Remove', class: 'js-remove-tr btn btn-xs btn-danger'
|
= link_to icon('times'), admin_broadcast_message_path(message), method: :delete, remote: true, title: 'Remove', class: 'js-remove-tr btn btn-sm btn-danger'
|
||||||
|
|
||||||
= paginate @broadcast_messages, theme: 'gitlab'
|
= paginate @broadcast_messages, theme: 'gitlab'
|
||||||
|
|
|
@ -117,7 +117,7 @@
|
||||||
group members
|
group members
|
||||||
%span.badge.badge-pill= @group.members.size
|
%span.badge.badge-pill= @group.members.size
|
||||||
.float-right
|
.float-right
|
||||||
= link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@group, :members]), class: "btn btn-xs"
|
= link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@group, :members]), class: "btn btn-sm"
|
||||||
%ul.well-list.group-users-list.content-list.members-list
|
%ul.well-list.group-users-list.content-list.members-list
|
||||||
= render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false }
|
= render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false }
|
||||||
.card-footer
|
.card-footer
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
%td
|
%td
|
||||||
= identity.extern_uid
|
= identity.extern_uid
|
||||||
%td
|
%td
|
||||||
= link_to edit_admin_user_identity_path(@user, identity), class: 'btn btn-xs btn-grouped' do
|
= link_to edit_admin_user_identity_path(@user, identity), class: 'btn btn-sm btn-grouped' do
|
||||||
Edit
|
Edit
|
||||||
= link_to [:admin, @user, identity], method: :delete,
|
= link_to [:admin, @user, identity], method: :delete,
|
||||||
class: 'btn btn-xs btn-danger',
|
class: 'btn btn-sm btn-danger',
|
||||||
data: { confirm: "Are you sure you want to remove this identity?" } do
|
data: { confirm: "Are you sure you want to remove this identity?" } do
|
||||||
Delete
|
Delete
|
||||||
|
|
|
@ -164,7 +164,7 @@
|
||||||
group members
|
group members
|
||||||
%span.badge.badge-pill= @group_members.size
|
%span.badge.badge-pill= @group_members.size
|
||||||
.float-right
|
.float-right
|
||||||
= link_to admin_group_path(@group), class: 'btn btn-xs' do
|
= link_to admin_group_path(@group), class: 'btn btn-sm' do
|
||||||
= icon('pencil-square-o', text: 'Manage access')
|
= icon('pencil-square-o', text: 'Manage access')
|
||||||
%ul.well-list.content-list.members-list
|
%ul.well-list.content-list.members-list
|
||||||
= render partial: 'shared/members/member', collection: @group_members, as: :member, locals: { show_controls: false }
|
= render partial: 'shared/members/member', collection: @group_members, as: :member, locals: { show_controls: false }
|
||||||
|
@ -179,7 +179,7 @@
|
||||||
project members
|
project members
|
||||||
%span.badge.badge-pill= @project.users.size
|
%span.badge.badge-pill= @project.users.size
|
||||||
.float-right
|
.float-right
|
||||||
= link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@project, :members]), class: "btn btn-xs"
|
= link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@project, :members]), class: "btn btn-sm"
|
||||||
%ul.well-list.project_members.content-list.members-list
|
%ul.well-list.project_members.content-list.members-list
|
||||||
= render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false }
|
= render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false }
|
||||||
.card-footer
|
.card-footer
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
= project.full_name
|
= project.full_name
|
||||||
%td
|
%td
|
||||||
.float-right
|
.float-right
|
||||||
= link_to 'Disable', [:admin, project.namespace.becomes(Namespace), project, runner_project], method: :delete, class: 'btn btn-danger btn-xs'
|
= link_to 'Disable', [:admin, project.namespace.becomes(Namespace), project, runner_project], method: :delete, class: 'btn btn-danger btn-sm'
|
||||||
|
|
||||||
%table.table.unassigned-projects
|
%table.table.unassigned-projects
|
||||||
%thead
|
%thead
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
.float-right
|
.float-right
|
||||||
= form_for [:admin, project.namespace.becomes(Namespace), project, project.runner_projects.new] do |f|
|
= form_for [:admin, project.namespace.becomes(Namespace), project, project.runner_projects.new] do |f|
|
||||||
= f.hidden_field :runner_id, value: @runner.id
|
= f.hidden_field :runner_id, value: @runner.id
|
||||||
= f.submit 'Enable', class: 'btn btn-xs'
|
= f.submit 'Enable', class: 'btn btn-sm'
|
||||||
= paginate @projects, theme: "gitlab"
|
= paginate @projects, theme: "gitlab"
|
||||||
|
|
||||||
.col-md-6
|
.col-md-6
|
||||||
|
|
|
@ -24,16 +24,16 @@
|
||||||
%td
|
%td
|
||||||
- if user
|
- if user
|
||||||
= link_to 'Remove user', admin_spam_log_path(spam_log, remove_user: true),
|
= link_to 'Remove user', admin_spam_log_path(spam_log, remove_user: true),
|
||||||
data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-xs btn-remove"
|
data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-sm btn-remove"
|
||||||
%td
|
%td
|
||||||
- if spam_log.submitted_as_ham?
|
- if spam_log.submitted_as_ham?
|
||||||
.btn.btn-xs.disabled
|
.btn.btn-sm.disabled
|
||||||
Submitted as ham
|
Submitted as ham
|
||||||
- else
|
- else
|
||||||
= link_to 'Submit as ham', mark_as_ham_admin_spam_log_path(spam_log), method: :post, class: 'btn btn-xs btn-warning'
|
= link_to 'Submit as ham', mark_as_ham_admin_spam_log_path(spam_log), method: :post, class: 'btn btn-sm btn-warning'
|
||||||
- if user && !user.blocked?
|
- if user && !user.blocked?
|
||||||
= link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-xs"
|
= link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-sm"
|
||||||
- else
|
- else
|
||||||
.btn.btn-xs.disabled
|
.btn.btn-sm.disabled
|
||||||
Already blocked
|
Already blocked
|
||||||
= link_to 'Remove log', [:admin, spam_log], remote: true, method: :delete, class: "btn btn-xs btn-close js-remove-tr"
|
= link_to 'Remove log', [:admin, spam_log], remote: true, method: :delete, class: "btn btn-sm btn-close js-remove-tr"
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
.float-right
|
.float-right
|
||||||
%span.light.vertical-align-middle= group_member.human_access
|
%span.light.vertical-align-middle= group_member.human_access
|
||||||
- unless group_member.owner?
|
- unless group_member.owner?
|
||||||
= link_to group_group_member_path(group, group_member), data: { confirm: remove_member_message(group_member) }, method: :delete, remote: true, class: "btn-xs btn btn-remove prepend-left-10", title: 'Remove user from group' do
|
= link_to group_group_member_path(group, group_member), data: { confirm: remove_member_message(group_member) }, method: :delete, remote: true, class: "btn-sm btn btn-remove prepend-left-10", title: 'Remove user from group' do
|
||||||
%i.fa.fa-times.fa-inverse
|
%i.fa.fa-times.fa-inverse
|
||||||
|
|
||||||
.row
|
.row
|
||||||
|
@ -44,5 +44,5 @@
|
||||||
%span.light.vertical-align-middle= member.human_access
|
%span.light.vertical-align-middle= member.human_access
|
||||||
|
|
||||||
- if member.respond_to? :project
|
- if member.respond_to? :project
|
||||||
= link_to project_project_member_path(project, member), data: { confirm: remove_member_message(member) }, remote: true, method: :delete, class: "btn-xs btn btn-remove prepend-left-10", title: 'Remove user from project' do
|
= link_to project_project_member_path(project, member), data: { confirm: remove_member_message(member) }, remote: true, method: :delete, class: "btn-sm btn btn-remove prepend-left-10", title: 'Remove user from project' do
|
||||||
%i.fa.fa-times
|
%i.fa.fa-times
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
%li
|
%li
|
||||||
%span.light Secondary email:
|
%span.light Secondary email:
|
||||||
%strong= email.email
|
%strong= email.email
|
||||||
= link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn-xs btn btn-remove float-right", title: 'Remove secondary email', id: "remove_email_#{email.id}" do
|
= link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn-sm btn btn-remove float-right", title: 'Remove secondary email', id: "remove_email_#{email.id}" do
|
||||||
%i.fa.fa-times
|
%i.fa.fa-times
|
||||||
|
|
||||||
%li.two-factor-status
|
%li.two-factor-status
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
%strong{ class: @user.two_factor_enabled? ? 'cgreen' : 'cred' }
|
%strong{ class: @user.two_factor_enabled? ? 'cgreen' : 'cred' }
|
||||||
- if @user.two_factor_enabled?
|
- if @user.two_factor_enabled?
|
||||||
Enabled
|
Enabled
|
||||||
= link_to 'Disable', disable_two_factor_admin_user_path(@user), data: {confirm: 'Are you sure?'}, method: :patch, class: 'btn btn-xs btn-remove float-right', title: 'Disable Two-factor Authentication'
|
= link_to 'Disable', disable_two_factor_admin_user_path(@user), data: {confirm: 'Are you sure?'}, method: :patch, class: 'btn btn-sm btn-remove float-right', title: 'Disable Two-factor Authentication'
|
||||||
- else
|
- else
|
||||||
Disabled
|
Disabled
|
||||||
|
|
||||||
|
|
|
@ -213,7 +213,7 @@
|
||||||
= link_to 'Auto DevOps', help_page_path('topics/autodevops/index.md')
|
= link_to 'Auto DevOps', help_page_path('topics/autodevops/index.md')
|
||||||
%span= _('uses Kubernetes clusters to deploy your code!')
|
%span= _('uses Kubernetes clusters to deploy your code!')
|
||||||
%hr
|
%hr
|
||||||
%button.btn.btn-create.btn-xs.dismiss-feature-highlight{ type: 'button' }
|
%button.btn.btn-create.btn-sm.dismiss-feature-highlight{ type: 'button' }
|
||||||
%span= _("Got it!")
|
%span= _("Got it!")
|
||||||
= sprite_icon('thumb-up')
|
= sprite_icon('thumb-up')
|
||||||
|
|
||||||
|
|
|
@ -32,13 +32,13 @@
|
||||||
.col-sm-6.milestone-actions
|
.col-sm-6.milestone-actions
|
||||||
- if can?(current_user, :admin_milestones, @group)
|
- if can?(current_user, :admin_milestones, @group)
|
||||||
- if milestone.group_milestone?
|
- if milestone.group_milestone?
|
||||||
= link_to edit_group_milestone_path(@group, milestone), class: "btn btn-xs btn-grouped" do
|
= link_to edit_group_milestone_path(@group, milestone), class: "btn btn-sm btn-grouped" do
|
||||||
Edit
|
Edit
|
||||||
\
|
\
|
||||||
- if milestone.closed?
|
- if milestone.closed?
|
||||||
= link_to 'Reopen Milestone', group_milestone_route(milestone, {state_event: :activate }), method: :put, class: "btn btn-xs btn-grouped btn-reopen"
|
= link_to 'Reopen Milestone', group_milestone_route(milestone, {state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen"
|
||||||
- else
|
- else
|
||||||
= link_to 'Close Milestone', group_milestone_route(milestone, {state_event: :close }), method: :put, class: "btn btn-xs btn-grouped btn-close"
|
= link_to 'Close Milestone', group_milestone_route(milestone, {state_event: :close }), method: :put, class: "btn btn-sm btn-grouped btn-close"
|
||||||
|
|
||||||
- if @project
|
- if @project
|
||||||
.row
|
.row
|
||||||
|
@ -46,12 +46,12 @@
|
||||||
= render('shared/milestone_expired', milestone: milestone)
|
= render('shared/milestone_expired', milestone: milestone)
|
||||||
.col-sm-6.milestone-actions
|
.col-sm-6.milestone-actions
|
||||||
- if can?(current_user, :admin_milestone, milestone.project) and milestone.active?
|
- if can?(current_user, :admin_milestone, milestone.project) and milestone.active?
|
||||||
= link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-xs btn-grouped" do
|
= link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-sm btn-grouped" do
|
||||||
Edit
|
Edit
|
||||||
\
|
\
|
||||||
|
|
||||||
- if @project.group
|
- if @project.group
|
||||||
%button.js-promote-project-milestone-button.btn.btn-xs.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'),
|
%button.js-promote-project-milestone-button.btn.btn-sm.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'),
|
||||||
disabled: true,
|
disabled: true,
|
||||||
type: 'button',
|
type: 'button',
|
||||||
data: { url: promote_project_milestone_path(milestone.project, milestone),
|
data: { url: promote_project_milestone_path(milestone.project, milestone),
|
||||||
|
@ -62,9 +62,9 @@
|
||||||
toggle: 'modal' } }
|
toggle: 'modal' } }
|
||||||
= _('Promote')
|
= _('Promote')
|
||||||
|
|
||||||
= link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-xs btn-close btn-grouped"
|
= link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close btn-grouped"
|
||||||
|
|
||||||
%button.js-delete-milestone-button.btn.btn-xs.btn-grouped.btn-danger{ data: { toggle: 'modal',
|
%button.js-delete-milestone-button.btn.btn-sm.btn-grouped.btn-danger{ data: { toggle: 'modal',
|
||||||
target: '#delete-milestone-modal',
|
target: '#delete-milestone-modal',
|
||||||
milestone_id: milestone.id,
|
milestone_id: milestone.id,
|
||||||
milestone_title: markdown_field(milestone, :title),
|
milestone_title: markdown_field(milestone, :title),
|
||||||
|
|
|
@ -32,4 +32,4 @@
|
||||||
= icon('file-image-o', class: 'toolbar-button-icon')
|
= icon('file-image-o', class: 'toolbar-button-icon')
|
||||||
Attach a file
|
Attach a file
|
||||||
|
|
||||||
%button.btn.btn-secondary.btn-xs.d-none.button-cancel-uploading-files{ type: 'button' } Cancel
|
%button.btn.btn-secondary.btn-sm.d-none.button-cancel-uploading-files{ type: 'button' } Cancel
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
.card
|
.card
|
||||||
.card-header
|
.card-header
|
||||||
.float-right
|
.float-right
|
||||||
%button.js-clipboard-trigger.btn.btn-xs{ title: t('sherlock.copy_to_clipboard'), type: :button }
|
%button.js-clipboard-trigger.btn.btn-sm{ title: t('sherlock.copy_to_clipboard'), type: :button }
|
||||||
%i.fa.fa-clipboard
|
%i.fa.fa-clipboard
|
||||||
%pre.hidden
|
%pre.hidden
|
||||||
= @query.formatted_query
|
= @query.formatted_query
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
.card
|
.card
|
||||||
.card-header
|
.card-header
|
||||||
.float-right
|
.float-right
|
||||||
%button.js-clipboard-trigger.btn.btn-xs{ title: t('sherlock.copy_to_clipboard'), type: :button }
|
%button.js-clipboard-trigger.btn.btn-sm{ title: t('sherlock.copy_to_clipboard'), type: :button }
|
||||||
%i.fa.fa-clipboard
|
%i.fa.fa-clipboard
|
||||||
%pre.hidden
|
%pre.hidden
|
||||||
= @query.explain
|
= @query.explain
|
||||||
|
|
|
@ -21,4 +21,4 @@
|
||||||
%td
|
%td
|
||||||
= link_to(t('sherlock.view'),
|
= link_to(t('sherlock.view'),
|
||||||
sherlock_transaction_file_sample_path(@transaction, sample),
|
sherlock_transaction_file_sample_path(@transaction, sample),
|
||||||
class: 'btn btn-xs')
|
class: 'btn btn-sm')
|
||||||
|
|
|
@ -21,4 +21,4 @@
|
||||||
%td
|
%td
|
||||||
= link_to(t('sherlock.view'),
|
= link_to(t('sherlock.view'),
|
||||||
sherlock_transaction_query_path(@transaction, query),
|
sherlock_transaction_query_path(@transaction, query),
|
||||||
class: 'btn btn-xs')
|
class: 'btn btn-sm')
|
||||||
|
|
|
@ -38,5 +38,5 @@
|
||||||
= time_ago_in_words(trans.finished_at)
|
= time_ago_in_words(trans.finished_at)
|
||||||
= t('sherlock.ago')
|
= t('sherlock.ago')
|
||||||
%td
|
%td
|
||||||
= link_to(sherlock_transaction_path(trans), class: 'btn btn-xs') do
|
= link_to(sherlock_transaction_path(trans), class: 'btn btn-sm') do
|
||||||
= t('sherlock.view')
|
= t('sherlock.view')
|
||||||
|
|
Loading…
Reference in New Issue