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
0
Merge Requests
0
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
iv
gitlab-ce
Commits
88b48017
Commit
88b48017
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve issue/mr page for tablets
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
5140a4cd
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
11 deletions
+13
-11
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+9
-7
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+2
-2
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_discussion.html.haml
+2
-2
No files found.
app/assets/stylesheets/sections/merge_requests.scss
View file @
88b48017
...
...
@@ -19,13 +19,15 @@
}
}
.merge-request
.merge-request-tabs
{
margin
:
20px
0
;
li
{
a
{
padding
:
15px
40px
;
font-size
:
14px
;
@media
(
min-width
:
$screen-sm-max
)
{
.merge-request
.merge-request-tabs
{
margin
:
20px
0
;
li
{
a
{
padding
:
15px
40px
;
font-size
:
14px
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/issues/_discussion.html.haml
View file @
88b48017
...
...
@@ -5,7 +5,7 @@
-
else
=
link_to
'Close Issue'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
state_event: :close
},
status_only:
true
),
method: :put
,
class:
"btn btn-grouped btn-close js-note-target-close"
,
title:
"Close Issue"
.row
.col-
sm
-9
.col-
md
-9
.participants
%cite
.cgray
=
pluralize
(
@issue
.
participants
.
count
,
'participant'
)
...
...
@@ -13,7 +13,7 @@
=
link_to_member
(
@project
,
participant
,
name:
false
,
size:
24
)
.voting_notes
#notes
=
render
"projects/notes/notes_with_form"
.col-
sm-3
.col-
md-3.hidden-sm.hidden-xs
%div
.clearfix
%span
.slead.has_tooltip
{
:"data-original-title"
=>
'Cross-project reference'
}
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/_discussion.html.haml
View file @
88b48017
...
...
@@ -6,10 +6,10 @@
=
link_to
'Reopen'
,
project_merge_request_path
(
@project
,
@merge_request
,
merge_request:
{
state_event: :reopen
}),
method: :put
,
class:
"btn btn-grouped btn-reopen reopen-mr-link js-note-target-reopen"
,
title:
"Reopen merge request"
.row
.col-
sm
-9
.col-
md
-9
=
render
"projects/merge_requests/show/participants"
=
render
"projects/notes/notes_with_form"
.col-
sm-3
.col-
md-3.hidden-sm.hidden-xs
.clearfix
%span
.slead.has_tooltip
{
:"data-original-title"
=>
'Cross-project reference'
}
=
cross_project_reference
(
@project
,
@merge_request
)
...
...
This diff is collapsed.
Click to expand it.
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