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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
fa4c38f3
Commit
fa4c38f3
authored
Oct 16, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issues close and reopen button text and styles
parent
2a750bf2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
app/assets/stylesheets/sections/issues.scss
app/assets/stylesheets/sections/issues.scss
+17
-0
app/views/issues/_show.html.haml
app/views/issues/_show.html.haml
+1
-1
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+2
-2
No files found.
app/assets/stylesheets/sections/issues.scss
View file @
fa4c38f3
...
@@ -65,6 +65,23 @@ input.check_all_issues {
...
@@ -65,6 +65,23 @@ input.check_all_issues {
}
}
}
}
.btn.close_issue
{
color
:
#B94A48
;
font-weight
:
bold
;
@include
shade
;
&
:hover
{
color
:
#B94A48
;
}
}
.btn.reopen_issue
{
color
:
#468847
;
font-weight
:
bold
;
@include
shade
;
&
:hover
{
color
:
#468847
;
}
}
@media
(
min-width
:
800px
)
{
.issues_filters
select
{
width
:
160px
;
}
}
@media
(
min-width
:
800px
)
{
.issues_filters
select
{
width
:
160px
;
}
}
@media
(
min-width
:
1000px
)
{
.issues_filters
select
{
width
:
200px
;
}
}
@media
(
min-width
:
1000px
)
{
.issues_filters
select
{
width
:
200px
;
}
}
@media
(
min-width
:
1200px
)
{
.issues_filters
select
{
width
:
220px
;
}
}
@media
(
min-width
:
1200px
)
{
.issues_filters
select
{
width
:
220px
;
}
}
...
...
app/views/issues/_show.html.haml
View file @
fa4c38f3
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
-
if
issue
.
closed
-
if
issue
.
closed
=
link_to
'Reopen'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
closed:
false
},
status_only:
true
),
method: :put
,
class:
"btn small grouped reopen_issue"
,
remote:
true
=
link_to
'Reopen'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
closed:
false
},
status_only:
true
),
method: :put
,
class:
"btn small grouped reopen_issue"
,
remote:
true
-
else
-
else
=
link_to
'
Resolve'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
closed:
true
},
status_only:
true
),
method: :put
,
class:
"success
btn small grouped close_issue"
,
remote:
true
=
link_to
'
Close'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
closed:
true
},
status_only:
true
),
method: :put
,
class:
"
btn small grouped close_issue"
,
remote:
true
=
link_to
edit_project_issue_path
(
issue
.
project
,
issue
),
class:
"btn small edit-issue-link"
,
remote:
true
do
=
link_to
edit_project_issue_path
(
issue
.
project
,
issue
),
class:
"btn small edit-issue-link"
,
remote:
true
do
%i
.icon-edit
%i
.icon-edit
Edit
Edit
...
...
app/views/issues/show.html.haml
View file @
fa4c38f3
...
@@ -8,9 +8,9 @@
...
@@ -8,9 +8,9 @@
%span
.right
%span
.right
-
if
can?
(
current_user
,
:admin_project
,
@project
)
||
@issue
.
author
==
current_user
-
if
can?
(
current_user
,
:admin_project
,
@project
)
||
@issue
.
author
==
current_user
-
if
@issue
.
closed
-
if
@issue
.
closed
=
link_to
'Reopen'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
closed:
false
},
status_only:
true
),
method: :put
,
class:
"btn grouped
success
"
=
link_to
'Reopen'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
closed:
false
},
status_only:
true
),
method: :put
,
class:
"btn grouped
reopen_issue
"
-
else
-
else
=
link_to
'Close'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
closed:
true
},
status_only:
true
),
method: :put
,
class:
"btn grouped
danger
"
,
title:
"Close Issue"
=
link_to
'Close'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
closed:
true
},
status_only:
true
),
method: :put
,
class:
"btn grouped
close_issue
"
,
title:
"Close Issue"
-
if
can?
(
current_user
,
:admin_project
,
@project
)
||
@issue
.
author
==
current_user
-
if
can?
(
current_user
,
:admin_project
,
@project
)
||
@issue
.
author
==
current_user
=
link_to
edit_project_issue_path
(
@project
,
@issue
),
class:
"btn grouped"
do
=
link_to
edit_project_issue_path
(
@project
,
@issue
),
class:
"btn grouped"
do
%i
.icon-edit
%i
.icon-edit
...
...
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