BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
ca81c1c0
Unverified
Commit
ca81c1c0
authored
Feb 08, 2017
by
Nur Rony
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replaces media query with flexbox
parent
4cde12df
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
66 additions
and
62 deletions
+66
-62
issuable.scss
app/assets/stylesheets/pages/issuable.scss
+9
-7
merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+4
-3
_issue.html.haml
app/views/projects/issues/_issue.html.haml
+53
-52
No files found.
app/assets/stylesheets/pages/issuable.scss
View file @
ca81c1c0
...
...
@@ -461,17 +461,19 @@
.issuable-list
{
li
{
.issue-info-container
{
display
:
inline-block
;
width
:
96
.5%
;
@media
(
max-width
:
$screen-md-max
)
{
width
:
95%
;
}
.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/merge_requests.scss
View file @
ca81c1c0
...
...
@@ -268,11 +268,12 @@
.merge-request
{
padding
:
10px
0
10px
15px
;
position
:
relative
;
display
:
-
webkit-flex
;
display
:
flex
;
.issue-info-container
{
@media
(
max-width
:
$screen-xs-max
)
{
width
:
88%
;
}
-webkit-flex
:
1
;
flex
:
1
;
}
.merge-request-title
{
...
...
app/views/projects/issues/_issue.html.haml
View file @
ca81c1c0
%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-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
)
%ul
.controls
-
if
issue
.
closed?
%li
CLOSED
.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
)
=
link_to
issue
.
title
,
issue_path
(
issue
)
%ul
.controls
-
if
issue
.
closed?
%li
CLOSED
-
if
issue
.
assignee
%li
=
link_to_member
(
@project
,
issue
.
assignee
,
name:
false
,
title:
"Assigned to :name"
)
-
if
issue
.
assignee
%li
=
link_to_member
(
@project
,
issue
.
assignee
,
name:
false
,
title:
"Assigned to :name"
)
-
upvotes
,
downvotes
=
issue
.
upvotes
,
issue
.
downvotes
-
if
upvotes
>
0
%li
=
icon
(
'thumbs-up'
)
=
upvotes
-
upvotes
,
downvotes
=
issue
.
upvotes
,
issue
.
downvotes
-
if
upvotes
>
0
%li
=
icon
(
'thumbs-up'
)
=
upvotes
-
if
downvotes
>
0
%li
=
icon
(
'thumbs-down'
)
=
downvotes
-
if
downvotes
>
0
%li
=
icon
(
'thumbs-down'
)
=
downvotes
-
note_count
=
issue
.
notes
.
user
.
count
%li
=
link_to
issue_path
(
issue
,
anchor:
'notes'
),
class:
(
'no-comments'
if
note_count
.
zero?
)
do
=
icon
(
'comments'
)
=
note_count
-
note_count
=
issue
.
notes
.
user
.
count
%li
=
link_to
issue_path
(
issue
,
anchor:
'notes'
),
class:
(
'no-comments'
if
note_count
.
zero?
)
do
=
icon
(
'comments'
)
=
note_count
.issue-info
#{
issuable_reference
(
issue
)
}
·
opened
#{
time_ago_with_tooltip
(
issue
.
created_at
,
placement:
'bottom'
)
}
by
#{
link_to_member
(
@project
,
issue
.
author
,
avatar:
false
)
}
-
if
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
.
due_date
%span
{
class:
"#{'cred' if issue.overdue?}"
}
.issue-info
#{
issuable_reference
(
issue
)
}
·
opened
#{
time_ago_with_tooltip
(
issue
.
created_at
,
placement:
'bottom'
)
}
by
#{
link_to_member
(
@project
,
issue
.
author
,
avatar:
false
)
}
-
if
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
.
due_date
%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'
)
=
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?
%span
.task-status
=
issue
.
task_status
%span
.task-status
=
issue
.
task_status
.pull-right.issue-updated-at
%span
updated
#{
time_ago_with_tooltip
(
issue
.
updated_at
,
placement:
'bottom'
,
html_class:
'issue_update_ago'
)
}
.pull-right.issue-updated-at
%span
updated
#{
time_ago_with_tooltip
(
issue
.
updated_at
,
placement:
'bottom'
,
html_class:
'issue_update_ago'
)
}
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