Merge branch 'ui-updates' into 'master'
UI updates See merge request !8669
This commit is contained in:
commit
272337e803
|
@ -71,7 +71,7 @@ header {
|
|||
&:focus,
|
||||
&:active {
|
||||
background-color: $gray-light;
|
||||
color: darken($gl-text-color-secondary, 30%);
|
||||
color: $gl-text-color;
|
||||
|
||||
.todos-pending-count {
|
||||
background: darken($todo-alert-blue, 10%);
|
||||
|
|
|
@ -178,7 +178,7 @@ $count-arrow-border: #dce0e5;
|
|||
$save-project-loader-color: #555;
|
||||
$divergence-graph-bar-bg: #ccc;
|
||||
$divergence-graph-separator-bg: #ccc;
|
||||
$general-hover-transition-duration: 150ms;
|
||||
$general-hover-transition-duration: 100ms;
|
||||
$general-hover-transition-curve: linear;
|
||||
|
||||
|
||||
|
|
|
@ -198,7 +198,7 @@
|
|||
margin: 15px 5px 0 0;
|
||||
|
||||
input {
|
||||
height: 27px;
|
||||
height: 28px;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -523,7 +523,7 @@ a.deploy-project-label {
|
|||
|
||||
&:hover,
|
||||
&:focus {
|
||||
color: darken($notes-light-color, 15%);
|
||||
color: $gl-text-color;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -19,10 +19,8 @@
|
|||
= render 'shared/issuable/nav', type: :issues
|
||||
.nav-controls
|
||||
- if current_user
|
||||
= link_to url_for(params.merge(format: :atom, private_token: current_user.private_token)), class: 'btn append-right-10' do
|
||||
= link_to url_for(params.merge(format: :atom, private_token: current_user.private_token)), class: 'btn append-right-10 has-tooltip', title: 'Subscribe' do
|
||||
= icon('rss')
|
||||
%span.icon-label
|
||||
Subscribe
|
||||
- if can? current_user, :create_issue, @project
|
||||
= link_to new_namespace_project_issue_path(@project.namespace,
|
||||
@project,
|
||||
|
|
|
@ -773,7 +773,7 @@ describe 'Filter issues', js: true, feature: true do
|
|||
describe 'RSS feeds' do
|
||||
it 'updates atom feed link for project issues' do
|
||||
visit namespace_project_issues_path(project.namespace, project, milestone_title: milestone.title, assignee_id: user.id)
|
||||
link = find('.nav-controls a', text: 'Subscribe')
|
||||
link = find_link('Subscribe')
|
||||
params = CGI.parse(URI.parse(link[:href]).query)
|
||||
auto_discovery_link = find('link[type="application/atom+xml"]', visible: false)
|
||||
auto_discovery_params = CGI.parse(URI.parse(auto_discovery_link[:href]).query)
|
||||
|
|
Loading…
Reference in New Issue