htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor improvements for progress bars

Browse Source
This commit is contained in:
Hauke Klement
2015-03-11 09:58:33 +01:00
parent 0673d44820
commit c811e1a78f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/editor.js
View File

@ -175,11 +175,11 @@ $(function() {
var getProgressBarClass = function(percentage) { var getProgressBarClass = function(percentage) {
if (percentage < ADEQUATE_PERCENTAGE) { if (percentage < ADEQUATE_PERCENTAGE) {
return 'progress-bar progress-bar-danger'; return 'progress-bar progress-bar-striped progress-bar-danger';
} else if (percentage < SUCCESSFULL_PERCENTAGE) { } else if (percentage < SUCCESSFULL_PERCENTAGE) {
return 'progress-bar progress-bar-warning'; return 'progress-bar progress-bar-striped progress-bar-warning';
} else { } else {
return 'progress-bar progress-bar-success'; return 'progress-bar progress-bar-striped progress-bar-success';
} }
}; };

1
app/assets/stylesheets/base.css.scss
View File

@ -21,6 +21,7 @@ span.caret {
.progress-bar { .progress-bar {
line-height: initial; line-height: initial;
min-width: 2em;
} }
} }

2
app/helpers/application_helper.rb
View File

@ -34,7 +34,7 @@ module ApplicationHelper
def progress_bar(value) def progress_bar(value)
content_tag(:div, class: 'progress') do content_tag(:div, class: 'progress') do
content_tag(:div, "#{value}%", :'aria-valuemax' => 100, :'aria-valuemin' => 0, :'aria-valuenow' => value, class: 'progress-bar', role: 'progressbar', style: "width: #{[value, 100].min}%;") content_tag(:div, "#{value}%", :'aria-valuemax' => 100, :'aria-valuemin' => 0, :'aria-valuenow' => value, class: 'progress-bar progress-bar-striped', role: 'progressbar', style: "width: #{[value, 100].min}%;")
end end
end end