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
Léo-Paul Géneau
gitlab-ce
Commits
a843ee7e
Commit
a843ee7e
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix votes block. twbs3 progress bars
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
8e900113
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
9 deletions
+15
-9
app/assets/stylesheets/sections/votes.scss
app/assets/stylesheets/sections/votes.scss
+5
-0
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+2
-2
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+2
-2
app/views/projects/milestones/_milestone.html.haml
app/views/projects/milestones/_milestone.html.haml
+1
-1
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+1
-1
app/views/projects/wikis/edit.html.haml
app/views/projects/wikis/edit.html.haml
+2
-1
app/views/votes/_votes_block.html.haml
app/views/votes/_votes_block.html.haml
+2
-2
No files found.
app/assets/stylesheets/sections/votes.scss
View file @
a843ee7e
...
...
@@ -36,3 +36,8 @@
display
:
inline-block
;
margin
:
0
8px
;
}
.votes-holder
{
float
:
right
;
width
:
250px
;
}
This diff is collapsed.
Click to expand it.
app/views/projects/issues/show.html.haml
View file @
a843ee7e
...
...
@@ -24,8 +24,8 @@
%i
.icon-edit
Edit
.
pull-right
.col-md-3
#votes
=
render
'votes/votes_block'
,
votable:
@issue
.
votes-holder
#votes
=
render
'votes/votes_block'
,
votable:
@issue
.back-link
=
link_to
project_issues_path
(
@project
)
do
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
a843ee7e
...
...
@@ -34,8 +34,8 @@
%i
.icon-edit
Edit
.
pull-right
.col-md-3
#votes
=
render
'votes/votes_block'
,
votable:
@merge_request
.
votes-holder
#votes
=
render
'votes/votes_block'
,
votable:
@merge_request
.back-link
=
link_to
project_merge_requests_path
(
@project
)
do
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/milestones/_milestone.html.haml
View file @
a843ee7e
...
...
@@ -24,4 +24,4 @@
%span
.light
#{
milestone
.
percent_complete
}
% complete
.progress.progress-info
.bar
{
style:
"width: #{milestone.percent_complete}%;"
}
.
progress-
bar
{
style:
"width: #{milestone.percent_complete}%;"
}
This diff is collapsed.
Click to expand it.
app/views/projects/milestones/show.html.haml
View file @
a843ee7e
...
...
@@ -40,7 +40,7 @@
#{
@milestone
.
open_items_count
}
open
%span
.pull-right
=
@milestone
.
expires_at
.progress.progress-info
.bar
{
style:
"width: #{@milestone.percent_complete}%;"
}
.
progress-
bar
{
style:
"width: #{@milestone.percent_complete}%;"
}
-
if
@milestone
.
description
.
present?
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/wikis/edit.html.haml
View file @
a843ee7e
=
render
'nav'
.pull-right
=
render
'main_links'
%h3
.page-title
Editing -
%span
.light
#{
@wiki
.
title
.
titleize
}
=
render
'main_links'
%hr
=
render
'form'
...
...
This diff is collapsed.
Click to expand it.
app/views/votes/_votes_block.html.haml
View file @
a843ee7e
.votes.votes-block
.progress
.
bar.
bar-success
{
style:
"width: #{votable.upvotes_in_percent}%;"
}
.
bar.
bar-danger
{
style:
"width: #{votable.downvotes_in_percent}%;"
}
.
progress-bar.progress-
bar-success
{
style:
"width: #{votable.upvotes_in_percent}%;"
}
.
progress-bar.progress-
bar-danger
{
style:
"width: #{votable.downvotes_in_percent}%;"
}
.upvotes
=
"
#{
votable
.
upvotes
}
up"
.downvotes
=
"
#{
votable
.
downvotes
}
down"
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