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
243bfc97
Unverified
Commit
243bfc97
authored
Sep 07, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small restyle of issue and merge request pages
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
e0da2c35
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
68 additions
and
37 deletions
+68
-37
gl_variables.scss
app/assets/stylesheets/base/gl_variables.scss
+4
-0
blocks.scss
app/assets/stylesheets/generic/blocks.scss
+5
-0
issue_box.scss
app/assets/stylesheets/generic/issue_box.scss
+6
-3
issuable.scss
app/assets/stylesheets/pages/issuable.scss
+19
-0
show.html.haml
app/views/projects/issues/show.html.haml
+17
-17
_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-3
_mr_box.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
+11
-10
_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+5
-4
No files found.
app/assets/stylesheets/base/gl_variables.scss
View file @
243bfc97
...
@@ -22,6 +22,10 @@ $brand-info: $gl-info;
...
@@ -22,6 +22,10 @@ $brand-info: $gl-info;
$brand-warning
:
$gl-warning
;
$brand-warning
:
$gl-warning
;
$brand-danger
:
$gl-danger
;
$brand-danger
:
$gl-danger
;
$border-radius-base
:
3px
!
default
;
$border-radius-large
:
5px
!
default
;
$border-radius-small
:
2px
!
default
;
//== Scaffolding
//== Scaffolding
//
//
...
...
app/assets/stylesheets/generic/blocks.scss
View file @
243bfc97
...
@@ -27,6 +27,11 @@
...
@@ -27,6 +27,11 @@
border-bottom
:
1px
solid
#e7e9ed
;
border-bottom
:
1px
solid
#e7e9ed
;
color
:
$gl-gray
;
color
:
$gl-gray
;
&
.middle-block
{
margin-top
:
0
;
margin-bottom
:
0
;
}
&
.second-block
{
&
.second-block
{
margin-top
:
-1px
;
margin-top
:
-1px
;
margin-bottom
:
0
;
margin-bottom
:
0
;
...
...
app/assets/stylesheets/generic/issue_box.scss
View file @
243bfc97
...
@@ -5,10 +5,13 @@
...
@@ -5,10 +5,13 @@
*/
*/
.issue-box
{
.issue-box
{
@include
border-radius
(
3px
);
display
:
inline-block
;
display
:
inline-block
;
padding
:
4px
13px
;
padding
:
10px
$gl-padding
;
font-weight
:
normal
;
font-weight
:
normal
;
margin-right
:
5px
;
margin-right
:
10px
;
font-size
:
$gl-font-size
;
&
.issue-box-closed
{
&
.issue-box-closed
{
background-color
:
$gl-danger
;
background-color
:
$gl-danger
;
...
@@ -21,7 +24,7 @@
...
@@ -21,7 +24,7 @@
}
}
&
.issue-box-open
{
&
.issue-box-open
{
background-color
:
$gl-success
;
background-color
:
#019875
;
color
:
#FFF
;
color
:
#FFF
;
}
}
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
243bfc97
...
@@ -56,3 +56,22 @@
...
@@ -56,3 +56,22 @@
text-align
:
left
;
text-align
:
left
;
}
}
}
}
.issuable-details
{
.page-title
{
margin-top
:
-15px
;
padding
:
10px
0
;
margin-bottom
:
0
;
color
:
$gl-gray
;
font-size
:
16px
;
.author
{
color
:
$gl-gray
;
}
.issue-id
{
font-size
:
19px
;
color
:
$gl-text-color
;
}
}
}
app/views/projects/issues/show.html.haml
View file @
243bfc97
-
page_title
"
#{
@issue
.
title
}
(#
#{
@issue
.
iid
}
)"
,
"Issues"
-
page_title
"
#{
@issue
.
title
}
(#
#{
@issue
.
iid
}
)"
,
"Issues"
.issue
.issue
.issue-details.issuable-details
.issue-details.issuable-details
%h4
.page-title
.page-title
.issue-box
{
class:
issue_box_class
(
@issue
)
}
.issue-box
{
class:
issue_box_class
(
@issue
)
}
-
if
@issue
.
closed?
-
if
@issue
.
closed?
Closed
Closed
-
else
-
else
Open
Open
Issue ##{@issue.iid}
%span
.issue-id
Issue ##{@issue.iid}
%small
.creator
%span
.creator
·
created by
#{
link_to_member
(
@project
,
@issue
.
author
)
}
·
created by
#{
link_to_member
(
@project
,
@issue
.
author
,
size:
24
)
}
·
=
time_ago_with_tooltip
(
@issue
.
created_at
,
placement:
'bottom'
,
html_class:
'issue_created_ago'
)
=
time_ago_with_tooltip
(
@issue
.
created_at
,
placement:
'bottom'
,
html_class:
'issue_created_ago'
)
-
if
@issue
.
updated_at
!=
@issue
.
created_at
-
if
@issue
.
updated_at
!=
@issue
.
created_at
%span
%span
...
@@ -32,18 +33,17 @@
...
@@ -32,18 +33,17 @@
=
icon
(
'pencil-square-o'
)
=
icon
(
'pencil-square-o'
)
Edit
Edit
%hr
.gray-content-block.middle-block
%h2
.issue-title
%h2
.issue-title
=
gfm
escape_once
(
@issue
.
title
)
=
gfm
escape_once
(
@issue
.
title
)
%div
%div
-
if
@issue
.
description
.
present?
-
if
@issue
.
description
.
present?
.description
{
class:
can?
(
current_user
,
:update_issue
,
@issue
)
?
'js-task-list-container'
:
''
}
.description
{
class:
can?
(
current_user
,
:update_issue
,
@issue
)
?
'js-task-list-container'
:
''
}
.wiki
.wiki
=
preserve
do
=
preserve
do
=
markdown
(
@issue
.
description
)
=
markdown
(
@issue
.
description
)
%textarea
.hidden.js-task-list-field
%textarea
.hidden.js-task-list-field
=
@issue
.
description
=
@issue
.
description
%hr
.issue-discussion.prepend-top-default
.issue-discussion
=
render
'projects/issues/discussion'
=
render
'projects/issues/discussion'
app/views/projects/merge_requests/_show.html.haml
View file @
243bfc97
...
@@ -5,10 +5,8 @@
...
@@ -5,10 +5,8 @@
.merge-request
{
'data-url'
=>
merge_request_path
(
@merge_request
)}
.merge-request
{
'data-url'
=>
merge_request_path
(
@merge_request
)}
.merge-request-details.issuable-details
.merge-request-details.issuable-details
=
render
"projects/merge_requests/show/mr_title"
=
render
"projects/merge_requests/show/mr_title"
%hr
=
render
"projects/merge_requests/show/mr_box"
=
render
"projects/merge_requests/show/mr_box"
%hr
.append-bottom-20.mr-source-target.prepend-top-default
.append-bottom-20.mr-source-target
-
if
@merge_request
.
open?
-
if
@merge_request
.
open?
.pull-right
.pull-right
-
if
@merge_request
.
source_branch_exists?
-
if
@merge_request
.
source_branch_exists?
...
...
app/views/projects/merge_requests/show/_mr_box.html.haml
View file @
243bfc97
%h2
.issue-title
.gray-content-block.middle-block
=
gfm
escape_once
(
@merge_request
.
title
)
%h2
.issue-title
=
gfm
escape_once
(
@merge_request
.
title
)
%div
%div
-
if
@merge_request
.
description
.
present?
-
if
@merge_request
.
description
.
present?
.description
{
class:
can?
(
current_user
,
:update_merge_request
,
@merge_request
)
?
'js-task-list-container'
:
''
}
.description
{
class:
can?
(
current_user
,
:update_merge_request
,
@merge_request
)
?
'js-task-list-container'
:
''
}
.wiki
.wiki
=
preserve
do
=
preserve
do
=
markdown
(
@merge_request
.
description
)
=
markdown
(
@merge_request
.
description
)
%textarea
.hidden.js-task-list-field
%textarea
.hidden.js-task-list-field
=
@merge_request
.
description
=
@merge_request
.
description
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
243bfc97
%h4
.page-title
.page-title
.issue-box
{
class:
issue_box_class
(
@merge_request
)
}
.issue-box
{
class:
issue_box_class
(
@merge_request
)
}
=
@merge_request
.
state_human_name
=
@merge_request
.
state_human_name
Merge Request ##{@merge_request.iid}
%span
.issue-id
Merge Request ##{@merge_request.iid}
%small
.creator
%span
.creator
·
created by
#{
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
)
}
·
·
created by
#{
link_to_member
(
@project
,
@merge_request
.
author
)
}
=
time_ago_with_tooltip
(
@merge_request
.
created_at
)
=
time_ago_with_tooltip
(
@merge_request
.
created_at
)
-
if
@merge_request
.
updated_at
!=
@merge_request
.
created_at
-
if
@merge_request
.
updated_at
!=
@merge_request
.
created_at
%span
%span
...
...
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