diff --git a/source/UI/css/UI.css b/source/UI/css/UI.css index 41abd8d4..3cfba12b 100644 --- a/source/UI/css/UI.css +++ b/source/UI/css/UI.css @@ -233,6 +233,12 @@ Bars border-radius: 8px; margin: -1px; } +.OxProgressbar.OxSquared, +.OxProgressbar.OxSquared .OxTrack, +.OxProgressbar.OxSquared .OxProgress { + border-radius: 4px; +} + .OxProgressbar .OxProgress.OxAnimate { -webkit-animation: progress 1s linear infinite; } diff --git a/source/UI/js/Bar/Progressbar.js b/source/UI/js/Bar/Progressbar.js index 74b3b905..e8e240f8 100644 --- a/source/UI/js/Bar/Progressbar.js +++ b/source/UI/js/Bar/Progressbar.js @@ -30,6 +30,7 @@ Ox.Progressbar = function(options, self) { cancelled: false, paused: false, progress: 0, + style: 'default', showCancelButton: false, showPauseButton: false, showPercent: false, @@ -50,7 +51,11 @@ Ox.Progressbar = function(options, self) { !self.options.paused && !self.options.cancelled && setProgress(true); } }) - .addClass('OxProgressbar') + .addClass('OxProgressbar' + ( + self.options.style != 'default' + ? ' Ox' + Ox.toTitleCase(self.options.style) + : '' + )) .css({width: self.options.width - 2 + 'px'}); self.indeterminate = self.options.progress == -1;