From c811e1a78f59df86126d16e17d5a8a498c82d451 Mon Sep 17 00:00:00 2001 From: Hauke Klement Date: Wed, 11 Mar 2015 09:58:33 +0100 Subject: [PATCH] minor improvements for progress bars --- app/assets/javascripts/editor.js | 6 +++--- app/assets/stylesheets/base.css.scss | 1 + app/helpers/application_helper.rb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/editor.js b/app/assets/javascripts/editor.js index 43e05c73..def40fd2 100644 --- a/app/assets/javascripts/editor.js +++ b/app/assets/javascripts/editor.js @@ -175,11 +175,11 @@ $(function() { var getProgressBarClass = function(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) { - return 'progress-bar progress-bar-warning'; + return 'progress-bar progress-bar-striped progress-bar-warning'; } else { - return 'progress-bar progress-bar-success'; + return 'progress-bar progress-bar-striped progress-bar-success'; } }; diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss index 35867d79..d9ddbeda 100644 --- a/app/assets/stylesheets/base.css.scss +++ b/app/assets/stylesheets/base.css.scss @@ -21,6 +21,7 @@ span.caret { .progress-bar { line-height: initial; + min-width: 2em; } } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7051ff0b..3a31fadd 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -34,7 +34,7 @@ module ApplicationHelper def progress_bar(value) 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