Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
177c2549
Commit
177c2549
authored
Feb 07, 2017
by
Nur Rony
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port of 27610-issue-number-alignment to EE
parent
358efac2
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
139 additions
and
120 deletions
+139
-120
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+12
-1
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+8
-1
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+54
-58
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+60
-59
changelogs/unreleased/27610-issue-number-alignment.yml
changelogs/unreleased/27610-issue-number-alignment.yml
+4
-0
No files found.
app/assets/stylesheets/pages/issuable.scss
View file @
177c2549
...
...
@@ -461,8 +461,19 @@
.issuable-list
{
li
{
.issue-box
{
display
:
-
webkit-flex
;
display
:
flex
;
}
.issue-info-container
{
-webkit-flex
:
1
;
flex
:
1
;
padding-right
:
$gl-padding
;
}
.issue-check
{
float
:
left
;
padding-right
:
$gl-padding
;
margin-bottom
:
10px
;
min-width
:
15px
;
...
...
app/assets/stylesheets/pages/issues.scss
View file @
177c2549
.issues-list
{
.issue
{
padding
:
10px
$gl-padding
;
padding
:
10px
0
10px
$gl-padding
;
position
:
relative
;
.title
{
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
177c2549
...
...
@@ -266,8 +266,15 @@
.mr-list
{
.merge-request
{
padding
:
10px
15px
;
padding
:
10px
0
10px
15px
;
position
:
relative
;
display
:
-
webkit-flex
;
display
:
flex
;
.issue-info-container
{
-webkit-flex
:
1
;
flex
:
1
;
}
.merge-request-title
{
margin-bottom
:
2px
;
...
...
app/views/projects/issues/_issue.html.haml
View file @
177c2549
%li
{
id:
dom_id
(
issue
),
class:
issue_css_classes
(
issue
),
url:
issue_path
(
issue
),
data:
{
labels:
issue
.
label_ids
,
id:
issue
.
id
}
}
.issue-box
-
if
@bulk_edit
.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
)
...
...
@@ -55,11 +56,6 @@
%span
.task-status
=
issue
.
task_status
-
if
issue
.
weight
%span
=
icon
(
'balance-scale'
)
=
issue
.
weight
.pull-right.issue-updated-at
%span
updated
#{
time_ago_with_tooltip
(
issue
.
updated_at
,
placement:
'bottom'
,
html_class:
'issue_update_ago'
)
}
app/views/projects/merge_requests/_merge_request.html.haml
View file @
177c2549
...
...
@@ -3,6 +3,7 @@
.issue-check
=
check_box_tag
dom_id
(
merge_request
,
"selected"
),
nil
,
false
,
'data-id'
=>
merge_request
.
id
,
class:
"selected_issue"
.issue-info-container
.merge-request-title.title
%span
.merge-request-title-text
=
link_to
merge_request
.
title
,
merge_request_path
(
merge_request
)
...
...
changelogs/unreleased/27610-issue-number-alignment.yml
0 → 100644
View file @
177c2549
---
title
:
fixes issue number alignment problem in MR and issue list
merge_request
:
9020
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment