Commit 1d998db2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Unite green buttons under btn-success class in ee/

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 52d3183f
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<template> <template>
<div class="dropdown new-epic-dropdown"> <div class="dropdown new-epic-dropdown">
<button <button
class="btn btn-new" class="btn btn-success "
type="button" type="button"
data-toggle="dropdown" data-toggle="dropdown"
@click="focusInput" @click="focusInput"
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
:disabled="isCreatingDisabled" :disabled="isCreatingDisabled"
:loading="creating" :loading="creating"
:label="buttonLabel" :label="buttonLabel"
container-class="btn btn-save btn-inverted" container-class="btn btn-success btn-inverted"
@click.stop="createEpic" @click.stop="createEpic"
/> />
</div> </div>
......
...@@ -12,8 +12,8 @@ const SUBMIT_ACTION_TEXT = { ...@@ -12,8 +12,8 @@ const SUBMIT_ACTION_TEXT = {
}; };
const SUBMIT_BUTTON_CLASS = { const SUBMIT_BUTTON_CLASS = {
create: 'btn-create', create: 'btn-success',
update: 'btn-save', update: 'btn-success',
delete: 'btn-remove', delete: 'btn-remove',
}; };
......
...@@ -152,7 +152,7 @@ export default { ...@@ -152,7 +152,7 @@ export default {
ref="addButton" ref="addButton"
:disabled="isSubmitButtonDisabled" :disabled="isSubmitButtonDisabled"
type="submit" type="submit"
class="js-add-issuable-form-add-button btn btn-new float-left"> class="js-add-issuable-form-add-button btn btn-success float-left">
Add Add
<gl-loading-icon <gl-loading-icon
v-if="isSubmitting" v-if="isSubmitting"
......
...@@ -41,7 +41,7 @@ export default { ...@@ -41,7 +41,7 @@ export default {
</p> </p>
<a <a
:href="helpPath" :href="helpPath"
class="btn btn-new" class="btn btn-success"
rel="nofollow" rel="nofollow"
> >
{{ __('Learn more') }} {{ __('Learn more') }}
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
width: 100%; width: 100%;
} }
.btn-save { .btn-success {
display: flex; display: flex;
margin-top: $gl-btn-padding; margin-top: $gl-btn-padding;
} }
...@@ -17,12 +17,7 @@ ...@@ -17,12 +17,7 @@
.empty-state .new-epic-dropdown { .empty-state .new-epic-dropdown {
display: inline-flex; display: inline-flex;
.btn-save { .btn-success {
margin-left: 0;
margin-bottom: 0;
}
.btn-new {
margin: 0; margin: 0;
} }
} }
...@@ -20,4 +20,4 @@ ...@@ -20,4 +20,4 @@
.col-sm-10 .col-sm-10
= admin_email_select_tag(:recipients) = admin_email_select_tag(:recipients)
.form-actions .form-actions
= submit_tag 'Send message', class: 'btn btn-create' = submit_tag 'Send message', class: 'btn btn-success'
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
= form_for [:admin, @node], html: { class: 'js-geo-node-form' } do |f| = form_for [:admin, @node], html: { class: 'js-geo-node-form' } do |f|
= render partial: 'form', locals: { form: f, geo_node: @node } = render partial: 'form', locals: { form: f, geo_node: @node }
.form-actions .form-actions
= f.submit 'Save changes', class: 'btn btn-create' = f.submit 'Save changes', class: 'btn btn-success'
= link_to 'Cancel', admin_geo_nodes_path, class: 'btn btn-cancel' = link_to 'Cancel', admin_geo_nodes_path, class: 'btn btn-cancel'
%hr %hr
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%h2.page-title.clearfix %h2.page-title.clearfix
%span.title-text.float-left= _("Geo Nodes") %span.title-text.float-left= _("Geo Nodes")
= link_to s_("GeoNodes|New node"), new_admin_geo_node_path, class: 'btn btn-create float-right' = link_to s_("GeoNodes|New node"), new_admin_geo_node_path, class: 'btn btn-success float-right'
%hr.page-title-separator %hr.page-title-separator
%p.page-subtitle.light %p.page-subtitle.light
......
...@@ -10,4 +10,4 @@ ...@@ -10,4 +10,4 @@
= form_for [:admin, @node], as: :geo_node, url: admin_geo_nodes_path, html: { class: 'js-geo-node-form' } do |f| = form_for [:admin, @node], as: :geo_node, url: admin_geo_nodes_path, html: { class: 'js-geo-node-form' } do |f|
= render partial: 'form', locals: { form: f, geo_node: @node } = render partial: 'form', locals: { form: f, geo_node: @node }
.form-actions .form-actions
= f.submit 'Add Node', class: 'btn btn-create' = f.submit 'Add Node', class: 'btn btn-success'
= link_to 'Buy License', ::EE::SUBSCRIPTIONS_PLANS_URL, target: '_blank', rel: 'noopener noreferrer nofollow', class: "btn btn-new btn-inverted float-right btn-buy-license" = link_to 'Buy License', ::EE::SUBSCRIPTIONS_PLANS_URL, target: '_blank', rel: 'noopener noreferrer nofollow', class: "btn btn-success btn-inverted float-right btn-buy-license"
= link_to 'Upload New License', new_admin_license_path, class: "btn float-right btn-upload-license append-right-10" = link_to 'Upload New License', new_admin_license_path, class: "btn float-right btn-upload-license append-right-10"
...@@ -13,4 +13,4 @@ ...@@ -13,4 +13,4 @@
= custom_icon("missing_license") = custom_icon("missing_license")
%h4 You do not have a license. %h4 You do not have a license.
%p.trial-description You can start a free trial of GitLab Ultimate without any obligation or payment details. %p.trial-description You can start a free trial of GitLab Ultimate without any obligation or payment details.
= link_to 'Start free trial', new_trial_url, class: "btn btn-new btn-start-trial prepend-top-10" = link_to 'Start free trial', new_trial_url, class: "btn btn-success btn-start-trial prepend-top-10"
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- if current_license.trial? - if current_license.trial?
= render "upload_buy_license" = render "upload_buy_license"
- else - else
= link_to 'Upload New License', new_admin_license_path, class: "btn btn-new float-right" = link_to 'Upload New License', new_admin_license_path, class: "btn btn-success float-right"
%hr %hr
......
...@@ -12,5 +12,5 @@ ...@@ -12,5 +12,5 @@
= link_to "paid products", "https://about.gitlab.com/pricing/", target: "_blank", rel: "noopener noreferrer nofollow" = link_to "paid products", "https://about.gitlab.com/pricing/", target: "_blank", rel: "noopener noreferrer nofollow"
You can try Ultimate for free without You can try Ultimate for free without
any obligation or payment details. any obligation or payment details.
= link_to new_trial_url, class: "btn btn-new" do = link_to new_trial_url, class: "btn btn-success" do
Start free trial Start free trial
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
.form-group .form-group
= label_tag :password = label_tag :password
= password_field_tag :password, nil, { class: "form-control bottom", placeholder: "Password" } = password_field_tag :password, nil, { class: "form-control bottom", placeholder: "Password" }
= submit_tag "Sign in", class: "btn-save btn" = submit_tag "Sign in", class: "btn-success btn"
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
.col-lg-9.append-bottom-default .col-lg-9.append-bottom-default
= form_for @hook, as: :hook, url: polymorphic_path([@group, :hooks]) do |f| = form_for @hook, as: :hook, url: polymorphic_path([@group, :hooks]) do |f|
= render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook } = 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 %hr
%h5.prepend-top-default %h5.prepend-top-default
......
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
%p= _("This group allows you to sign in with your %{group_name} Single Sign-On account. This will redirect you to an external sign in page.") % { group_name: @group_name } %p= _("This group allows you to sign in with your %{group_name} Single Sign-On account. This will redirect you to an external sign in page.") % { group_name: @group_name }
= saml_link _('Sign in with Single Sign-On'), @group_path, html_class: 'btn btn-save btn-block' = saml_link _('Sign in with Single Sign-On'), @group_path, html_class: 'btn btn-success btn-block'
...@@ -54,4 +54,4 @@ ...@@ -54,4 +54,4 @@
You can manage permission levels for individual group members in the Members tab. You can manage permission levels for individual group members in the Members tab.
.form-actions .form-actions
= f.submit 'Add synchronization', class: 'btn btn-create' = f.submit 'Add synchronization', class: 'btn btn-success'
...@@ -18,4 +18,4 @@ ...@@ -18,4 +18,4 @@
= f.text_area :issues_template, class: "form-control", rows: 3 = f.text_area :issues_template, class: "form-control", rows: 3
.hint .hint
Description parsed with #{link_to "GitLab Flavored Markdown", help_page_path('user/markdown'), target: '_blank'}. Description parsed with #{link_to "GitLab Flavored Markdown", help_page_path('user/markdown'), target: '_blank'}.
= f.submit 'Save changes', class: "btn btn-save" = f.submit 'Save changes', class: "btn btn-success"
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
= render partial: 'projects/protected_environments/deploy_access_levels_dropdown', locals: { f: f } = render partial: 'projects/protected_environments/deploy_access_levels_dropdown', locals: { f: f }
.card-footer .card-footer
= f.submit s_('ProtectedEnvironment|Protect'), class: 'btn-create btn', disabled: true = f.submit s_('ProtectedEnvironment|Protect'), class: 'btn-success btn', disabled: true
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
= form.text_field :alias, class: 'form-control', placeholder: @slack_integration.alias, required: true = form.text_field :alias, class: 'form-control', placeholder: @slack_integration.alias, required: true
.footer-block.row-content-block .footer-block.row-content-block
%button.btn.btn-save{ type: 'submit' } %button.btn.btn-success{ type: 'submit' }
= icon('spinner spin', class: 'hidden js-btn-spinner') = icon('spinner spin', class: 'hidden js-btn-spinner')
%span.js-btn-label %span.js-btn-label
Save changes Save changes
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
.text-content.text-center .text-content.text-center
%h4= _("Discover GitLab Geo.") %h4= _("Discover GitLab Geo.")
%p= _("Make everyone on your team more productive regardless of their location. GitLab Geo creates read-only mirrors of your GitLab instance so you can reduce the time it takes to clone and fetch large repos.") %p= _("Make everyone on your team more productive regardless of their location. GitLab Geo creates read-only mirrors of your GitLab instance so you can reduce the time it takes to clone and fetch large repos.")
= link_to _('Learn more'), 'https://about.gitlab.com/features/gitlab-geo/', rel: 'nofollow', class: 'btn btn-new' = link_to _('Learn more'), 'https://about.gitlab.com/features/gitlab-geo/', rel: 'nofollow', class: 'btn btn-success'
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
- if assignee_lists_available || milestone_lists_available - if assignee_lists_available || milestone_lists_available
.dropdown.prepend-left-10#js-add-list .dropdown.prepend-left-10#js-add-list
%button.btn.btn-create.btn-inverted.d-flex.js-new-board-list{ type: "button", data: board_list_data } %button.btn.btn-success.btn-inverted.d-flex.js-new-board-list{ type: "button", data: board_list_data }
%span Add list %span Add list
= sprite_icon('chevron-down', size: 16, css_class: 'prepend-left-5 btn-new-board-list-chevron') = sprite_icon('chevron-down', size: 16, css_class: 'prepend-left-5 btn-success-board-list-chevron')
.dropdown-menu.dropdown-menu-paging.dropdown-menu-right.dropdown-menu-issues-board-new.dropdown-menu-selectable.dropdown-menu-tabs .dropdown-menu.dropdown-menu-paging.dropdown-menu-right.dropdown-menu-issues-board-new.dropdown-menu-selectable.dropdown-menu-tabs
%ul.nav.nav-tabs.dropdown-tabs-list.js-new-board-list-tabs{ role: 'tablist' } %ul.nav.nav-tabs.dropdown-tabs-list.js-new-board-list-tabs{ role: 'tablist' }
%li.nav-item.dropdown-tab-item.js-tab-button-labels %li.nav-item.dropdown-tab-item.js-tab-button-labels
......
...@@ -78,4 +78,4 @@ ...@@ -78,4 +78,4 @@
Pushes that contain added or updated files that exceed this file size are rejected. Pushes that contain added or updated files that exceed this file size are rejected.
Set to 0 to allow files of any size. Set to 0 to allow files of any size.
= f.submit "Save Push Rules", class: "btn btn-create" = f.submit "Save Push Rules", class: "btn btn-success"
...@@ -8,4 +8,4 @@ ...@@ -8,4 +8,4 @@
%strong= @email %strong= @email
from any further admin emails. from any further admin emails.
.form-actions .form-actions
= submit_tag 'Unsubscribe', class: 'btn btn-create' = submit_tag 'Unsubscribe', class: 'btn btn-success'
...@@ -15,7 +15,7 @@ describe 'New Epic', :js do ...@@ -15,7 +15,7 @@ describe 'New Epic', :js do
it 'does not show the create button' do it 'does not show the create button' do
visit group_epics_path(group) visit group_epics_path(group)
expect(page).not_to have_selector('.new-epic-dropdown .btn-new') expect(page).not_to have_selector('.new-epic-dropdown .btn-success')
end end
end end
...@@ -26,7 +26,7 @@ describe 'New Epic', :js do ...@@ -26,7 +26,7 @@ describe 'New Epic', :js do
end end
it 'does show the create button' do it 'does show the create button' do
expect(page).to have_selector('.new-epic-dropdown .btn-new') expect(page).to have_selector('.new-epic-dropdown .btn-success')
end end
end end
end end
...@@ -40,7 +40,7 @@ describe 'New Epic', :js do ...@@ -40,7 +40,7 @@ describe 'New Epic', :js do
end end
it 'does not show the create button' do it 'does not show the create button' do
expect(page).not_to have_selector('.new-epic-dropdown .btn-new') expect(page).not_to have_selector('.new-epic-dropdown .btn-success')
end end
end end
...@@ -51,13 +51,13 @@ describe 'New Epic', :js do ...@@ -51,13 +51,13 @@ describe 'New Epic', :js do
end end
it 'does show the create button' do it 'does show the create button' do
expect(page).to have_selector('.new-epic-dropdown .btn-new') expect(page).to have_selector('.new-epic-dropdown .btn-success')
end end
it 'can create epic' do it 'can create epic' do
find('.new-epic-dropdown .btn-new').click find('.new-epic-dropdown .btn-success').click
find('.new-epic-dropdown input').set('test epic title') find('.new-epic-dropdown .dropdown-menu input').set('test epic title')
find('.new-epic-dropdown .btn-save').click find('.new-epic-dropdown .dropdown-menu .btn-success').click
wait_for_requests wait_for_requests
......
...@@ -70,7 +70,7 @@ describe 'Project > Members > Invite group and members', :js do ...@@ -70,7 +70,7 @@ describe 'Project > Members > Invite group and members', :js do
select2 group_to_share_with.id, from: '#link_group_id' select2 group_to_share_with.id, from: '#link_group_id'
page.find('body').click page.find('body').click
find('.btn-create').click find('.btn-success').click
page.within('.project-members-groups') do page.within('.project-members-groups') do
expect(page).to have_content(group_to_share_with.name) expect(page).to have_content(group_to_share_with.name)
......
...@@ -45,7 +45,7 @@ describe('newEpic', () => { ...@@ -45,7 +45,7 @@ describe('newEpic', () => {
vm.title = 'test'; vm.title = 'test';
Vue.nextTick(() => { Vue.nextTick(() => {
vm.$el.querySelector('.btn-save').click(); vm.$el.querySelector('.dropdown-menu .btn-success').click();
expect(vm.service.createEpic).toHaveBeenCalled(); expect(vm.service.createEpic).toHaveBeenCalled();
}); });
}); });
...@@ -59,7 +59,7 @@ describe('newEpic', () => { ...@@ -59,7 +59,7 @@ describe('newEpic', () => {
vm.title = 'test'; vm.title = 'test';
Vue.nextTick(() => { Vue.nextTick(() => {
vm.$el.querySelector('.btn-save').click(); vm.$el.querySelector('.dropdown-menu .btn-success').click();
}); });
}); });
...@@ -68,7 +68,7 @@ describe('newEpic', () => { ...@@ -68,7 +68,7 @@ describe('newEpic', () => {
vm.title = 'test'; vm.title = 'test';
Vue.nextTick(() => { Vue.nextTick(() => {
const btnSave = vm.$el.querySelector('.btn-save'); const btnSave = vm.$el.querySelector('.dropdown-menu .btn-success');
const loadingIcon = btnSave.querySelector('.js-loading-button-icon'); const loadingIcon = btnSave.querySelector('.js-loading-button-icon');
expect(loadingIcon).toBeNull(); expect(loadingIcon).toBeNull();
......
...@@ -160,7 +160,7 @@ describe('EpicsListEmptyComponent', () => { ...@@ -160,7 +160,7 @@ describe('EpicsListEmptyComponent', () => {
const newEpicBtnEl = vm.$el.querySelector('.new-epic-dropdown'); const newEpicBtnEl = vm.$el.querySelector('.new-epic-dropdown');
expect(newEpicBtnEl).not.toBeNull(); expect(newEpicBtnEl).not.toBeNull();
expect(newEpicBtnEl.querySelector('button.btn-new').innerText.trim()).toBe('New epic'); expect(newEpicBtnEl.querySelector('button.btn-success').innerText.trim()).toBe('New epic');
}); });
it('does not render new epic button element when `hasFiltersApplied` prop is true', done => { it('does not render new epic button element when `hasFiltersApplied` prop is true', 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