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
Jérome Perrin
gitlab-ce
Commits
5e0b989f
Commit
5e0b989f
authored
Dec 23, 2015
by
Andriy Dyadyura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new button sizes
parent
98a63a49
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
15 deletions
+15
-15
app/assets/stylesheets/framework/issue_box.scss
app/assets/stylesheets/framework/issue_box.scss
+2
-2
app/assets/stylesheets/pages/detail_page.scss
app/assets/stylesheets/pages/detail_page.scss
+1
-1
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+2
-2
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+4
-4
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_discussion.html.haml
+2
-2
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+3
-3
app/views/projects/notes/_form.html.haml
app/views/projects/notes/_form.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/issue_box.scss
View file @
5e0b989f
...
...
@@ -5,7 +5,7 @@
*/
.status-box
{
@include
border-radius
(
2
px
);
@include
border-radius
(
3
px
);
display
:
block
;
float
:
left
;
...
...
@@ -25,7 +25,7 @@
}
&
.status-box-open
{
background-color
:
#
019875
;
background-color
:
#
31af64
;
color
:
#FFF
;
}
...
...
app/assets/stylesheets/pages/detail_page.scss
View file @
5e0b989f
...
...
@@ -5,7 +5,7 @@
border-bottom
:
1px
solid
$border-color
;
color
:
#5c5d5e
;
font-size
:
16px
;
line-height
:
42
px
;
line-height
:
34
px
;
.author
{
color
:
#5c5d5e
;
...
...
app/views/projects/issues/_discussion.html.haml
View file @
5e0b989f
-
content_for
:note_actions
do
-
if
can?
(
current_user
,
:update_issue
,
@issue
)
-
if
@issue
.
closed?
=
link_to
'Reopen Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
),
method: :put
,
class:
'btn btn-grouped btn-reopen js-note-target-reopen'
,
title:
'Reopen Issue'
=
link_to
'Reopen Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
),
method: :put
,
class:
'btn btn-
nr btn-
grouped btn-reopen js-note-target-reopen'
,
title:
'Reopen Issue'
-
else
=
link_to
'Close Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
),
method: :put
,
class:
'btn btn-grouped btn-close js-note-target-close'
,
title:
'Close Issue'
=
link_to
'Close Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
),
method: :put
,
class:
'btn btn-
nr btn-
grouped btn-close js-note-target-close'
,
title:
'Close Issue'
#notes
=
render
'projects/notes/notes_with_form'
app/views/projects/issues/show.html.haml
View file @
5e0b989f
...
...
@@ -23,16 +23,16 @@
.pull-right
-
if
can?
(
current_user
,
:create_issue
,
@project
)
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-grouped new-issue-link btn-success'
,
title:
'New Issue'
,
id:
'new_issue_link'
do
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-
nr btn-
grouped new-issue-link btn-success'
,
title:
'New Issue'
,
id:
'new_issue_link'
do
=
icon
(
'plus'
)
New Issue
-
if
can?
(
current_user
,
:update_issue
,
@issue
)
-
if
@issue
.
closed?
=
link_to
'Reopen'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
),
method: :put
,
class:
'btn btn-grouped btn-reopen'
=
link_to
'Reopen'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
),
method: :put
,
class:
'btn btn-
nr btn-
grouped btn-reopen'
-
else
=
link_to
'Close'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
),
method: :put
,
class:
'btn btn-grouped btn-close'
,
title:
'Close Issue'
=
link_to
'Close'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
),
method: :put
,
class:
'btn btn-
nr btn-
grouped btn-close'
,
title:
'Close Issue'
=
link_to
edit_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
@issue
),
class:
'btn btn-grouped issuable-edit'
do
=
link_to
edit_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
@issue
),
class:
'btn btn-
nr btn-
grouped issuable-edit'
do
=
icon
(
'pencil-square-o'
)
Edit
...
...
app/views/projects/merge_requests/_discussion.html.haml
View file @
5e0b989f
-
content_for
:note_actions
do
-
if
can?
(
current_user
,
:update_merge_request
,
@merge_request
)
-
if
@merge_request
.
open?
=
link_to
'Close'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-grouped btn-close close-mr-link js-note-target-close"
,
title:
"Close merge request"
=
link_to
'Close'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-
nr btn-
grouped btn-close close-mr-link js-note-target-close"
,
title:
"Close merge request"
-
if
@merge_request
.
closed?
=
link_to
'Reopen'
,
merge_request_path
(
@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"
=
link_to
'Reopen'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :reopen
}),
method: :put
,
class:
"btn btn-
nr btn-
grouped btn-reopen reopen-mr-link js-note-target-reopen"
,
title:
"Reopen merge request"
#notes
=
render
"projects/notes/notes_with_form"
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
5e0b989f
...
...
@@ -17,9 +17,9 @@
.issue-btn-group.pull-right
-
if
can?
(
current_user
,
:update_merge_request
,
@merge_request
)
-
if
@merge_request
.
open?
=
link_to
'Close'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :close
}),
method: :put
,
class:
'btn btn-grouped btn-close'
,
title:
'Close merge request'
=
link_to
edit_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'btn btn-grouped issuable-edit'
,
id:
'edit_merge_request'
do
=
link_to
'Close'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :close
}),
method: :put
,
class:
'btn btn-
nr btn-
grouped btn-close'
,
title:
'Close merge request'
=
link_to
edit_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'btn btn-
nr btn-
grouped issuable-edit'
,
id:
'edit_merge_request'
do
%i
.fa.fa-pencil-square-o
Edit
-
if
@merge_request
.
closed?
=
link_to
'Reopen'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :reopen
}),
method: :put
,
class:
'btn btn-grouped btn-reopen reopen-mr-link'
,
title:
'Reopen merge request'
=
link_to
'Reopen'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :reopen
}),
method: :put
,
class:
'btn btn-
nr btn-
grouped btn-reopen reopen-mr-link'
,
title:
'Reopen merge request'
app/views/projects/notes/_form.html.haml
View file @
5e0b989f
...
...
@@ -13,6 +13,6 @@
.error-alert
.note-form-actions.clearfix
=
f
.
submit
'Add Comment'
,
class:
"btn btn-create comment-btn btn-grouped js-comment-button"
=
f
.
submit
'Add Comment'
,
class:
"btn btn-
nr btn-
create comment-btn btn-grouped js-comment-button"
=
yield
(
:note_actions
)
%a
.btn.btn-cancel.js-close-discussion-note-form
Cancel
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