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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
64e76a87
Commit
64e76a87
authored
Sep 18, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Notes votes: use icons instead of borders. Removed unnecessary padding
parent
2aafd7cf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
10 deletions
+22
-10
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+12
-0
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+1
-9
app/views/notes/_note.html.haml
app/views/notes/_note.html.haml
+9
-1
No files found.
app/assets/stylesheets/common.scss
View file @
64e76a87
...
@@ -158,6 +158,18 @@ span.update-author {
...
@@ -158,6 +158,18 @@ span.update-author {
padding
:
6px
;
padding
:
6px
;
}
}
}
}
&
.label-success
{
background-color
:
#8D8
;
color
:
#333
;
text-shadow
:
0
1px
1px
white
;
}
&
.label-error
{
background-color
:
#D88
;
color
:
#333
;
text-shadow
:
0
1px
1px
white
;
}
}
}
.event_label
{
.event_label
{
...
...
app/assets/stylesheets/sections/notes.scss
View file @
64e76a87
...
@@ -73,15 +73,7 @@
...
@@ -73,15 +73,7 @@
/* mark vote notes */
/* mark vote notes */
.voting_notes
.note
{
.voting_notes
.note
{
padding
:
8px
0
8px
12px
;
padding
:
8px
0
;
&
.upvote
{
padding-left
:
8px
;
border-left
:
4px
solid
#468847
;
}
&
.downvote
{
padding-left
:
8px
;
border-left
:
4px
solid
#B94A48
;
}
}
}
.notes-status
{
.notes-status
{
...
...
app/views/notes/_note.html.haml
View file @
64e76a87
...
@@ -6,8 +6,16 @@
...
@@ -6,8 +6,16 @@
%cite
.cgray
%cite
.cgray
=
time_ago_in_words
(
note
.
updated_at
)
=
time_ago_in_words
(
note
.
updated_at
)
ago
ago
-
if
note
.
upvote?
%span
.label.label-success
%i
.icon-thumbs-up
\+1
-
if
note
.
downvote?
%span
.label.label-error
%i
.icon-thumbs-down
\-1
-
if
(
note
.
author_id
==
current_user
.
id
)
||
can?
(
current_user
,
:admin_note
,
@project
)
-
if
(
note
.
author_id
==
current_user
.
id
)
||
can?
(
current_user
,
:admin_note
,
@project
)
=
link_to
[
@project
,
note
],
confirm:
'Are you sure?'
,
method: :delete
,
remote:
true
,
class:
"cred delete-note btn very_small"
do
=
link_to
[
@project
,
note
],
confirm:
'Are you sure?'
,
method: :delete
,
remote:
true
,
class:
"cred delete-note btn very_small"
do
%i
.icon-trash
%i
.icon-trash
Remove
Remove
...
...
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