summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortauriedavis <taurie@gitlab.com>2017-06-07 14:59:13 -0700
committertauriedavis <taurie@gitlab.com>2017-06-07 15:02:13 -0700
commita0fd67130b8a9707bb30ce9380641c5dd28d7827 (patch)
tree9d5bbaa0f5a7d652a64b0f2a45c05c1c074d0fc7
parent2edd327b27c4ee7e985cf27e5fe95ad21709dc53 (diff)
downloadgitlab-ce-issueable-list-cleanup.tar.gz
cleans up issuable list, making them more responsiveissueable-list-cleanup
-rw-r--r--app/assets/stylesheets/pages/issuable.scss50
-rw-r--r--app/views/projects/issues/_issue.html.haml79
-rw-r--r--changelogs/unreleased/issueable-list-cleanup.yml4
3 files changed, 74 insertions, 59 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index a776f3d19c7..0e727db141d 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -585,7 +585,22 @@
.issue-info-container {
-webkit-flex: 1;
flex: 1;
+ display: flex;
padding-right: $gl-padding;
+
+ .issue-main-info {
+ flex: 1 auto;
+ }
+
+ .issuable-meta {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-end;
+
+ .controls {
+ margin-bottom: 2px;
+ }
+ }
}
.issue-check {
@@ -598,25 +613,27 @@
}
}
- .issue-title,
- .issue-info {
- margin-right: 150px;
- }
-
- .issue-milestone a,
+ .issue-milestone,
.issue-info,
- .task-status {
+ .task-status,
+ .issue-updated-at {
font-weight: normal;
- font-size: 13px;
color: $gl-text-color-secondary;
+
+ a {
+ color: $gl-text-color;
+
+ .fa {
+ color: $gl-text-color-secondary;
+ }
+ }
}
- .issuable-meta {
- font-size: 13px;
- position: absolute;
- right: 15px;
- top: 15px;
- width: 150px;
+ @media(max-width: $screen-md-max) {
+ .task-status,
+ .issue-due-date {
+ display: none;
+ }
}
@media(max-width: $screen-xs-max) {
@@ -627,11 +644,6 @@
.issue-updated-at {
display: none;
}
-
- .issue-title,
- .issue-info {
- margin-right: 100px;
- }
}
}
}
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 78f8c572a31..96a6f8d6ccc 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -4,49 +4,48 @@
.issue-check
= check_box_tag dom_id(issue, "selected"), nil, false, 'data-id' => issue.id, class: "selected_issue"
.issue-info-container
- .issue-title.title
- %span.issue-title-text
- = confidential_icon(issue)
- = link_to issue.title, issue_path(issue)
- - if issue.tasks?
- %span.task-status
- &nbsp;
- = issue.task_status
-
-
+ .issue-main-info
+ .issue-title.title
+ %span.issue-title-text
+ = confidential_icon(issue)
+ = link_to issue.title, issue_path(issue)
+ - if issue.tasks?
+ %span.task-status
+ &nbsp;
+ = issue.task_status
- .issue-info
- %span.issue-reference
- #{issuable_reference(issue)}
- %span.issue-authored
- &middot;
- opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')}
- by #{link_to_member(@project, issue.author, avatar: false)}
+ .issue-info
+ %span.issue-reference
+ #{issuable_reference(issue)}
+ %span.issue-authored
+ &middot;
+ opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')}
+ by #{link_to_member(@project, issue.author, avatar: false)}
&nbsp;
- - if issue.milestone
- %span.issue-milestone
- = link_to namespace_project_issues_path(issue.project.namespace, issue.project, milestone_title: issue.milestone.title) do
- = icon('clock-o')
- = issue.milestone.title
+ - if issue.milestone
+ %span.issue-milestone
+ = link_to namespace_project_issues_path(issue.project.namespace, issue.project, milestone_title: issue.milestone.title) do
+ = icon('clock-o')
+ = issue.milestone.title
&nbsp;
- - if issue.due_date
- %span.issue-due-date{ class: "#{'cred' if issue.overdue?}" }
- = icon('calendar')
- = issue.due_date.to_s(:medium)
+ - if issue.due_date
+ %span.issue-due-date{ class: "#{'cred' if issue.overdue?}" }
+ = icon('calendar')
+ = issue.due_date.to_s(:medium)
&nbsp;
- - if issue.labels.any?
- - issue.labels.each do |label|
- = link_to_label(label, subject: issue.project, css_class: 'label-link')
- .issuable-meta
- %ul.controls
- - if issue.closed?
- %li
- CLOSED
+ - if issue.labels.any?
+ - issue.labels.each do |label|
+ = link_to_label(label, subject: issue.project, css_class: 'label-link')
+ .issuable-meta
+ %ul.controls
+ - if issue.closed?
+ %li
+ CLOSED
- - if issue.assignees.any?
- %li
- = render 'shared/issuable/assignees', project: @project, issue: issue
+ - if issue.assignees.any?
+ %li
+ = render 'shared/issuable/assignees', project: @project, issue: issue
- = render 'shared/issuable_meta_data', issuable: issue
- .pull-right.issue-updated-at
- %span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')}
+ = render 'shared/issuable_meta_data', issuable: issue
+ .pull-right.issue-updated-at
+ %span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')}
diff --git a/changelogs/unreleased/issueable-list-cleanup.yml b/changelogs/unreleased/issueable-list-cleanup.yml
new file mode 100644
index 00000000000..d3d67d04574
--- /dev/null
+++ b/changelogs/unreleased/issueable-list-cleanup.yml
@@ -0,0 +1,4 @@
+---
+title: Clean up UI of issuable lists and make more responsive
+merge_request:
+author: