Commit b70efed6 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '1878-export-csv-button-should-be-inline-with-rss-button-on-mobile' into 'master'

Resolve "Export CSV button should be inline with RSS button on mobile"

Closes #1878

See merge request !1637
parents e5de6664 30fe57bd
...@@ -256,6 +256,33 @@ ...@@ -256,6 +256,33 @@
display: block; display: block;
margin: 0; margin: 0;
} }
&.inline {
display: flex;
flex-flow: row wrap;
justify-content: space-between;
> .btn,
> .btn-container,
> .dropdown,
> input,
> form {
flex: 1 1 auto;
margin: 0 0 10px;
margin-left: $gl-padding-top;
width: auto;
&:first-child {
margin-left: 0;
float: none;
}
}
.btn-full {
flex: 1 1 100%;
margin-left: 0;
}
}
} }
} }
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%div{ class: (container_class) } %div{ class: (container_class) }
.top-area .top-area
= render 'shared/issuable/nav', type: :issues = render 'shared/issuable/nav', type: :issues
.nav-controls .nav-controls.inline
= link_to params.merge(rss_url_options), class: 'btn append-right-10 has-tooltip', title: 'Subscribe' do = link_to params.merge(rss_url_options), class: 'btn append-right-10 has-tooltip', title: 'Subscribe' do
= icon('rss') = icon('rss')
- if current_user - if current_user
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
@project, @project,
issue: { assignee_id: issues_finder.assignee.try(:id), issue: { assignee_id: issues_finder.assignee.try(:id),
milestone_id: issues_finder.milestones.first.try(:id) }), milestone_id: issues_finder.milestones.first.try(:id) }),
class: "btn btn-new", class: "btn btn-new btn-full",
title: "New issue", title: "New issue",
id: "new_issue_link" do id: "new_issue_link" do
New issue New issue
......
---
title: Inline RSS button with Export Issues button for mobile
merge_request: 1637
author:
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