diff --git a/src/definitions/modules/progress.js b/src/definitions/modules/progress.js index 54fdb0c56..78d630495 100644 --- a/src/definitions/modules/progress.js +++ b/src/definitions/modules/progress.js @@ -19,13 +19,13 @@ $.fn.progress = function(parameters) { moduleSelector = $allModules.selector || '', - hasTouch = ('ontouchstart' in document.documentElement), time = new Date().getTime(), performance = [], query = arguments[0], methodInvoked = (typeof query == 'string'), queryArguments = [].slice.call(arguments, 1), + returnedValue ; @@ -584,7 +584,7 @@ $.fn.progress.settings = { name : 'Progress', namespace : 'progress', - debug : false, + debug : true, verbose : true, performance : true, diff --git a/src/definitions/modules/progress.less b/src/definitions/modules/progress.less index 875b244fa..7be5c9ec5 100755 --- a/src/definitions/modules/progress.less +++ b/src/definitions/modules/progress.less @@ -123,7 +123,6 @@ position: @barPosition; width: @barInitialWidth; min-width: @barMinWidth; - height: @barHeight; background: @barBackground; border-radius: @barBorderRadius; transition: @barTransition; @@ -393,6 +392,37 @@ Sizes ---------------*/ +.ui.tiny.progress { + font-size: @tiny; +} +.ui.tiny.progress .bar { + height: @tinyBarHeight; +} + +.ui.small.progress { + font-size: @small; +} .ui.small.progress .bar { - height: 14px; + height: @smallBarHeight; +} + +.ui.progress { + font-size: @medium; +} +.ui.progress .bar { + height: @barHeight; +} + +.ui.large.progress { + font-size: @large; +} +.ui.large.progress .bar { + height: @largeBarHeight; +} + +.ui.big.progress { + font-size: @big; +} +.ui.big.progress .bar { + height: @bigBarHeight; } \ No newline at end of file diff --git a/src/themes/default/modules/progress.variables b/src/themes/default/modules/progress.variables index ea365deec..ddb39d205 100644 --- a/src/themes/default/modules/progress.variables +++ b/src/themes/default/modules/progress.variables @@ -22,9 +22,11 @@ @barHeight: 1.75em; @barBackground: #888888; @barBorderRadius: @borderRadius; +@barTransitionEasing: linear; +@barTransitionDuration: 0.2s; @barTransition: - width 0.5s @defaultEasing, - background-color 0.4s @defaultEasing + width @barTransitionDuration @barTransitionEasing, + background-color @barTransitionDuration @barTransitionEasing ; @barInitialWidth: 0%; @barMinWidth: 2em; @@ -83,7 +85,7 @@ /*------------------- - Types + Variations --------------------*/ /* Attached */ @@ -97,3 +99,9 @@ @invertedBarBackground: @barBackground; @invertedProgressColor: @offWhite; @invertedLabelColor: @white; + +/* Sizing */ +@tinyBarHeight: 0.5em; +@smallBarHeight: 1em; +@largeBarHeight: 2.5em; +@bigBarHeight: 3.5em;