Skip to content

G
gitlab-ce
Commit 4bf59948 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

Merge branch 'dz-combine-green-buttons' into 'master' 

Unite green buttons under one css class

See merge request gitlab-org/gitlab-ce!21795
parents c6660e61 7f8a520f
Show whitespace changes
Inline Side-by-side
Showing with 168 additions and 174 deletions
app/assets/javascripts/boards/components/board_blank_state.vue
View file @ 4bf59948
......@@ -83,7 +83,7 @@ export default {
right on the way to making the most of your board.
</p>
<button
class="btn btn-create btn-inverted btn-block"
class="btn btn-success btn-inverted btn-block"
type="button"
@click.stop="addDefaultLists">
Add default lists
......
app/assets/javascripts/boards/index.js
View file @ 4bf59948
......@@ -229,7 +229,7 @@ export default () => {
template: `
<div class="board-extra-actions">
<button
class="btn btn-create prepend-left-10"
class="btn btn-success prepend-left-10"
type="button"
data-placement="bottom"
ref="addIssuesButton"
......
app/assets/javascripts/diffs/components/no_changes.vue
View file @ 4bf59948
......@@ -38,7 +38,7 @@ export default {
<div class="text-center">
<a
:href="newBlobPath"
class="btn btn-save"
class="btn btn-success"
>
{{ __('Create commit') }}
</a>
......
app/assets/javascripts/environments/components/empty_state.vue
View file @ 4bf59948
......@@ -35,7 +35,7 @@ code gets deployed, such as staging or production.`) }}
<a
v-if="canCreateEnvironment"
:href="newPath"
class="btn btn-create js-new-environment-button"
class="btn btn-success js-new-environment-button"
>
{{ s__("Environments|New environment") }}
</a>
......
app/assets/javascripts/environments/components/environments_app.vue
View file @ 4bf59948
......@@ -107,7 +107,7 @@
>
<a
:href="newEnvironmentPath"
class="btn btn-create"
class="btn btn-success"
>
{{ s__("Environments|New environment") }}
</a>
......
app/assets/javascripts/issue_show/components/edit_actions.vue
View file @ 4bf59948
......@@ -53,7 +53,7 @@
<button
:class="{ disabled: formState.updateLoading || !isSubmitEnabled }"
:disabled="formState.updateLoading || !isSubmitEnabled"
class="btn btn-save float-left"
class="btn btn-success float-left"
type="submit"
@click.prevent="updateIssuable">
Save changes
......
app/assets/javascripts/jobs/components/header.vue
View file @ 4bf59948
......@@ -57,7 +57,7 @@ export default {
actions.push({
label: 'New issue',
path: this.job.new_issue_path,
cssClass: 'js-new-issue btn btn-new btn-inverted d-none d-md-block d-lg-block d-xl-block',
cssClass: 'js-new-issue btn btn-success btn-inverted d-none d-md-block d-lg-block d-xl-block',
type: 'link',
});
}
......
app/assets/javascripts/jobs/components/sidebar_details_block.vue
View file @ 4bf59948
......@@ -130,7 +130,7 @@ export default {
<a
v-if="job.new_issue_path"
:href="job.new_issue_path"
class="js-new-issue btn btn-new btn-inverted"
class="js-new-issue btn btn-success btn-inverted"
>
{{ __('New issue') }}
</a>
......
app/assets/javascripts/notes/components/comment_form.vue
View file @ 4bf59948
......@@ -374,7 +374,7 @@ js-gfm-input js-autosize markdown-area js-vue-textarea"
append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown">
<button
:disabled="isSubmitButtonDisabled"
class="btn btn-create comment-btn js-comment-button js-comment-submit-button"
class="btn btn-success comment-btn js-comment-button js-comment-submit-button"
type="submit"
@click.prevent="handleSave()">
{{ __(commentButtonTitle) }}
......
app/assets/javascripts/notes/components/note_form.vue
View file @ 4bf59948
......@@ -188,7 +188,7 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea"
<button
:disabled="isDisabled"
type="button"
class="js-vue-issue-save btn btn-save js-comment-button "
class="js-vue-issue-save btn btn-success js-comment-button "
@click="handleUpdate()">
{{ saveButtonTitle }}
</button>
......
app/assets/javascripts/pipelines/components/nav_controls.vue
View file @ 4bf59948
......@@ -43,7 +43,7 @@ export default {
<a
v-if="newPipelinePath"
:href="newPipelinePath"
class="btn btn-create js-run-pipeline"
class="btn btn-success js-run-pipeline"
>
{{ s__('Pipelines|Run Pipeline') }}
</a>
......
app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
View file @ 4bf59948
......@@ -37,7 +37,7 @@ export default {
<a
v-if="mr.newBlobPath"
:href="mr.newBlobPath"
class="btn btn-inverted btn-save">
class="btn btn-inverted btn-success">
Create file
</a>
</div>
......
app/assets/stylesheets/framework/buttons.scss
View file @ 4bf59948
......@@ -147,18 +147,12 @@
}
&.btn-success,
&.btn-new,
&.btn-create,
&.btn-save,
&.btn-register {
@include btn-green;
}
&.btn-inverted {
&.btn-success,
&.btn-new,
&.btn-create,
&.btn-save {
&.btn-success {
@include btn-outline($white-light, $green-600, $green-500, $green-500, $white-light, $green-600, $green-600, $green-700);
}
......
app/assets/stylesheets/framework/snippets.scss
View file @ 4bf59948
......@@ -45,7 +45,7 @@
}
}
.snippet-scope-menu .btn-new {
.snippet-scope-menu .btn-success {
margin-top: 15px;
}
......
app/assets/stylesheets/pages/groups.scss
View file @ 4bf59948
......@@ -106,7 +106,7 @@
&,
.dropdown,
.dropdown .dropdown-toggle,
.btn-new {
.btn-success {
display: block;
}
......@@ -118,7 +118,7 @@
.group-filter-form,
.dropdown .dropdown-toggle,
.btn-new {
.btn-success {
width: 100%;
}
......
app/assets/stylesheets/pages/members.scss
View file @ 4bf59948
......@@ -4,7 +4,7 @@
}
.users-project-form {
.btn-create {
.btn-success {
margin-right: 10px;
}
}
......
app/assets/stylesheets/pages/note_form.scss
View file @ 4bf59948
......@@ -2,7 +2,7 @@
* Note Form
*/
.comment-btn {
@extend .btn-create;
@extend .btn-success;
}
.diff-file .diff-content {
......
app/assets/stylesheets/pages/search.scss
View file @ 4bf59948
......@@ -218,7 +218,7 @@ input[type='checkbox']:hover {
}
.btn-search,
.btn-new {
.btn-success {
width: 100%;
margin-top: 5px;
......
app/helpers/services_helper.rb
View file @ 4bf59948
......@@ -32,7 +32,7 @@ module ServicesHelper
end
def service_save_button(service)
button_tag(class: 'btn btn-save', type: 'submit', disabled: service.deprecated?) do
button_tag(class: 'btn btn-success', type: 'submit', disabled: service.deprecated?) do
icon('spinner spin', class: 'hidden js-btn-spinner') +
content_tag(:span, 'Save changes', class: 'js-btn-label')
end
......
app/views/abuse_reports/new.html.haml
View file @ 4bf59948
......@@ -19,4 +19,4 @@
Explain the problem with this user. If appropriate, provide a link to the relevant issue or comment.
.form-actions
= f.submit "Send report", class: "btn btn-create"
= f.submit "Send report", class: "btn btn-success"
app/views/admin/appearances/_form.html.haml
View file @ 4bf59948
......@@ -75,7 +75,7 @@
Guidelines parsed with #{link_to "GitLab Flavored Markdown", help_page_path('user/markdown'), target: '_blank'}.
.form-actions
= f.submit 'Save', class: 'btn btn-save append-right-10'
= f.submit 'Save', class: 'btn btn-success append-right-10'
- if @appearance.persisted?
Preview last save:
= link_to 'Sign-in page', preview_sign_in_admin_appearances_path, class: 'btn', target: '_blank', rel: 'noopener noreferrer'
......
app/views/admin/appearances/preview_sign_in.html.haml
View file @ 4bf59948
......@@ -8,5 +8,5 @@
= label_tag :password
= password_field_tag :password, nil, class: "form-control bottom", title: 'This field is required.'
.form-group
= button_tag "Sign in", class: "btn-create btn"
= button_tag "Sign in", class: "btn-success btn"
app/views/admin/applications/_form.html.haml
View file @ 4bf59948
......@@ -33,5 +33,5 @@
= render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes
.form-actions
= f.submit 'Submit', class: "btn btn-save wide"
= f.submit 'Submit', class: "btn btn-success wide"
= link_to "Cancel", admin_applications_path, class: "btn btn-cancel"
app/views/admin/broadcast_messages/_form.html.haml
View file @ 4bf59948
......@@ -36,6 +36,6 @@
= f.datetime_select :ends_at, {}, class: 'form-control form-control-inline'
.form-actions
- if @broadcast_message.persisted?
= f.submit "Update broadcast message", class: "btn btn-create"
= f.submit "Update broadcast message", class: "btn btn-success"
- else
= f.submit "Add broadcast message", class: "btn btn-create"
= f.submit "Add broadcast message", class: "btn btn-success"
app/views/admin/dashboard/index.html.haml
View file @ 4bf59948
......@@ -14,7 +14,7 @@
Projects:
= approximate_count_with_delimiters(@counts, Project)
%hr
= link_to('New project', new_project_path, class: "btn btn-new")
= link_to('New project', new_project_path, class: "btn btn-success")
.col-sm-4
.info-well.dark-well
.well-segment.well-centered
......@@ -24,7 +24,7 @@
= approximate_count_with_delimiters(@counts, User)
= render_if_exists 'admin/dashboard/users_statistics'
%hr
= link_to 'New user', new_admin_user_path, class: "btn btn-new"
= link_to 'New user', new_admin_user_path, class: "btn btn-success"
.col-sm-4
.info-well.dark-well
.well-segment.well-centered
......@@ -33,7 +33,7 @@
Groups:
= approximate_count_with_delimiters(@counts, Group)
%hr
= link_to 'New group', new_admin_group_path, class: "btn btn-new"
= link_to 'New group', new_admin_group_path, class: "btn btn-success"
.row
.col-md-4
.info-well
......
app/views/admin/deploy_keys/edit.html.haml
View file @ 4bf59948
......@@ -6,5 +6,5 @@
= form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
= render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
.form-actions
= f.submit 'Save changes', class: 'btn-save btn'
= f.submit 'Save changes', class: 'btn-success btn'
= link_to 'Cancel', admin_deploy_keys_path, class: 'btn btn-cancel'
app/views/admin/deploy_keys/index.html.haml
View file @ 4bf59948
......@@ -3,7 +3,7 @@
%h3.page-title.deploy-keys-title
Public deploy keys (#{@deploy_keys.count})
.float-right
= link_to 'New deploy key', new_admin_deploy_key_path, class: 'btn btn-new btn-sm btn-inverted'
= link_to 'New deploy key', new_admin_deploy_key_path, class: 'btn btn-success btn-sm btn-inverted'
- if @deploy_keys.any?
.table-holder.deploy-keys-list
......
app/views/admin/deploy_keys/new.html.haml
View file @ 4bf59948
......@@ -6,5 +6,5 @@
= form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
= render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
.form-actions
= f.submit 'Create', class: 'btn-create btn'
= f.submit 'Create', class: 'btn-success btn'
= link_to 'Cancel', admin_deploy_keys_path, class: 'btn btn-cancel'
app/views/admin/groups/_form.html.haml
View file @ 4bf59948
......@@ -26,12 +26,12 @@
.alert.alert-info
= render 'shared/group_tips'
.form-actions
= f.submit _('Create group'), class: "btn btn-create"
= f.submit _('Create group'), class: "btn btn-success"
= link_to _('Cancel'), admin_groups_path, class: "btn btn-cancel"
- else
.form-actions
= f.submit _('Save changes'), class: "btn btn-save"
= f.submit _('Save changes'), class: "btn btn-success"
= link_to _('Cancel'), admin_group_path(@group), class: "btn btn-cancel"
= render_if_exists 'ldap_group_links/ldap_syncrhonizations', group: @group
app/views/admin/groups/index.html.haml
View file @ 4bf59948
......@@ -12,7 +12,7 @@
= search_field_tag :name, project_name, class: "form-control search-text-input js-search-input", autofocus: true, spellcheck: false, placeholder: 'Search by name'
= icon("search", class: "search-icon")
= render "shared/groups/dropdown", options_hash: admin_groups_sort_options_hash
= link_to new_admin_group_path, class: "btn btn-new" do
= link_to new_admin_group_path, class: "btn btn-success" do
= _('New group')
%ul.content-list
= render @groups
......
app/views/admin/groups/show.html.haml
View file @ 4bf59948
......@@ -111,7 +111,7 @@
.prepend-top-10
= select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2"
%hr
= button_tag _('Add users to group'), class: "btn btn-create"
= button_tag _('Add users to group'), class: "btn btn-success"
= render 'shared/members/requests', membership_source: @group, requesters: @requesters, force_mobile_view: true
.card
......
app/views/admin/hooks/edit.html.haml
View file @ 4bf59948
......@@ -12,7 +12,7 @@
= form_for @hook, as: :hook, url: admin_hook_path do |f|
= render partial: 'form', locals: { form: f, hook: @hook }
.form-actions
= f.submit 'Save changes', class: 'btn btn-create'
= f.submit 'Save changes', class: 'btn btn-success'
= render 'shared/web_hooks/test_button', triggers: SystemHook.triggers, hook: @hook
= link_to 'Remove', admin_hook_path(@hook), method: :delete, class: 'btn btn-remove float-right', data: { confirm: 'Are you sure?' }
......
app/views/admin/hooks/index.html.haml
View file @ 4bf59948
......@@ -10,7 +10,7 @@
.col-lg-8.append-bottom-default
= form_for @hook, as: :hook, url: admin_hooks_path do |f|
= render partial: 'form', locals: { form: f, hook: @hook }
= f.submit 'Add system hook', class: 'btn btn-create'
= f.submit 'Add system hook', class: 'btn btn-success'
%hr
......
app/views/admin/identities/_form.html.haml
View file @ 4bf59948
......@@ -12,5 +12,5 @@
= f.text_field :extern_uid, class: 'form-control', required: true
.form-actions
= f.submit _('Save changes'), class: "btn btn-save"
= f.submit _('Save changes'), class: "btn btn-success"
app/views/admin/identities/index.html.haml
View file @ 4bf59948
......@@ -3,7 +3,7 @@
- page_title _("Identities"), @user.name, _("Users")
= render 'admin/users/head'
= link_to _('New identity'), new_admin_user_identity_path, class: 'float-right btn btn-new'
= link_to _('New identity'), new_admin_user_identity_path, class: 'float-right btn btn-success'
- if @identities.present?
.table-holder
%table.table
......
app/views/admin/labels/_form.html.haml
View file @ 4bf59948
......@@ -27,5 +27,5 @@
&nbsp;
.form-actions
= f.submit _('Save'), class: 'btn btn-save js-save-button'
= f.submit _('Save'), class: 'btn btn-success js-save-button'
= link_to _("Cancel"), admin_labels_path, class: 'btn btn-cancel'
app/views/admin/labels/index.html.haml
View file @ 4bf59948
- page_title _("Labels")
%div
= link_to new_admin_label_path, class: "float-right btn btn-nr btn-new" do
= link_to new_admin_label_path, class: "float-right btn btn-nr btn-success" do
= _('New label')
%h3.page-title
= _('Labels')
......
app/views/admin/projects/index.html.haml
View file @ 4bf59948
......@@ -21,7 +21,7 @@
= dropdown_content
= dropdown_loading
= render 'shared/projects/dropdown'
= link_to new_project_path, class: 'btn btn-new' do
= link_to new_project_path, class: 'btn btn-success' do
New Project
= button_tag "Search", class: "btn btn-primary btn-search hide"
......
app/views/admin/services/_form.html.haml
View file @ 4bf59948
......@@ -7,4 +7,4 @@
= render 'shared/service_settings', form: form, subject: @service
.footer-block.row-content-block
= form.submit 'Save', class: 'btn btn-save'
= form.submit 'Save', class: 'btn btn-success'
app/views/admin/users/_form.html.haml
View file @ 4bf59948
......@@ -75,8 +75,8 @@
.form-actions
- if @user.new_record?
= f.submit 'Create user', class: "btn btn-create"
= f.submit 'Create user', class: "btn btn-success"
= link_to 'Cancel', admin_users_path, class: "btn btn-cancel"
- else
= f.submit 'Save changes', class: "btn btn-save"
= f.submit 'Save changes', class: "btn btn-success"
= link_to 'Cancel', admin_user_path(@user), class: "btn btn-cancel"
app/views/admin/users/index.html.haml
View file @ 4bf59948
......@@ -31,7 +31,7 @@
= sort_title_recently_updated
= link_to admin_users_path(sort: sort_value_oldest_updated, filter: params[:filter]) do
= sort_title_oldest_updated
= link_to 'New user', new_admin_user_path, class: 'btn btn-new btn-search'
= link_to 'New user', new_admin_user_path, class: 'btn btn-success btn-search'
.top-area.scrolling-tabs-container.inner-page-scroll-tabs
.fade-left
......
app/views/dashboard/_groups_head.html.haml
View file @ 4bf59948
......@@ -10,4 +10,4 @@
= render 'shared/groups/search_form'
= render 'shared/groups/dropdown'
- if current_user.can_create_group?
= link_to _("New group"), new_group_path, class: "btn btn-new"
= link_to _("New group"), new_group_path, class: "btn btn-success"
app/views/dashboard/_projects_head.html.haml
View file @ 4bf59948
......@@ -19,4 +19,4 @@
= render 'shared/projects/search_form'
= render 'shared/projects/dropdown'
- if current_user.can_create_project?
= link_to "New project", new_project_path, class: "btn btn-new"
= link_to "New project", new_project_path, class: "btn btn-success"
app/views/dashboard/_snippets_head.html.haml
View file @ 4bf59948
......@@ -9,4 +9,4 @@
- if current_user
.nav-controls.d-none.d-sm-block
= link_to "New snippet", new_snippet_path, class: "btn btn-new", title: "New snippet"
= link_to "New snippet", new_snippet_path, class: "btn btn-success", title: "New snippet"
app/views/dashboard/snippets/index.html.haml
View file @ 4bf59948
......@@ -7,7 +7,7 @@
.d-block.d-sm-none
&nbsp;
= link_to new_snippet_path, class: "btn btn-new btn-block", title: "New snippet" do
= link_to new_snippet_path, class: "btn btn-success btn-block", title: "New snippet" do
New snippet
= render partial: 'snippets/snippets', locals: { link_project: true }
app/views/devise/sessions/_new_base.html.haml
View file @ 4bf59948
......@@ -17,4 +17,4 @@
= recaptcha_tags
.submit-container.move-submit-down
= f.submit "Sign in", class: "btn btn-save qa-sign-in-button"
= f.submit "Sign in", class: "btn btn-success qa-sign-in-button"
app/views/devise/sessions/_new_crowd.html.haml
View file @ 4bf59948
......@@ -10,4 +10,4 @@
%label{ for: "remember_me" }
= check_box_tag :remember_me, '1', false, id: 'remember_me'
%span Remember me
= submit_tag "Sign in", class: "btn-save btn"
= submit_tag "Sign in", class: "btn-success btn"
app/views/devise/sessions/_new_ldap.html.haml
View file @ 4bf59948
......@@ -10,4 +10,4 @@
%label{ for: "remember_me" }
= check_box_tag :remember_me, '1', false, id: 'remember_me'
%span Remember me
= submit_tag "Sign in", class: "btn-save btn qa-sign-in-button"
= submit_tag "Sign in", class: "btn-success btn qa-sign-in-button"
app/views/devise/sessions/two_factor.html.haml
View file @ 4bf59948
......@@ -11,7 +11,7 @@
= f.text_field :otp_attempt, class: 'form-control', required: true, autofocus: true, autocomplete: 'off', title: 'This field is required.'
%p.form-text.text-muted.hint Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.
.prepend-top-20
= f.submit "Verify code", class: "btn btn-save"
= f.submit "Verify code", class: "btn btn-success"
- if @user.two_factor_u2f_enabled?
= render "u2f/authenticate", locals: { params: params, resource: resource, resource_name: resource_name }
app/views/doorkeeper/applications/_form.html.haml
View file @ 4bf59948
......@@ -20,4 +20,4 @@
= render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes
.prepend-top-default
= f.submit _('Save application'), class: "btn btn-create"
= f.submit _('Save application'), class: "btn btn-success"
app/views/groups/group_members/_new_group_member.html.haml
View file @ 4bf59948
......@@ -19,4 +19,4 @@
On this date, the member(s) will automatically lose access to this group and all of its projects.
.col-md-2
= f.submit 'Add to group', class: "btn btn-create btn-block"
= f.submit 'Add to group', class: "btn btn-success btn-block"
app/views/groups/labels/index.html.haml
View file @ 4bf59948
......@@ -7,7 +7,7 @@
- if can_admin_label
- content_for(:header_content) do
.nav-controls
= link_to _('New label'), new_group_label_path(@group), class: "btn btn-new"
= link_to _('New label'), new_group_label_path(@group), class: "btn btn-success"
- if @labels.exists? || search.present?
#promote-label-modal
......
app/views/groups/milestones/_form.html.haml
View file @ 4bf59948
......@@ -19,9 +19,9 @@
.form-actions
- if @milestone.new_record?
= f.submit 'Create milestone', class: "btn-create btn"
= f.submit 'Create milestone', class: "btn-success btn"
= link_to "Cancel", group_milestones_path(@group), class: "btn btn-cancel"
- else
= f.submit 'Update milestone', class: "btn-create btn"
= f.submit 'Update milestone', class: "btn-success btn"
= link_to "Cancel", group_milestone_path(@group, @milestone), class: "btn btn-cancel"
app/views/groups/milestones/index.html.haml
View file @ 4bf59948
......@@ -6,7 +6,7 @@
.nav-controls
= render 'shared/milestones_sort_dropdown'
- if can?(current_user, :admin_milestone, @group)
= link_to "New milestone", new_group_milestone_path(@group), class: "btn btn-new"
= link_to "New milestone", new_group_milestone_path(@group), class: "btn btn-success"
.milestones
%ul.content-list
......
app/views/groups/new.html.haml
View file @ 4bf59948
......@@ -36,5 +36,5 @@
= render 'shared/group_tips'
.form-actions
= f.submit 'Create group', class: "btn btn-create"
= f.submit 'Create group', class: "btn btn-success"
= link_to 'Cancel', dashboard_groups_path, class: 'btn btn-cancel'
app/views/help/ui.html.haml
View file @ 4bf59948
......@@ -189,7 +189,7 @@
%li
= link_to 'Sort by date', '#'
= link_to 'New issue', '#', class: 'btn btn-new btn-inverted'
= link_to 'New issue', '#', class: 'btn btn-success btn-inverted'
.lead
Only nav links without button and search
......
app/views/import/fogbugz/new.html.haml
View file @ 4bf59948
......@@ -21,4 +21,4 @@
.col-md-4
= password_field_tag :password, nil, class: 'form-control'
.form-actions
= submit_tag _('Continue to the next step'), class: 'btn btn-create'
= submit_tag _('Continue to the next step'), class: 'btn btn-success'
app/views/import/fogbugz/new_user_map.html.haml
View file @ 4bf59948
......@@ -39,4 +39,4 @@
scope: :all, email_user: true, selected: user[:gitlab_user])
.form-actions
= submit_tag _('Continue to the next step'), class: 'btn btn-create'
= submit_tag _('Continue to the next step'), class: 'btn btn-success'
app/views/import/gitea/new.html.haml
View file @ 4bf59948
......@@ -19,4 +19,4 @@
.col-sm-4
= text_field_tag :personal_access_token, nil, class: 'form-control'
.form-actions
= submit_tag _('List Your Gitea Repositories'), class: 'btn btn-create'
= submit_tag _('List Your Gitea Repositories'), class: 'btn btn-success'
app/views/import/gitlab_projects/new.html.haml
View file @ 4bf59948
......@@ -41,5 +41,5 @@
= file_field_tag :file, class: ''
.row
.form-actions.col-sm-12
= submit_tag _('Import project'), class: 'btn btn-create'
= submit_tag _('Import project'), class: 'btn btn-success'
= link_to _('Cancel'), new_project_path, class: 'btn btn-cancel'
app/views/import/google_code/new.html.haml
View file @ 4bf59948
......@@ -59,4 +59,4 @@
= _('Yes, let me map Google Code users to full names or GitLab users.')
%li
%p
= submit_tag _('Continue to the next step'), class: "btn btn-create"
= submit_tag _('Continue to the next step'), class: "btn btn-success"
app/views/import/google_code/new_user_map.html.haml
View file @ 4bf59948
......@@ -33,4 +33,4 @@
= text_area_tag :user_map, JSON.pretty_generate(@user_map), class: 'form-control', rows: 15
.form-actions
= submit_tag _('Continue to the next step'), class: "btn btn-create"
= submit_tag _('Continue to the next step'), class: "btn btn-success"
app/views/layouts/nav/sidebar/_project.html.haml
View file @ 4bf59948
......@@ -245,7 +245,7 @@
= link_to _('Auto DevOps'), help_page_path('topics/autodevops/index.md')
%span= _('uses Kubernetes clusters to deploy your code!')
%hr
%button.btn.btn-create.btn-sm.dismiss-feature-highlight{ type: 'button' }
%button.btn.btn-success.btn-sm.dismiss-feature-highlight{ type: 'button' }
%span= _("Got it!")
= sprite_icon('thumb-up')
......
app/views/profiles/emails/index.html.haml
View file @ 4bf59948
......@@ -15,7 +15,7 @@
= f.label :email, class: 'label-bold'
= f.text_field :email, class: 'form-control'
.prepend-top-default
= f.submit 'Add email address', class: 'btn btn-create'
= f.submit 'Add email address', class: 'btn btn-success'
%hr
%h4.prepend-top-0
Linked emails (#{@emails.count + 1})
......
app/views/profiles/gpg_keys/_form.html.haml
View file @ 4bf59948
......@@ -7,4 +7,4 @@
= f.text_area :key, class: "form-control", rows: 8, required: true, placeholder: "Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'."
.prepend-top-default
= f.submit 'Add key', class: "btn btn-create"
= f.submit 'Add key', class: "btn btn-success"
app/views/profiles/keys/_form.html.haml
View file @ 4bf59948
......@@ -16,7 +16,7 @@
%strong= _('Oops, are you sure?')
%p= s_("Profiles|This doesn't look like a public SSH key, are you sure you want to add it?")
%button.btn.btn-create.js-add-ssh-key-validation-confirm-submit= _("Yes, add it")
%button.btn.btn-success.js-add-ssh-key-validation-confirm-submit= _("Yes, add it")
.prepend-top-default
= f.submit s_('Profiles|Add key'), class: "btn btn-create js-add-ssh-key-validation-original-submit qa-add-key-button"
= f.submit s_('Profiles|Add key'), class: "btn btn-success js-add-ssh-key-validation-original-submit qa-add-key-button"
app/views/profiles/passwords/edit.html.haml
View file @ 4bf59948
......@@ -29,6 +29,6 @@
= f.label :password_confirmation, class: 'label-bold'
= f.password_field :password_confirmation, required: true, class: 'form-control'
.prepend-top-default.append-bottom-default
= f.submit 'Save password', class: "btn btn-create append-right-10"
= f.submit 'Save password', class: "btn btn-success append-right-10"
- unless @user.password_automatically_set?
= link_to "I forgot my password", reset_profile_password_path, method: :put, class: "account-btn-link"
app/views/profiles/passwords/new.html.haml
View file @ 4bf59948
......@@ -22,4 +22,4 @@
.col-sm-10
= f.password_field :password_confirmation, required: true, class: 'form-control'
.form-actions
= f.submit 'Set new password', class: "btn btn-create"
= f.submit 'Set new password', class: "btn btn-success"
app/views/profiles/preferences/show.html.haml
View file @ 4bf59948
......@@ -58,4 +58,4 @@
.form-text.text-muted
Choose what content you want to see on a project’s overview page
.form-group
= f.submit 'Save changes', class: 'btn btn-save'
= f.submit 'Save changes', class: 'btn btn-success'
app/views/projects/_commit_button.html.haml
View file @ 4bf59948
.form-actions
= button_tag 'Commit changes', class: 'btn commit-btn js-commit-button btn-create'
= button_tag 'Commit changes', class: 'btn commit-btn js-commit-button btn-success'
= link_to 'Cancel', cancel_path,
class: 'btn btn-cancel', data: {confirm: leave_edit_message}
......
app/views/projects/_fork_suggestion.html.haml
View file @ 4bf59948
......@@ -6,6 +6,6 @@
edit
files in this project directly. Please fork this project,
make your changes there, and submit a merge request.
= link_to 'Fork', nil, method: :post, class: 'js-fork-suggestion-button btn btn-grouped btn-inverted btn-new'
= link_to 'Fork', nil, method: :post, class: 'js-fork-suggestion-button btn btn-grouped btn-inverted btn-success'
%button.js-cancel-fork-suggestion-button.btn.btn-grouped{ type: 'button' }
Cancel
app/views/projects/_new_project_fields.html.haml
View file @ 4bf59948
......@@ -60,5 +60,5 @@
.option-description
Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository.
= f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4
= f.submit 'Create project', class: "btn btn-success project-submit", tabindex: 4
= link_to 'Cancel', dashboard_projects_path, class: 'btn btn-cancel'
app/views/projects/_readme.html.haml
View file @ 4bf59948
......@@ -20,4 +20,4 @@
distributed with computer software, forming part of its documentation.
GitLab will render it here instead of this message.
%p
= link_to "Add Readme", @project.add_readme_path, class: 'btn btn-new'
= link_to "Add Readme", @project.add_readme_path, class: 'btn btn-success'
app/views/projects/blob/_new_dir.html.haml
View file @ 4bf59948
......@@ -15,7 +15,7 @@
= render 'shared/new_commit_form', placeholder: _("Add new directory")
.form-actions
= submit_tag _("Create directory"), class: 'btn btn-create'
= submit_tag _("Create directory"), class: 'btn btn-success'
= link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
= render 'shared/projects/edit_information'
app/views/projects/blob/_upload.html.haml
View file @ 4bf59948
......@@ -20,7 +20,7 @@
= render 'shared/new_commit_form', placeholder: placeholder
.form-actions
= button_tag class: 'btn btn-create btn-upload-file', id: 'submit-all', type: 'button' do
= button_tag class: 'btn btn-success btn-upload-file', id: 'submit-all', type: 'button' do
= icon('spin spinner', class: 'js-loading-icon hidden' )
= button_title
= link_to _("Cancel"), '#', class: "btn btn-cancel", "data-dismiss" => "modal"
......
app/views/projects/branches/index.html.haml
View file @ 4bf59948
......@@ -41,7 +41,7 @@
data: { confirm: s_('Branches|Deleting the merged branches cannot be undone. Are you sure?'),
container: 'body' } do
= s_('Branches|Delete merged branches')
= link_to new_project_branch_path(@project), class: 'btn btn-create' do
= link_to new_project_branch_path(@project), class: 'btn btn-success' do
= s_('Branches|New branch')
- if can?(current_user, :admin_project, @project)
......
app/views/projects/branches/new.html.haml
View file @ 4bf59948
......@@ -26,7 +26,7 @@
= render 'shared/ref_dropdown', dropdown_class: 'wide'
.form-text.text-muted Existing branch name, tag, or commit SHA
.form-actions
= button_tag 'Create branch', class: 'btn btn-create', tabindex: 3
= button_tag 'Create branch', class: 'btn btn-success', tabindex: 3
= link_to 'Cancel', project_branches_path(@project), class: 'btn btn-cancel'
-# haml-lint:disable InlineJavaScript
%script#availableRefs{ type: "application/json" }= @project.repository.ref_names.to_json.html_safe
app/views/projects/commit/_change.html.haml
View file @ 4bf59948
......@@ -33,7 +33,7 @@
- else
= hidden_field_tag 'create_merge_request', 1, id: nil
.form-actions
= submit_tag label, class: 'btn btn-create'
= submit_tag label, class: 'btn btn-success'
= link_to _("Cancel"), '#', class: "btn btn-cancel", "data-dismiss" => "modal"
= render 'shared/projects/edit_information'
app/views/projects/compare/_form.html.haml
View file @ 4bf59948
......@@ -22,7 +22,7 @@
.dropdown-toggle-text.str-truncated= params[:from] || _("Select branch/tag")
= render 'shared/ref_dropdown'
&nbsp;
= button_tag s_("CompareBranches|Compare"), class: "btn btn-create commits-compare-btn"
= button_tag s_("CompareBranches|Compare"), class: "btn btn-success commits-compare-btn"
- if @merge_request.present?
= link_to _("View open merge request"), project_merge_request_path(@project, @merge_request), class: 'prepend-left-10 btn'
- elsif create_mr_button?
......
app/views/projects/deploy_keys/_form.html.haml
View file @ 4bf59948
......@@ -21,4 +21,4 @@
Allow this key to push to repository as well? (Default only allows pull access.)
.form-group.row
= f.submit "Add key", class: "btn-create btn"
= f.submit "Add key", class: "btn-success btn"
app/views/projects/deploy_keys/edit.html.haml
View file @ 4bf59948
......@@ -6,5 +6,5 @@
= form_for [@project.namespace.becomes(Namespace), @project, @deploy_key], html: { class: 'js-requires-input' } do |f|
= render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
.form-actions
= f.submit 'Save changes', class: 'btn-save btn'
= f.submit 'Save changes', class: 'btn-success btn'
= link_to 'Cancel', project_settings_repository_path(@project), class: 'btn btn-cancel'
app/views/projects/edit.html.haml
View file @ 4bf59948
......@@ -59,7 +59,7 @@
- if @project.avatar?
%hr
= link_to _('Remove avatar'), project_avatar_path(@project), data: { confirm: _("Avatar will be removed. Are you sure?") }, method: :delete, class: "btn btn-danger btn-inverted"
= f.submit 'Save changes', class: "btn btn-success js-btn-save-general-project-settings"
= f.submit 'Save changes', class: "btn btn-success js-btn-success-general-project-settings"
%section.settings.sharing-permissions.no-animate#js-shared-permissions{ class: ('expanded' if expanded) }
.settings-header
......@@ -75,7 +75,7 @@
-# haml-lint:disable InlineJavaScript
%script.js-project-permissions-form-data{ type: "application/json" }= project_permissions_panel_data_json(@project)
.js-project-permissions-form
= f.submit 'Save changes', class: "btn btn-save"
= f.submit 'Save changes', class: "btn btn-success"
= render_if_exists 'projects/issues_settings'
......@@ -93,7 +93,7 @@
= form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "merge-request-settings-form" }, authenticity_token: true do |f|
%input{ name: 'update_section', type: 'hidden', value: 'js-merge-request-settings' }
= render 'projects/merge_request_settings', form: f
= f.submit 'Save changes', class: "btn btn-save qa-save-merge-request-changes"
= f.submit 'Save changes', class: "btn btn-success qa-save-merge-request-changes"
= render_if_exists 'projects/service_desk_settings'
......
app/views/projects/environments/_form.html.haml
View file @ 4bf59948
......@@ -18,5 +18,5 @@
= f.url_field :external_url, class: 'form-control'
.form-actions
= f.submit 'Save', class: 'btn btn-save'
= f.submit 'Save', class: 'btn btn-success'
= link_to 'Cancel', project_environments_path(@project), class: 'btn btn-cancel'
app/views/projects/forks/index.html.haml
View file @ 4bf59948
......@@ -30,11 +30,11 @@
- if current_user && can?(current_user, :fork_project, @project)
- if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
= link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-new' do
= link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-success' do
= sprite_icon('fork', size: 12)
%span Fork
- else
= link_to new_project_fork_path(@project), title: "Fork project", class: 'btn btn-new' do
= link_to new_project_fork_path(@project), title: "Fork project", class: 'btn btn-success' do
= sprite_icon('fork', size: 12)
%span Fork
......
app/views/projects/hooks/_index.html.haml
View file @ 4bf59948
......@@ -9,7 +9,7 @@
.col-lg-8.append-bottom-default
= form_for @hook, as: :hook, url: polymorphic_path([@project.namespace.becomes(Namespace), @project, :hooks]) do |f|
= render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
= f.submit 'Add webhook', class: 'btn btn-create'
= f.submit 'Add webhook', class: 'btn btn-success'
%hr
%h5.prepend-top-default
......
app/views/projects/hooks/edit.html.haml
View file @ 4bf59948
......@@ -11,7 +11,7 @@
= form_for [@project.namespace.becomes(Namespace), @project, @hook], as: :hook, url: project_hook_path(@project, @hook) do |f|
= render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
= f.submit 'Save changes', class: 'btn btn-create'
= f.submit 'Save changes', class: 'btn btn-success'
= render 'shared/web_hooks/test_button', triggers: ProjectHook.triggers, hook: @hook
= link_to 'Remove', project_hook_path(@project, @hook), method: :delete, class: 'btn btn-remove float-right', data: { confirm: 'Are you sure?' }
......
app/views/projects/imports/new.html.haml
View file @ 4bf59948
......@@ -16,4 +16,4 @@
= render "shared/import_form", f: f
.form-actions
= f.submit 'Start import', class: "btn btn-create", tabindex: 4
= f.submit 'Start import', class: "btn btn-success", tabindex: 4
app/views/projects/issues/_nav_btns.html.haml
View file @ 4bf59948
......@@ -6,6 +6,6 @@
= link_to "New issue", new_project_issue_path(@project,
issue: { assignee_id: finder.assignee.try(:id),
milestone_id: finder.milestones.first.try(:id) }),
class: "btn btn-new",
class: "btn btn-success",
title: "New issue",
id: "new_issue_link"
app/views/projects/issues/show.html.haml
View file @ 4bf59948
......@@ -55,7 +55,7 @@
- if can_report_spam
= link_to 'Submit as spam', mark_as_spam_project_issue_path(@project, @issue), method: :post, class: 'd-none d-sm-none d-md-block btn btn-grouped btn-spam', title: 'Submit as spam'
- if can_create_issue
= link_to new_project_issue_path(@project), class: 'd-none d-sm-none d-md-block btn btn-grouped new-issue-link btn-new btn-inverted', title: 'New issue', id: 'new_issue_link' do
= link_to new_project_issue_path(@project), class: 'd-none d-sm-none d-md-block btn btn-grouped new-issue-link btn-success btn-inverted', title: 'New issue', id: 'new_issue_link' do
New issue
.issue-details.issuable-details
......
app/views/projects/jobs/_header.html.haml
View file @ 4bf59948
......@@ -24,7 +24,7 @@
- if show_controls
.nav-controls
- if can?(current_user, :create_issue, @project) && @build.failed?
= link_to "New issue", new_project_issue_path(@project, issue: build_failed_issue_options), class: 'btn btn-new btn-inverted'
= link_to "New issue", new_project_issue_path(@project, issue: build_failed_issue_options), class: 'btn btn-success 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-default.float-right.d-block.d-sm-none.d-md-none.build-gutter-toggle.js-sidebar-build-toggle{ role: "button", type: "button" }
......
app/views/projects/labels/index.html.haml
View file @ 4bf59948
......@@ -6,7 +6,7 @@
- if can_admin_label
- content_for(:header_content) do
.nav-controls
= link_to _('New label'), new_project_label_path(@project), class: "btn btn-new"
= link_to _('New label'), new_project_label_path(@project), class: "btn btn-success"
- if @labels.exists? || @prioritized_labels.exists? || search.present?
#promote-label-modal
......
app/views/projects/mattermosts/_team_selection.html.haml
View file @ 4bf59948
......@@ -43,4 +43,4 @@
.clearfix
.float-right
= link_to 'Cancel', edit_project_service_path(@project, @service), class: 'btn btn-lg'
= f.submit 'Install', class: 'btn btn-save btn-lg'
= f.submit 'Install', class: 'btn btn-success btn-lg'
app/views/projects/merge_requests/_nav_btns.html.haml
View file @ 4bf59948
- if @can_bulk_update
= button_tag "Edit merge requests", class: "btn append-right-10 js-bulk-update-toggle"
- if merge_project
= link_to new_merge_request_path, class: "btn btn-new", title: "New merge request" do
= link_to new_merge_request_path, class: "btn btn-success", title: "New merge request" do
New merge request
app/views/projects/merge_requests/creations/_new_compare.html.haml
View file @ 4bf59948
......@@ -61,4 +61,4 @@
- if @merge_request.errors.any?
= form_errors(@merge_request)
= f.submit 'Compare branches and continue', class: "btn btn-new mr-compare-btn"
= f.submit 'Compare branches and continue', class: "btn btn-success mr-compare-btn"
app/views/projects/merge_requests/diffs/_diffs.html.haml
View file @ 4bf59948
......@@ -14,7 +14,7 @@
%span.ref-name= @merge_request.source_branch
and
%span.ref-name= @merge_request.target_branch
.text-center= link_to 'Create commit', project_new_blob_path(@project, @merge_request.source_branch), class: 'btn btn-save'
.text-center= link_to 'Create commit', project_new_blob_path(@project, @merge_request.source_branch), class: 'btn btn-success'
- else
- diff_viewable = @merge_request_diff ? @merge_request_diff.viewable? : true
- if diff_viewable
......
app/views/projects/milestones/_form.html.haml
View file @ 4bf59948
......@@ -20,8 +20,8 @@
.form-actions
- if @milestone.new_record?
= f.submit 'Create milestone', class: "btn-create btn qa-milestone-create-button"
= f.submit 'Create milestone', class: "btn-success btn qa-milestone-create-button"
= link_to "Cancel", project_milestones_path(@project), class: "btn btn-cancel"
- else
= f.submit 'Save changes', class: "btn-save btn"
= f.submit 'Save changes', class: "btn-success btn"
= link_to "Cancel", project_milestone_path(@project, @milestone), class: "btn btn-cancel"
app/views/projects/milestones/index.html.haml
View file @ 4bf59948
......@@ -8,7 +8,7 @@
.nav-controls
= render 'shared/milestones_sort_dropdown'
- if can?(current_user, :admin_milestone, @project)
= link_to new_project_milestone_path(@project), class: "btn btn-new qa-new-project-milestone", title: 'New milestone' do
= link_to new_project_milestone_path(@project), class: "btn btn-success qa-new-project-milestone", title: 'New milestone' do
New milestone
.milestones
......
app/views/projects/mirrors/_mirror_repos.html.haml
View file @ 4bf59948
......@@ -32,7 +32,7 @@
= link_to icon('question-circle'), help_page_path('user/project/protected_branches')
.panel-footer
= f.submit _('Mirror repository'), class: 'btn btn-create', name: :update_remote_mirror
= f.submit _('Mirror repository'), class: 'btn btn-success', name: :update_remote_mirror
.panel.panel-default
.table-responsive
......
app/views/projects/pages/show.html.haml
View file @ 4bf59948
......@@ -4,7 +4,7 @@
Pages
- if can?(current_user, :update_pages, @project) && (Gitlab.config.pages.external_http || Gitlab.config.pages.external_https)
= link_to new_project_pages_domain_path(@project), class: 'btn btn-new float-right', title: 'New Domain' do
= link_to new_project_pages_domain_path(@project), class: 'btn btn-success float-right', title: 'New Domain' do
New Domain
%p.light
......
app/views/projects/pages_domains/edit.html.haml
View file @ 4bf59948
......@@ -8,4 +8,4 @@
= form_for [@project.namespace.becomes(Namespace), @project, @domain], html: { class: 'fieldset-form' } do |f|
= render 'form', { f: f }
.form-actions
= f.submit 'Save Changes', class: "btn btn-save"
= f.submit 'Save Changes', class: "btn btn-success"
app/views/projects/pages_domains/new.html.haml
View file @ 4bf59948
......@@ -7,6 +7,6 @@
= form_for [@project.namespace.becomes(Namespace), @project, @domain], html: { class: 'fieldset-form' } do |f|
= render 'form', { f: f }
.form-actions
= f.submit 'Create New Domain', class: "btn btn-save"
= f.submit 'Create New Domain', class: "btn btn-success"
.float-right
= link_to _('Cancel'), project_pages_path(@project), class: 'btn btn-cancel'
app/views/projects/pipeline_schedules/_form.html.haml
View file @ 4bf59948
......@@ -39,5 +39,5 @@
= f.check_box :active, required: false, value: @schedule.active?
= _('Active')
.footer-block.row-content-block
= f.submit _('Save pipeline schedule'), class: 'btn btn-create', tabindex: 3
= f.submit _('Save pipeline schedule'), class: 'btn btn-success', tabindex: 3
= link_to _('Cancel'), pipeline_schedules_path(@project), class: 'btn btn-cancel'
app/views/projects/pipeline_schedules/index.html.haml
View file @ 4bf59948
......@@ -11,7 +11,7 @@
- if can?(current_user, :create_pipeline_schedule, @project)
.nav-controls
= link_to new_project_pipeline_schedule_path(@project), class: 'btn btn-create' do
= link_to new_project_pipeline_schedule_path(@project), class: 'btn btn-success' do
%span= _('New schedule')
- if @schedules.present?
......
app/views/projects/project_members/_new_project_group.html.haml
View file @ 4bf59948
......@@ -17,4 +17,4 @@
.clearable-input
= text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date-groups', placeholder: _('Expiration date'), id: 'expires_at_groups'
%i.clear-icon.js-clear-input
= submit_tag _("Invite"), class: "btn btn-create"
= submit_tag _("Invite"), class: "btn btn-success"
app/views/projects/project_members/_new_project_member.html.haml
View file @ 4bf59948
......@@ -17,5 +17,5 @@
= label_tag :expires_at, 'Access expiration date', class: 'label-bold'
= 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"
= f.submit "Add to project", class: "btn btn-success"
= link_to "Import", import_project_project_members_path(@project), class: "btn btn-default", title: "Import members from another project"
app/views/projects/project_members/import.html.haml
View file @ 4bf59948
......@@ -11,5 +11,5 @@
.col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(@projects, :id, :name_with_namespace), prompt: "Select project", class: "select2 lg", required: true)
.form-actions
= button_tag 'Import project members', class: "btn btn-create"
= button_tag 'Import project members', class: "btn btn-success"
= link_to "Cancel", project_project_members_path(@project), class: "btn btn-cancel"
app/views/projects/protected_branches/shared/_create_protected_branch.html.haml
View file @ 4bf59948
......@@ -30,4 +30,4 @@
= yield :push_access_levels
.card-footer
= f.submit 'Protect', class: 'btn-create btn', disabled: true
= f.submit 'Protect', class: 'btn-success btn', disabled: true
app/views/projects/protected_tags/shared/_create_protected_tag.html.haml
View file @ 4bf59948
......@@ -26,4 +26,4 @@
= yield :create_access_levels
.card-footer
= f.submit 'Protect', class: 'btn-create btn', disabled: true
= f.submit 'Protect', class: 'btn-success btn', disabled: true
app/views/projects/releases/edit.html.haml
View file @ 4bf59948
......@@ -19,5 +19,5 @@
= render 'shared/notes/hints'
.error-alert
.prepend-top-default
= f.submit 'Save changes', class: 'btn btn-save'
= f.submit 'Save changes', class: 'btn btn-success'
= link_to "Cancel", project_tag_path(@project, @tag.name), class: "btn btn-default btn-cancel"
app/views/projects/settings/ci_cd/_form.html.haml
View file @ 4bf59948
......@@ -121,7 +121,7 @@
go test -cover (Go)
%code coverage: \d+.\d+% of statements
= f.submit _('Save changes'), class: "btn btn-save"
= f.submit _('Save changes'), class: "btn btn-success"
%hr
......
app/views/projects/snippets/_actions.html.haml
View file @ 4bf59948
......@@ -8,7 +8,7 @@
= link_to project_snippet_path(@project, @snippet), method: :delete, data: { confirm: _("Are you sure?") }, class: "btn btn-grouped btn-inverted btn-remove", title: _('Delete Snippet') do
= _('Delete')
- if can?(current_user, :create_project_snippet, @project)
= link_to new_project_snippet_path(@project), class: 'btn btn-grouped btn-inverted btn-create', title: _("New snippet") do
= link_to new_project_snippet_path(@project), class: 'btn btn-grouped btn-inverted btn-success', title: _("New snippet") do
= _('New snippet')
- if @snippet.submittable_as_spam_by?(current_user)
= 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')
......
app/views/projects/snippets/index.html.haml
View file @ 4bf59948
......@@ -7,6 +7,6 @@
.nav-controls
- if can?(current_user, :create_project_snippet, @project)
= link_to _("New snippet"), new_project_snippet_path(@project), class: "btn btn-new", title: _("New snippet")
= link_to _("New snippet"), new_project_snippet_path(@project), class: "btn btn-success", title: _("New snippet")
= render 'snippets/snippets'
app/views/projects/tags/index.html.haml
View file @ 4bf59948
......@@ -25,7 +25,7 @@
%li
= link_to title, filter_tags_path(sort: value), class: ("is-active" if @sort == value)
- if can?(current_user, :push_code, @project)
= link_to new_project_tag_path(@project), class: 'btn btn-create new-tag-btn' do
= link_to new_project_tag_path(@project), class: 'btn btn-success new-tag-btn' do
= s_('TagsPage|New tag')
= link_to project_tags_path(@project, rss_url_options), title: _("Tags feed"), class: 'btn rss-btn has-tooltip' do
= icon("rss")
......
app/views/projects/tags/new.html.haml
View file @ 4bf59948
......@@ -41,7 +41,7 @@
.form-text.text-muted
= s_('TagsPage|Optionally, add release notes to the tag. They will be stored in the GitLab database and displayed on the tags page.')
.form-actions
= button_tag s_('TagsPage|Create tag'), class: 'btn btn-create'
= button_tag s_('TagsPage|Create tag'), class: 'btn btn-success'
= link_to s_('TagsPage|Cancel'), project_tags_path(@project), class: 'btn btn-cancel'
-# haml-lint:disable InlineJavaScript
%script#availableRefs{ type: "application/json" }= @project.repository.ref_names.to_json.html_safe
app/views/projects/triggers/_form.html.haml
View file @ 4bf59948
......@@ -8,4 +8,4 @@
.form-group
= f.label :key, "Description", class: "label-bold"
= f.text_field :description, class: "form-control", required: true, title: 'Trigger description is required.', placeholder: "Trigger description"
= f.submit btn_text, class: "btn btn-save"
= f.submit btn_text, class: "btn btn-success"
app/views/projects/update.js.haml
View file @ 4bf59948
......@@ -7,4 +7,4 @@
$(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
$('.save-project-loader').hide();
$('.project-edit-container').show();
$('.edit-project .js-btn-save-general-project-settings').enable();
$('.edit-project .js-btn-success-general-project-settings').enable();
app/views/projects/wikis/_form.html.haml
View file @ 4bf59948
......@@ -51,10 +51,10 @@
.form-actions
- if @page && @page.persisted?
= f.submit _("Save changes"), class: 'btn-save btn'
= f.submit _("Save changes"), class: 'btn-success btn'
.float-right
= link_to _("Cancel"), project_wiki_path(@project, @page), class: 'btn btn-cancel btn-grouped'
- else
= f.submit s_("Wiki|Create page"), class: 'btn-create btn'
= f.submit s_("Wiki|Create page"), class: 'btn-success btn'
.float-right
= link_to _("Cancel"), project_wiki_path(@project, :home), class: 'btn btn-cancel'
app/views/projects/wikis/_main_links.html.haml
View file @ 4bf59948
- if (@page && @page.persisted?)
- if can?(current_user, :create_wiki, @project)
= link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
= link_to '#modal-new-wiki', class: "add-new-wiki btn btn-success", "data-toggle" => "modal" do
= s_("Wiki|New page")
= link_to project_wiki_history_path(@project, @page), class: "btn" do
= s_("Wiki|Page history")
......
app/views/projects/wikis/_new.html.haml
View file @ 4bf59948
......@@ -15,4 +15,4 @@
= icon('lightbulb-o')
= s_("WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories.")
.form-actions
= button_tag s_("Wiki|Create page"), class: "build-new-wiki btn btn-create"
= button_tag s_("Wiki|Create page"), class: "build-new-wiki btn btn-success"
app/views/projects/wikis/edit.html.haml
View file @ 4bf59948
......@@ -22,7 +22,7 @@
.nav-controls
- if can?(current_user, :create_wiki, @project)
= link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
= link_to '#modal-new-wiki', class: "add-new-wiki btn btn-success", "data-toggle" => "modal" do
= s_("Wiki|New page")
- if @page.persisted?
= link_to project_wiki_history_path(@project, @page), class: "btn" do
......
app/views/shared/_new_project_item_select.html.haml
View file @ 4bf59948
- if any_projects?(@projects)
.project-item-select-holder.btn-group
%a.btn.btn-new.new-project-item-link.qa-new-project-item-link{ href: '', data: { label: local_assigns[:label], type: local_assigns[:type] } }
%a.btn.btn-success.new-project-item-link.qa-new-project-item-link{ href: '', data: { label: local_assigns[:label], type: local_assigns[:type] } }
= icon('spinner spin')
= project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at', relative_path: local_assigns[:path] }, with_feature_enabled: local_assigns[:with_feature_enabled]
%button.btn.btn-new.new-project-item-select-button.qa-new-project-item-select-button
%button.btn.btn-success.new-project-item-select-button.qa-new-project-item-select-button
= icon('caret-down')
app/views/shared/_personal_access_tokens_form.html.haml
View file @ 4bf59948
......@@ -26,4 +26,4 @@
= render 'shared/tokens/scopes_form', prefix: 'personal_access_token', token: token, scopes: scopes
.prepend-top-default
= f.submit "Create #{type} token", class: "btn btn-create"
= f.submit "Create #{type} token", class: "btn btn-success"
app/views/shared/_recaptcha_form.html.haml
View file @ 4bf59948
......@@ -17,4 +17,4 @@
- if has_submit
.row-content-block.footer-block
= f.submit "Submit #{humanized_resource_name}", class: 'btn btn-create'
= f.submit "Submit #{humanized_resource_name}", class: 'btn btn-success'
app/views/shared/empty_states/_labels.html.haml
View file @ 4bf59948
......@@ -7,5 +7,5 @@
%h4= _("Labels can be applied to issues and merge requests to categorize them.")
%p= _("You can also star a label to make it a priority label.")
- if can?(current_user, :admin_label, @project)
= link_to _('New label'), new_project_label_path(@project), class: 'btn btn-new', title: _('New label'), id: 'new_label_link'
= link_to _('New label'), new_project_label_path(@project), class: 'btn btn-success', title: _('New label'), id: 'new_label_link'
= link_to _('Generate a default set of labels'), generate_project_labels_path(@project), method: :post, class: 'btn btn-success btn-inverted', title: _('Generate a default set of labels'), id: 'generate_labels_link'
app/views/shared/empty_states/_merge_requests.html.haml
View file @ 4bf59948
......@@ -17,7 +17,7 @@
- if project_select_button
= render 'shared/new_project_item_select', path: 'merge_requests/new', label: _('New merge request'), type: :merge_requests, with_feature_enabled: 'merge_requests'
- else
= link_to _('New merge request'), button_path, class: 'btn btn-new', title: _('New merge request'), id: 'new_merge_request_link'
= link_to _('New merge request'), button_path, class: 'btn btn-success', title: _('New merge request'), id: 'new_merge_request_link'
- else
%h4.text-center
= _("There are no merge requests to show")
app/views/shared/empty_states/_wikis.html.haml
View file @ 4bf59948
......@@ -2,7 +2,7 @@
- if can?(current_user, :create_wiki, @project)
- create_path = project_wiki_path(@project, params[:id], { view: 'create' })
- create_link = link_to s_('WikiEmpty|Create your first page'), create_path, class: 'btn btn-new', title: s_('WikiEmpty|Create your first page')
- create_link = link_to s_('WikiEmpty|Create your first page'), create_path, class: 'btn btn-success', title: s_('WikiEmpty|Create your first page')
= render layout: layout_path, locals: { image_path: 'illustrations/wiki_login_empty.svg' } do
%h4
......@@ -13,7 +13,7 @@
- elsif can?(current_user, :read_issue, @project)
- issues_link = link_to s_('WikiEmptyIssueMessage|issue tracker'), project_issues_path(@project)
- new_issue_link = link_to s_('WikiEmpty|Suggest wiki improvement'), new_project_issue_path(@project), class: 'btn btn-new', title: s_('WikiEmptyIssueMessage|Suggest wiki improvement')
- new_issue_link = link_to s_('WikiEmpty|Suggest wiki improvement'), new_project_issue_path(@project), class: 'btn btn-success', title: s_('WikiEmptyIssueMessage|Suggest wiki improvement')
= render layout: layout_path, locals: { image_path: 'illustrations/wiki_logout_empty.svg' } do
%h4
......
app/views/shared/issuable/_board_create_list_dropdown.html.haml
View file @ 4bf59948
.dropdown.prepend-left-10#js-add-list
%button.btn.btn-create.btn-inverted.js-new-board-list{ type: "button", data: board_list_data }
%button.btn.btn-success.btn-inverted.js-new-board-list{ type: "button", data: board_list_data }
Add list
.dropdown-menu.dropdown-menu-paging.dropdown-menu-right.dropdown-menu-issues-board-new.dropdown-menu-selectable.js-tab-container-labels
= render partial: "shared/issuable/label_page_default", locals: { show_footer: true, show_create: true, show_boards_content: true, title: "Add list" }
......
app/views/shared/issuable/_form.html.haml
View file @ 4bf59948
......@@ -69,9 +69,9 @@
%span.append-right-10
- if issuable.new_record?
= form.submit "Submit #{issuable.class.model_name.human.downcase}", class: 'btn btn-create qa-issuable-create-button'
= form.submit "Submit #{issuable.class.model_name.human.downcase}", class: 'btn btn-success qa-issuable-create-button'
- else
= form.submit 'Save changes', class: 'btn btn-save'
= form.submit 'Save changes', class: 'btn btn-success'
- if !issuable.persisted? && !issuable.project.empty_repo? && (guide_url = issuable.project.present.contribution_guide_path)
.inline.prepend-top-10
......
app/views/shared/issuable/_sidebar.html.haml
View file @ 4bf59948
......@@ -159,7 +159,7 @@
= dropdown_content
= dropdown_loading
= dropdown_footer add_content_class: true do
%button.btn.btn-new.sidebar-move-issue-confirmation-button.js-move-issue-confirmation-button{ disabled: true }
%button.btn.btn-success.sidebar-move-issue-confirmation-button.js-move-issue-confirmation-button{ disabled: true }
= _('Move')
= icon('spinner spin', class: 'sidebar-move-issue-confirmation-loading-icon')
......
app/views/shared/labels/_form.html.haml
View file @ 4bf59948
......@@ -28,7 +28,7 @@
.form-actions
- if @label.persisted?
= f.submit 'Save changes', class: 'btn btn-save js-save-button'
= f.submit 'Save changes', class: 'btn btn-success js-save-button'
- else
= f.submit 'Create label', class: 'btn btn-create js-save-button'
= f.submit 'Create label', class: 'btn btn-success js-save-button'
= link_to 'Cancel', back_path, class: 'btn btn-cancel'
app/views/shared/notes/_comment_button.html.haml
View file @ 4bf59948
- noteable_name = @note.noteable.human_class_name
.float-left.btn-group.append-right-10.droplab-dropdown.comment-type-dropdown.js-comment-type-dropdown
%input.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button{ type: 'submit', value: 'Comment' }
%input.btn.btn-nr.btn-success.comment-btn.js-comment-button.js-comment-submit-button{ type: 'submit', value: 'Comment' }
- if @note.can_be_discussion_note?
= button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-note-new-discussion js-disable-on-submit', data: { 'dropdown-trigger' => '#resolvable-comment-menu' }, 'aria-label' => 'Open comment type dropdown' do
......
app/views/shared/notes/_edit_form.html.haml
View file @ 4bf59948
......@@ -9,6 +9,6 @@
.note-form-actions.clearfix
.settings-message.note-edit-warning.js-finish-edit-warning
Finish editing this message first!
= submit_tag 'Save comment', class: 'btn btn-nr btn-save js-comment-save-button'
= submit_tag 'Save comment', class: 'btn btn-nr btn-success js-comment-save-button'
%button.btn.btn-nr.btn-cancel.note-edit-cancel{ type: 'button' }
Cancel
app/views/shared/snippets/_form.html.haml
View file @ 4bf59948
......@@ -32,9 +32,9 @@
.form-actions
- if @snippet.new_record?
= f.submit 'Create snippet', class: "btn-create btn"
= f.submit 'Create snippet', class: "btn-success btn"
- else
= f.submit 'Save changes', class: "btn-save btn"
= f.submit 'Save changes', class: "btn-success btn"
- if @snippet.project_id
= link_to "Cancel", project_snippets_path(@project), class: "btn btn-cancel"
......
app/views/snippets/_actions.html.haml
View file @ 4bf59948
......@@ -7,7 +7,7 @@
- if can?(current_user, :admin_personal_snippet, @snippet)
= link_to snippet_path(@snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-grouped btn-inverted btn-remove", title: 'Delete Snippet' do
Delete
= link_to new_snippet_path, class: "btn btn-grouped btn-inverted btn-create", title: "New snippet" do
= link_to new_snippet_path, class: "btn btn-grouped btn-inverted btn-success", title: "New snippet" do
New snippet
- 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'
......
qa/qa/factory/resource/branch.rb
View file @ 4bf59948
......@@ -64,7 +64,7 @@ module QA
end
page.wait(reload: false) do
!page.first('.btn-create').disabled?
!page.first('.btn-success').disabled?
end
page.protect_branch
......
spec/features/dashboard/group_spec.rb
View file @ 4bf59948
......@@ -13,7 +13,7 @@ RSpec.describe 'Dashboard Group' do
it 'creates new group', :js do
visit dashboard_groups_path
find('.btn-new').click
find('.btn-success').click
new_path = 'Samurai'
new_description = 'Tokugawa Shogunate'
......
spec/features/labels_hierarchy_spec.rb
View file @ 4bf59948
......@@ -156,7 +156,7 @@ describe 'Labels Hierarchy', :js, :nested_groups do
find('a.label-item', text: parent_group_label.title).click
find('a.label-item', text: project_label_1.title).click
find('.btn-create').click
find('.btn-success').click
expect(page.find('.issue-details h2.title')).to have_content('new created issue')
expect(page).to have_selector('span.badge', text: grandparent_group_label.title)
......
spec/features/merge_request/user_posts_notes_spec.rb
View file @ 4bf59948
......@@ -111,7 +111,7 @@ describe 'Merge request > User posts notes', :js do
it 'allows using markdown buttons after saving a note and then trying to edit it again' do
page.within('.current-note-edit-form') do
fill_in 'note[note]', with: 'This is the new content'
find('.btn-save').click
find('.btn-success').click
end
find('.note').hover
......@@ -129,7 +129,7 @@ describe 'Merge request > User posts notes', :js do
it 'appends the edited at time to the note' do
page.within('.current-note-edit-form') do
fill_in 'note[note]', with: 'Some new content'
find('.btn-save').click
find('.btn-success').click
end
page.within("#note_#{note.id}") do
......
spec/features/projects/members/invite_group_spec.rb
View file @ 4bf59948
......@@ -40,7 +40,7 @@ describe 'Project > Members > Invite group', :js do
select2 group_to_share_with.id, from: '#link_group_id'
page.find('body').click
find('.btn-create').click
find('.btn-success').click
page.within('.project-members-groups') do
expect(page).to have_content(group_to_share_with.name)
......@@ -122,7 +122,7 @@ describe 'Project > Members > Invite group', :js do
fill_in 'expires_at_groups', with: (Time.now + 4.5.days).strftime('%Y-%m-%d')
click_on 'invite-group-tab'
find('.btn-create').click
find('.btn-success').click
end
it 'the group link shows the expiration time with a warning class' do
......
spec/features/snippets/notes_on_personal_snippets_spec.rb
View file @ 4bf59948
......@@ -103,7 +103,7 @@ describe 'Comments on personal snippets', :js do
page.within('.current-note-edit-form') do
fill_in 'note[note]', with: 'new content'
find('.btn-save').click
find('.btn-success').click
end
page.within("#notes-list li#note_#{snippet_notes[0].id}") do
......
spec/javascripts/boards/board_blank_state_spec.js
View file @ 4bf59948
......@@ -64,7 +64,7 @@ describe('Boards blank state', () => {
});
it('creates pre-defined labels', (done) => {
vm.$el.querySelector('.btn-create').click();
vm.$el.querySelector('.btn-success').click();
setTimeout(() => {
expect(gl.issueBoards.BoardsStore.state.lists.length).toBe(2);
......@@ -78,7 +78,7 @@ describe('Boards blank state', () => {
it('resets the store if request fails', (done) => {
fail = true;
vm.$el.querySelector('.btn-create').click();
vm.$el.querySelector('.btn-success').click();
setTimeout(() => {
expect(gl.issueBoards.BoardsStore.welcomeIsHidden()).toBeFalsy();
......
spec/javascripts/issue_show/components/edit_actions_spec.js
View file @ 4bf59948
......@@ -54,7 +54,7 @@ describe('Edit Actions components', () => {
Vue.nextTick(() => {
expect(
vm.$el.querySelector('.btn-save').getAttribute('disabled'),
vm.$el.querySelector('.btn-success').getAttribute('disabled'),
).toBe('disabled');
done();
......@@ -72,7 +72,7 @@ describe('Edit Actions components', () => {
describe('updateIssuable', () => {
it('sends update.issauble event when clicking save button', () => {
vm.$el.querySelector('.btn-save').click();
vm.$el.querySelector('.btn-success').click();
expect(
eventHub.$emit,
......@@ -80,11 +80,11 @@ describe('Edit Actions components', () => {
});
it('shows loading icon after clicking save button', (done) => {
vm.$el.querySelector('.btn-save').click();
vm.$el.querySelector('.btn-success').click();
Vue.nextTick(() => {
expect(
vm.$el.querySelector('.btn-save .fa'),
vm.$el.querySelector('.btn-success .fa'),
).not.toBeNull();
done();
......@@ -92,11 +92,11 @@ describe('Edit Actions components', () => {
});
it('disabled button after clicking save button', (done) => {
vm.$el.querySelector('.btn-save').click();
vm.$el.querySelector('.btn-success').click();
Vue.nextTick(() => {
expect(
vm.$el.querySelector('.btn-save').getAttribute('disabled'),
vm.$el.querySelector('.btn-success').getAttribute('disabled'),
).toBe('disabled');
done();
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7