Commit c2a9e6ea authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
parent 0145e8ea
...@@ -136,7 +136,7 @@ $kbd-bg: #333; ...@@ -136,7 +136,7 @@ $kbd-bg: #333;
//== Buttons //== Buttons
// //
//## //##
$btn-default-color: #7f8fa4; $btn-default-color: $gl-text-color;
$btn-default-bg: #fff; $btn-default-bg: #fff;
$btn-default-border: #e7e9ed; $btn-default-border: #e7e9ed;
......
...@@ -137,7 +137,7 @@ module DiffHelper ...@@ -137,7 +137,7 @@ module DiffHelper
# Always use HTML to handle case where JSON diff rendered this button # Always use HTML to handle case where JSON diff rendered this button
params_copy.delete(:format) params_copy.delete(:format)
link_to url_for(params_copy), id: "commit-diff-viewtype", class: (params[:view] != 'parallel' ? 'btn btn-sm active' : 'btn btn-sm') do link_to url_for(params_copy), id: "inline-diff-btn", class: (params[:view] != 'parallel' ? 'btn btn-sm active' : 'btn btn-sm') do
'Inline' 'Inline'
end end
end end
...@@ -148,7 +148,7 @@ module DiffHelper ...@@ -148,7 +148,7 @@ module DiffHelper
# Always use HTML to handle case where JSON diff rendered this button # Always use HTML to handle case where JSON diff rendered this button
params_copy.delete(:format) params_copy.delete(:format)
link_to url_for(params_copy), id: "commit-diff-viewtype", class: (params[:view] == 'parallel' ? 'btn active btn-sm' : 'btn btn-sm') do link_to url_for(params_copy), id: "parallel-diff-btn", class: (params[:view] == 'parallel' ? 'btn active btn-sm' : 'btn btn-sm') do
'Side-by-side' 'Side-by-side'
end end
end end
......
...@@ -225,13 +225,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps ...@@ -225,13 +225,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step 'I click link "Hide inline discussion" of the second file' do step 'I click link "Hide inline discussion" of the second file' do
page.within '.files [id^=diff]:nth-child(2)' do page.within '.files [id^=diff]:nth-child(2)' do
find('.js-toggle-diff-comments').click find('.js-toggle-diff-comments').trigger('click')
end end
end end
step 'I click link "Show inline discussion" of the second file' do step 'I click link "Show inline discussion" of the second file' do
page.within '.files [id^=diff]:nth-child(2)' do page.within '.files [id^=diff]:nth-child(2)' do
find('.js-toggle-diff-comments').click find('.js-toggle-diff-comments').trigger('click')
end end
end end
......
...@@ -198,7 +198,7 @@ module SharedDiffNote ...@@ -198,7 +198,7 @@ module SharedDiffNote
end end
step 'I click side-by-side diff button' do step 'I click side-by-side diff button' do
click_link "Side-by-side" find('#parallel-diff-btn').trigger('click')
end end
step 'I see side-by-side diff button' do step 'I see side-by-side diff button' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment