Commit ca81c1c0 authored by Nur Rony's avatar Nur Rony

replaces media query with flexbox

parent 4cde12df
...@@ -461,17 +461,19 @@ ...@@ -461,17 +461,19 @@
.issuable-list { .issuable-list {
li { li {
.issue-info-container {
display: inline-block;
width: 96.5%;
@media (max-width: $screen-md-max) { .issue-box {
width: 95%; display: -webkit-flex;
} display: flex;
}
.issue-info-container {
-webkit-flex: 1;
flex: 1;
padding-right: $gl-padding;
} }
.issue-check { .issue-check {
float: left;
padding-right: $gl-padding; padding-right: $gl-padding;
margin-bottom: 10px; margin-bottom: 10px;
min-width: 15px; min-width: 15px;
......
...@@ -268,11 +268,12 @@ ...@@ -268,11 +268,12 @@
.merge-request { .merge-request {
padding: 10px 0 10px 15px; padding: 10px 0 10px 15px;
position: relative; position: relative;
display: -webkit-flex;
display: flex;
.issue-info-container { .issue-info-container {
@media (max-width: $screen-xs-max) { -webkit-flex: 1;
width: 88%; flex: 1;
}
} }
.merge-request-title { .merge-request-title {
......
%li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue), data: { labels: issue.label_ids, id: issue.id } } %li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue), data: { labels: issue.label_ids, id: issue.id } }
- if @bulk_edit .issue-box
.issue-check - if @bulk_edit
= check_box_tag dom_id(issue, "selected"), nil, false, 'data-id' => issue.id, class: "selected_issue" .issue-check
.issue-info-container = check_box_tag dom_id(issue, "selected"), nil, false, 'data-id' => issue.id, class: "selected_issue"
.issue-title.title .issue-info-container
%span.issue-title-text .issue-title.title
= confidential_icon(issue) %span.issue-title-text
= link_to issue.title, issue_path(issue) = confidential_icon(issue)
%ul.controls = link_to issue.title, issue_path(issue)
- if issue.closed? %ul.controls
%li - if issue.closed?
CLOSED %li
CLOSED
- if issue.assignee - if issue.assignee
%li %li
= link_to_member(@project, issue.assignee, name: false, title: "Assigned to :name") = link_to_member(@project, issue.assignee, name: false, title: "Assigned to :name")
- upvotes, downvotes = issue.upvotes, issue.downvotes - upvotes, downvotes = issue.upvotes, issue.downvotes
- if upvotes > 0 - if upvotes > 0
%li %li
= icon('thumbs-up') = icon('thumbs-up')
= upvotes = upvotes
- if downvotes > 0 - if downvotes > 0
%li %li
= icon('thumbs-down') = icon('thumbs-down')
= downvotes = downvotes
- note_count = issue.notes.user.count - note_count = issue.notes.user.count
%li %li
= link_to issue_path(issue, anchor: 'notes'), class: ('no-comments' if note_count.zero?) do = link_to issue_path(issue, anchor: 'notes'), class: ('no-comments' if note_count.zero?) do
= icon('comments') = icon('comments')
= note_count = note_count
.issue-info .issue-info
#{issuable_reference(issue)} · #{issuable_reference(issue)} ·
opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')} opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')}
by #{link_to_member(@project, issue.author, avatar: false)} by #{link_to_member(@project, issue.author, avatar: false)}
- if issue.milestone - if issue.milestone
   
= link_to namespace_project_issues_path(issue.project.namespace, issue.project, milestone_title: issue.milestone.title) do = link_to namespace_project_issues_path(issue.project.namespace, issue.project, milestone_title: issue.milestone.title) do
= icon('clock-o') = icon('clock-o')
= issue.milestone.title = issue.milestone.title
- if issue.due_date - if issue.due_date
%span{ class: "#{'cred' if issue.overdue?}" } %span{ class: "#{'cred' if issue.overdue?}" }
 
= icon('calendar')
= issue.due_date.to_s(:medium)
- if issue.labels.any?
 
- issue.labels.each do |label|
= link_to_label(label, subject: issue.project, css_class: 'label-link')
- if issue.tasks?
   
= icon('calendar') %span.task-status
= issue.due_date.to_s(:medium) = issue.task_status
- if issue.labels.any?
 
- issue.labels.each do |label|
= link_to_label(label, subject: issue.project, css_class: 'label-link')
- if issue.tasks?
 
%span.task-status
= issue.task_status
.pull-right.issue-updated-at .pull-right.issue-updated-at
%span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')} %span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')}
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