From ac8bee6aebd69db0c110343a527ae5b7d0ec6092 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 20 May 2022 05:04:45 +0200 Subject: [PATCH] Remove fomantic progress module (#19760) Replace it with HTML `` element. The bar won't go green at 100% anymore but I think it's not something that fits stylistically anyways. --- templates/repo/issue/milestones.tmpl | 11 +- templates/shared/issuelist.tmpl | 3 +- templates/user/dashboard/milestones.tmpl | 13 +- web_src/fomantic/build/semantic.css | 944 -------------------- web_src/fomantic/build/semantic.js | 1036 ---------------------- web_src/fomantic/semantic.json | 1 - web_src/js/features/common-global.js | 3 - web_src/less/_base.less | 20 +- web_src/less/_repository.less | 23 +- web_src/less/shared/issuelist.less | 10 +- web_src/less/themes/theme-arc-green.less | 8 - 11 files changed, 37 insertions(+), 2035 deletions(-) diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 944438df95..b6b1c76d78 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -61,10 +61,13 @@
{{range .Milestones}}
  • - {{svg "octicon-milestone" 16 "mr-2"}} {{.Name}} -
    -
    -
    +
    +

    + {{svg "octicon-milestone" 16 "mr-3"}}{{.Name}} +

    +
    + {{.Completeness}}% +
    diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index e81855851b..23fb76d500 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -73,7 +73,8 @@ {{if gt $tasks 0}} {{$tasksDone := .GetTasksDone}} - {{svg "octicon-checklist" 14 "mr-2"}}{{$tasksDone}} / {{$tasks}} + {{svg "octicon-checklist" 14 "mr-2"}}{{$tasksDone}} / {{$tasks}} + {{end}} {{if ne .DeadlineUnix 0}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index c551c91e39..385f5c529b 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -80,11 +80,14 @@
    {{range .Milestones}}
  • -
    {{.Repo.FullName}}
    - {{svg "octicon-milestone"}} {{.Name}} -
    -
    -
    +
    +

    + {{.Repo.FullName}} + {{svg "octicon-milestone" 16 "mr-3"}}{{.Name}} +

    +
    + {{.Completeness}}% +
    diff --git a/web_src/fomantic/build/semantic.css b/web_src/fomantic/build/semantic.css index 56134e4c0d..e60d06b1ff 100644 --- a/web_src/fomantic/build/semantic.css +++ b/web_src/fomantic/build/semantic.css @@ -34867,950 +34867,6 @@ Floated Menu / Item /******************************* User Overrides *******************************/ -/*! - * # Fomantic-UI - Progress Bar - * http://github.com/fomantic/Fomantic-UI/ - * - * - * Released under the MIT license - * http://opensource.org/licenses/MIT - * - */ - -/******************************* - Progress -*******************************/ - -.ui.progress { - position: relative; - display: block; - max-width: 100%; - border: none; - margin: 1em 0 2.5em; - box-shadow: none; - background: rgba(0, 0, 0, 0.1); - padding: 0; - border-radius: 0.28571429rem; -} - -.ui.progress:first-child { - margin: 0 0 2.5em; -} - -.ui.progress:last-child { - margin: 0 0 1.5em; -} - -/******************************* - Content -*******************************/ - -/* Activity Bar */ - -.ui.progress .bar { - display: block; - line-height: 1; - position: relative; - width: 0; - min-width: 2em; - background: #888888; - border-radius: 0.28571429rem; - transition: width 0.1s ease, background-color 0.1s ease; - overflow: hidden; -} - -.ui.ui.ui.progress:not([data-percent]):not(.indeterminate) .bar, -.ui.ui.ui.progress[data-percent="0"]:not(.indeterminate) .bar { - background: transparent; -} - -.ui.progress[data-percent="0"] .bar .progress { - color: rgba(0, 0, 0, 0.87); -} - -.ui.inverted.progress[data-percent="0"] .bar .progress { - color: rgba(255, 255, 255, 0.9); -} - -/* Percent Complete */ - -.ui.progress .bar > .progress { - white-space: nowrap; - position: absolute; - width: auto; - font-size: 0.92857143em; - top: 50%; - right: 0.5em; - left: auto; - bottom: auto; - color: rgba(255, 255, 255, 0.7); - text-shadow: none; - margin-top: -0.5em; - font-weight: 500; - text-align: left; -} - -/* Label */ - -.ui.progress > .label { - position: absolute; - width: 100%; - font-size: 1em; - top: 100%; - right: auto; - left: 0; - bottom: auto; - color: rgba(0, 0, 0, 0.87); - font-weight: 500; - text-shadow: none; - margin-top: 0.2em; - text-align: center; - transition: color 0.4s ease; -} - -/******************************* - Types -*******************************/ - -/* Indicating */ - -.ui.indicating.progress[data-percent^="1"] .bar, -.ui.indicating.progress[data-percent^="2"] .bar { - background-color: #D95C5C; -} - -.ui.indicating.progress[data-percent^="3"] .bar { - background-color: #EFBC72; -} - -.ui.indicating.progress[data-percent^="4"] .bar, -.ui.indicating.progress[data-percent^="5"] .bar { - background-color: #E6BB48; -} - -.ui.indicating.progress[data-percent^="6"] .bar { - background-color: #DDC928; -} - -.ui.indicating.progress[data-percent^="7"] .bar, -.ui.indicating.progress[data-percent^="8"] .bar { - background-color: #B4D95C; -} - -.ui.indicating.progress[data-percent^="9"] .bar, -.ui.indicating.progress[data-percent^="100"] .bar { - background-color: #66DA81; -} - -/* Indicating Label */ - -.ui.indicating.progress[data-percent^="1"] .label, -.ui.indicating.progress[data-percent^="2"] .label { - color: rgba(0, 0, 0, 0.87); -} - -.ui.indicating.progress[data-percent^="3"] .label { - color: rgba(0, 0, 0, 0.87); -} - -.ui.indicating.progress[data-percent^="4"] .label, -.ui.indicating.progress[data-percent^="5"] .label { - color: rgba(0, 0, 0, 0.87); -} - -.ui.indicating.progress[data-percent^="6"] .label { - color: rgba(0, 0, 0, 0.87); -} - -.ui.indicating.progress[data-percent^="7"] .label, -.ui.indicating.progress[data-percent^="8"] .label { - color: rgba(0, 0, 0, 0.87); -} - -.ui.indicating.progress[data-percent^="9"] .label, -.ui.indicating.progress[data-percent^="100"] .label { - color: rgba(0, 0, 0, 0.87); -} - -/* Inverted Indicating Label */ - -.ui.inverted.indicating.progress[data-percent^="1"] .label, -.ui.inverted.indicating.progress[data-percent^="2"] .label { - color: rgba(255, 255, 255, 0.9); -} - -.ui.inverted.indicating.progress[data-percent^="3"] .label { - color: rgba(255, 255, 255, 0.9); -} - -.ui.inverted.indicating.progress[data-percent^="4"] .label, -.ui.inverted.indicating.progress[data-percent^="5"] .label { - color: rgba(255, 255, 255, 0.9); -} - -.ui.inverted.indicating.progress[data-percent^="6"] .label { - color: rgba(255, 255, 255, 0.9); -} - -.ui.inverted.indicating.progress[data-percent^="7"] .label, -.ui.inverted.indicating.progress[data-percent^="8"] .label { - color: rgba(255, 255, 255, 0.9); -} - -.ui.inverted.indicating.progress[data-percent^="9"] .label, -.ui.inverted.indicating.progress[data-percent^="100"] .label { - color: rgba(255, 255, 255, 0.9); -} - -/* Single Digits */ - -.ui.indicating.progress[data-percent="1"] .bar, -.ui.indicating.progress[data-percent^="1."] .bar, -.ui.indicating.progress[data-percent="2"] .bar, -.ui.indicating.progress[data-percent^="2."] .bar, -.ui.indicating.progress[data-percent="3"] .bar, -.ui.indicating.progress[data-percent^="3."] .bar, -.ui.indicating.progress[data-percent="4"] .bar, -.ui.indicating.progress[data-percent^="4."] .bar, -.ui.indicating.progress[data-percent="5"] .bar, -.ui.indicating.progress[data-percent^="5."] .bar, -.ui.indicating.progress[data-percent="6"] .bar, -.ui.indicating.progress[data-percent^="6."] .bar, -.ui.indicating.progress[data-percent="7"] .bar, -.ui.indicating.progress[data-percent^="7."] .bar, -.ui.indicating.progress[data-percent="8"] .bar, -.ui.indicating.progress[data-percent^="8."] .bar, -.ui.indicating.progress[data-percent="9"] .bar, -.ui.indicating.progress[data-percent^="9."] .bar { - background-color: #D95C5C; -} - -.ui.indicating.progress[data-percent="0"] .label, -.ui.indicating.progress[data-percent^="0."] .label, -.ui.indicating.progress[data-percent="1"] .label, -.ui.indicating.progress[data-percent^="1."] .label, -.ui.indicating.progress[data-percent="2"] .label, -.ui.indicating.progress[data-percent^="2."] .label, -.ui.indicating.progress[data-percent="3"] .label, -.ui.indicating.progress[data-percent^="3."] .label, -.ui.indicating.progress[data-percent="4"] .label, -.ui.indicating.progress[data-percent^="4."] .label, -.ui.indicating.progress[data-percent="5"] .label, -.ui.indicating.progress[data-percent^="5."] .label, -.ui.indicating.progress[data-percent="6"] .label, -.ui.indicating.progress[data-percent^="6."] .label, -.ui.indicating.progress[data-percent="7"] .label, -.ui.indicating.progress[data-percent^="7."] .label, -.ui.indicating.progress[data-percent="8"] .label, -.ui.indicating.progress[data-percent^="8."] .label, -.ui.indicating.progress[data-percent="9"] .label, -.ui.indicating.progress[data-percent^="9."] .label { - color: rgba(0, 0, 0, 0.87); -} - -.ui.inverted.indicating.progress[data-percent="0"] .label, -.ui.inverted.indicating.progress[data-percent^="0."] .label, -.ui.inverted.indicating.progress[data-percent="1"] .label, -.ui.inverted.indicating.progress[data-percent^="1."] .label, -.ui.inverted.indicating.progress[data-percent="2"] .label, -.ui.inverted.indicating.progress[data-percent^="2."] .label, -.ui.inverted.indicating.progress[data-percent="3"] .label, -.ui.inverted.indicating.progress[data-percent^="3."] .label, -.ui.inverted.indicating.progress[data-percent="4"] .label, -.ui.inverted.indicating.progress[data-percent^="4."] .label, -.ui.inverted.indicating.progress[data-percent="5"] .label, -.ui.inverted.indicating.progress[data-percent^="5."] .label, -.ui.inverted.indicating.progress[data-percent="6"] .label, -.ui.inverted.indicating.progress[data-percent^="6."] .label, -.ui.inverted.indicating.progress[data-percent="7"] .label, -.ui.inverted.indicating.progress[data-percent^="7."] .label, -.ui.inverted.indicating.progress[data-percent="8"] .label, -.ui.inverted.indicating.progress[data-percent^="8."] .label, -.ui.inverted.indicating.progress[data-percent="9"] .label, -.ui.inverted.indicating.progress[data-percent^="9."] .label { - color: rgba(255, 255, 255, 0.9); -} - -/* Indicating Success */ - -.ui.ui.indicating.progress.success .label { - color: #1A531B; -} - -/* Multiple */ - -.ui.multiple.progress { - display: flex; -} - -/******************************* - States -*******************************/ - -/*-------------- - Success - ---------------*/ - -.ui.ui.progress.success .bar { - background-color: #21BA45; -} - -.ui.ui.progress.success .bar, -.ui.ui.progress.success .bar::after { - -webkit-animation: none; - animation: none; -} - -.ui.progress.success > .label { - color: #1A531B; -} - -/*-------------- - Warning - ---------------*/ - -.ui.ui.progress.warning .bar { - background-color: #F2C037; -} - -.ui.ui.progress.warning .bar, -.ui.ui.progress.warning .bar::after { - -webkit-animation: none; - animation: none; -} - -.ui.progress.warning > .label { - color: #794B02; -} - -/*-------------- - Error - ---------------*/ - -.ui.ui.progress.error .bar { - background-color: #DB2828; -} - -.ui.ui.progress.error .bar, -.ui.ui.progress.error .bar::after { - -webkit-animation: none; - animation: none; -} - -.ui.progress.error > .label { - color: #912D2B; -} - -/*-------------- - Active - ---------------*/ - -.ui.active.progress .bar { - position: relative; - min-width: 2em; -} - -.ui.active.progress .bar::after { - content: ''; - opacity: 0; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: #FFFFFF; - border-radius: 0.28571429rem; - -webkit-animation: progress-active 2s ease infinite; - animation: progress-active 2s ease infinite; - transform-origin: left; -} - -@-webkit-keyframes progress-active { - 0% { - opacity: 0.3; - transform: scale(0, 1); - } - - 100% { - opacity: 0; - transform: scale(1); - } -} - -@keyframes progress-active { - 0% { - opacity: 0.3; - transform: scale(0, 1); - } - - 100% { - opacity: 0; - transform: scale(1); - } -} - -/*-------------- - Disabled - ---------------*/ - -.ui.disabled.progress { - opacity: 0.35; -} - -.ui.ui.disabled.progress .bar, -.ui.ui.disabled.progress .bar::after { - -webkit-animation: none; - animation: none; -} - -/******************************* - Variations -*******************************/ - -/*-------------- - Inverted - ---------------*/ - -.ui.inverted.progress { - background: rgba(255, 255, 255, 0.08); - border: none; -} - -.ui.inverted.progress .bar { - background: #888888; -} - -.ui.inverted.progress .bar > .progress { - color: #1B1C1D; -} - -.ui.inverted.progress > .label { - color: #FFFFFF; -} - -.ui.inverted.progress.success > .label { - color: #21BA45; -} - -.ui.inverted.progress.warning > .label { - color: #F2C037; -} - -.ui.inverted.progress.error > .label { - color: #DB2828; -} - -/*-------------- - Attached - ---------------*/ - -/* bottom attached */ - -.ui.progress.attached { - background: transparent; - position: relative; - border: none; - margin: 0; -} - -.ui.progress.attached, -.ui.progress.attached .bar { - display: block; - height: 0.2rem; - padding: 0; - overflow: hidden; - border-radius: 0 0 0.28571429rem 0.28571429rem; -} - -.ui.progress.attached .bar { - border-radius: 0; -} - -/* top attached */ - -.ui.progress.top.attached, -.ui.progress.top.attached .bar { - top: 0; - border-radius: 0.28571429rem 0.28571429rem 0 0; -} - -.ui.progress.top.attached .bar { - border-radius: 0; -} - -/* Coupling */ - -.ui.segment > .ui.attached.progress, -.ui.card > .ui.attached.progress { - position: absolute; - top: auto; - left: 0; - bottom: 100%; - width: 100%; -} - -.ui.segment > .ui.bottom.attached.progress, -.ui.card > .ui.bottom.attached.progress { - top: 100%; - bottom: auto; -} - -/*-------------- - Colors ----------------*/ - -.ui.indeterminate.primary.progress .bar::before, -.ui.primary.progress .bar, -.ui.progress .primary.bar { - background-color: #2185D0; -} - -.ui.inverted.indeterminate.primary.progress .bar::before, -.ui.primary.inverted.progress .bar, -.ui.inverted.progress .primary.bar { - background-color: #54C8FF; -} - -.ui.indeterminate.secondary.progress .bar::before, -.ui.secondary.progress .bar, -.ui.progress .secondary.bar { - background-color: #1B1C1D; -} - -.ui.inverted.indeterminate.secondary.progress .bar::before, -.ui.secondary.inverted.progress .bar, -.ui.inverted.progress .secondary.bar { - background-color: #545454; -} - -.ui.indeterminate.red.progress .bar::before, -.ui.red.progress .bar, -.ui.progress .red.bar { - background-color: #DB2828; -} - -.ui.inverted.indeterminate.red.progress .bar::before, -.ui.red.inverted.progress .bar, -.ui.inverted.progress .red.bar { - background-color: #FF695E; -} - -.ui.indeterminate.orange.progress .bar::before, -.ui.orange.progress .bar, -.ui.progress .orange.bar { - background-color: #F2711C; -} - -.ui.inverted.indeterminate.orange.progress .bar::before, -.ui.orange.inverted.progress .bar, -.ui.inverted.progress .orange.bar { - background-color: #FF851B; -} - -.ui.indeterminate.yellow.progress .bar::before, -.ui.yellow.progress .bar, -.ui.progress .yellow.bar { - background-color: #FBBD08; -} - -.ui.inverted.indeterminate.yellow.progress .bar::before, -.ui.yellow.inverted.progress .bar, -.ui.inverted.progress .yellow.bar { - background-color: #FFE21F; -} - -.ui.indeterminate.olive.progress .bar::before, -.ui.olive.progress .bar, -.ui.progress .olive.bar { - background-color: #B5CC18; -} - -.ui.inverted.indeterminate.olive.progress .bar::before, -.ui.olive.inverted.progress .bar, -.ui.inverted.progress .olive.bar { - background-color: #D9E778; -} - -.ui.indeterminate.green.progress .bar::before, -.ui.green.progress .bar, -.ui.progress .green.bar { - background-color: #21BA45; -} - -.ui.inverted.indeterminate.green.progress .bar::before, -.ui.green.inverted.progress .bar, -.ui.inverted.progress .green.bar { - background-color: #2ECC40; -} - -.ui.indeterminate.teal.progress .bar::before, -.ui.teal.progress .bar, -.ui.progress .teal.bar { - background-color: #00B5AD; -} - -.ui.inverted.indeterminate.teal.progress .bar::before, -.ui.teal.inverted.progress .bar, -.ui.inverted.progress .teal.bar { - background-color: #6DFFFF; -} - -.ui.indeterminate.blue.progress .bar::before, -.ui.blue.progress .bar, -.ui.progress .blue.bar { - background-color: #2185D0; -} - -.ui.inverted.indeterminate.blue.progress .bar::before, -.ui.blue.inverted.progress .bar, -.ui.inverted.progress .blue.bar { - background-color: #54C8FF; -} - -.ui.indeterminate.violet.progress .bar::before, -.ui.violet.progress .bar, -.ui.progress .violet.bar { - background-color: #6435C9; -} - -.ui.inverted.indeterminate.violet.progress .bar::before, -.ui.violet.inverted.progress .bar, -.ui.inverted.progress .violet.bar { - background-color: #A291FB; -} - -.ui.indeterminate.purple.progress .bar::before, -.ui.purple.progress .bar, -.ui.progress .purple.bar { - background-color: #A333C8; -} - -.ui.inverted.indeterminate.purple.progress .bar::before, -.ui.purple.inverted.progress .bar, -.ui.inverted.progress .purple.bar { - background-color: #DC73FF; -} - -.ui.indeterminate.pink.progress .bar::before, -.ui.pink.progress .bar, -.ui.progress .pink.bar { - background-color: #E03997; -} - -.ui.inverted.indeterminate.pink.progress .bar::before, -.ui.pink.inverted.progress .bar, -.ui.inverted.progress .pink.bar { - background-color: #FF8EDF; -} - -.ui.indeterminate.brown.progress .bar::before, -.ui.brown.progress .bar, -.ui.progress .brown.bar { - background-color: #A5673F; -} - -.ui.inverted.indeterminate.brown.progress .bar::before, -.ui.brown.inverted.progress .bar, -.ui.inverted.progress .brown.bar { - background-color: #D67C1C; -} - -.ui.indeterminate.grey.progress .bar::before, -.ui.grey.progress .bar, -.ui.progress .grey.bar { - background-color: #767676; -} - -.ui.inverted.indeterminate.grey.progress .bar::before, -.ui.grey.inverted.progress .bar, -.ui.inverted.progress .grey.bar { - background-color: #DCDDDE; -} - -.ui.indeterminate.black.progress .bar::before, -.ui.black.progress .bar, -.ui.progress .black.bar { - background-color: #1B1C1D; -} - -.ui.inverted.indeterminate.black.progress .bar::before, -.ui.black.inverted.progress .bar, -.ui.inverted.progress .black.bar { - background-color: #545454; -} - -/*-------------- - Sizes ----------------*/ - -.ui.progress { - font-size: 1rem; -} - -.ui.progress .bar { - height: 1.75em; -} - -.ui.mini.progress { - font-size: 0.78571429rem; -} - -.ui.mini.progress .bar { - height: 0.3em; -} - -.ui.tiny.progress { - font-size: 0.85714286rem; -} - -.ui.tiny.progress .bar { - height: 0.5em; -} - -.ui.small.progress { - font-size: 0.92857143rem; -} - -.ui.small.progress .bar { - height: 1em; -} - -.ui.large.progress { - font-size: 1.14285714rem; -} - -.ui.large.progress .bar { - height: 2.5em; -} - -.ui.big.progress { - font-size: 1.28571429rem; -} - -.ui.big.progress .bar { - height: 3.5em; -} - -.ui.huge.progress { - font-size: 1.42857143rem; -} - -.ui.huge.progress .bar { - height: 4em; -} - -.ui.massive.progress { - font-size: 1.71428571rem; -} - -.ui.massive.progress .bar { - height: 5em; -} - -/*--------------- - Indeterminate - ----------------*/ - -.ui.indeterminate.progress .bar { - width: 100%; -} - -.ui.indeterminate.progress .bar .progress, -.ui.progress .bar .centered.progress { - text-align: center; - position: relative; -} - -.ui.indeterminate.progress .bar::before { - content: ''; - position: absolute; - top: 0; - bottom: 0; - border-radius: 0.28571429rem; - -webkit-animation: progress-pulsating 2s ease infinite; - animation: progress-pulsating 2s ease infinite; - transform-origin: center; - width: 100%; -} - -.ui.slow.indeterminate.progress .bar::before { - -webkit-animation-duration: 4s; - animation-duration: 4s; -} - -.ui.fast.indeterminate.progress .bar::before { - -webkit-animation-duration: 1s; - animation-duration: 1s; -} - -.ui.swinging.indeterminate.progress .bar::before { - transform-origin: left; - -webkit-animation-name: progress-swinging; - animation-name: progress-swinging; -} - -.ui.sliding.indeterminate.progress .bar::before { - transform-origin: left; - -webkit-animation-name: progress-sliding; - animation-name: progress-sliding; -} - -.ui.filling.indeterminate.progress .bar::before { - -webkit-animation-name: progress-filling; - animation-name: progress-filling; -} - -.ui.indeterminate.progress:not(.sliding):not(.filling):not(.swinging) .bar::before { - background: #FFFFFF; -} - -.ui.sliding.indeterminate.progress .bar, -.ui.swinging.indeterminate.progress .bar, -.ui.filling.indeterminate.progress .bar { - background: rgba(0, 0, 0, 0.1); -} - -.ui.sliding.indeterminate.progress .bar .progress, -.ui.swinging.indeterminate.progress .bar .progress { - color: #1B1C1D; -} - -.ui.inverted.sliding.indeterminate.progress .bar, -.ui.inverted.swinging.indeterminate.progress .bar, -.ui.inverted.filling.indeterminate.progress .bar { - background: rgba(255, 255, 255, 0.08); -} - -.ui.inverted.sliding.indeterminate.progress .bar .progress, -.ui.inverted.swinging.indeterminate.progress .bar .progress { - color: rgba(255, 255, 255, 0.7); -} - -@-webkit-keyframes progress-swinging { - 0%, 100% { - width: 10%; - left: -25%; - } - - 25%, 65% { - width: 70%; - } - - 50% { - width: 10%; - left: 100%; - } -} - -@keyframes progress-swinging { - 0%, 100% { - width: 10%; - left: -25%; - } - - 25%, 65% { - width: 70%; - } - - 50% { - width: 10%; - left: 100%; - } -} - -@-webkit-keyframes progress-sliding { - 0% { - width: 10%; - left: -25%; - } - - 50% { - width: 70%; - } - - 100% { - width: 10%; - left: 100%; - } -} - -@keyframes progress-sliding { - 0% { - width: 10%; - left: -25%; - } - - 50% { - width: 70%; - } - - 100% { - width: 10%; - left: 100%; - } -} - -@-webkit-keyframes progress-filling { - 0% { - transform: scale(0, 1); - } - - 80% { - transform: scale(1); - opacity: 1; - } - - 100% { - opacity: 0; - } -} - -@keyframes progress-filling { - 0% { - transform: scale(0, 1); - } - - 80% { - transform: scale(1); - opacity: 1; - } - - 100% { - opacity: 0; - } -} - -@-webkit-keyframes progress-pulsating { - 0% { - transform: scale(0, 1); - opacity: 0.7; - } - - 100% { - transform: scale(1); - opacity: 0; - } -} - -@keyframes progress-pulsating { - 0% { - transform: scale(0, 1); - opacity: 0.7; - } - - 100% { - transform: scale(1); - opacity: 0; - } -} - -/******************************* - Progress -*******************************/ - -/******************************* - Site Overrides -*******************************/ /*! * # Fomantic-UI - Reset * http://github.com/fomantic/Fomantic-UI/ diff --git a/web_src/fomantic/build/semantic.js b/web_src/fomantic/build/semantic.js index 2d5b7d8202..2222cade65 100644 --- a/web_src/fomantic/build/semantic.js +++ b/web_src/fomantic/build/semantic.js @@ -11940,1042 +11940,6 @@ $.fn.popup.settings = { }; -})( jQuery, window, document ); - -/*! - * # Fomantic-UI - Progress - * http://github.com/fomantic/Fomantic-UI/ - * - * - * Released under the MIT license - * http://opensource.org/licenses/MIT - * - */ - -;(function ($, window, document, undefined) { - -'use strict'; - -$.isFunction = $.isFunction || function(obj) { - return typeof obj === "function" && typeof obj.nodeType !== "number"; -}; - -window = (typeof window != 'undefined' && window.Math == Math) - ? window - : (typeof self != 'undefined' && self.Math == Math) - ? self - : Function('return this')() -; - -$.fn.progress = function(parameters) { - var - $allModules = $(this), - - moduleSelector = $allModules.selector || '', - - time = new Date().getTime(), - performance = [], - - query = arguments[0], - methodInvoked = (typeof query == 'string'), - queryArguments = [].slice.call(arguments, 1), - - returnedValue - ; - - $allModules - .each(function() { - var - settings = ( $.isPlainObject(parameters) ) - ? $.extend(true, {}, $.fn.progress.settings, parameters) - : $.extend({}, $.fn.progress.settings), - - className = settings.className, - metadata = settings.metadata, - namespace = settings.namespace, - selector = settings.selector, - error = settings.error, - - eventNamespace = '.' + namespace, - moduleNamespace = 'module-' + namespace, - - $module = $(this), - $bars = $(this).find(selector.bar), - $progresses = $(this).find(selector.progress), - $label = $(this).find(selector.label), - - element = this, - instance = $module.data(moduleNamespace), - - animating = false, - transitionEnd, - module - ; - module = { - helper: { - sum: function (nums) { - return Array.isArray(nums) ? nums.reduce(function (left, right) { - return left + Number(right); - }, 0) : 0; - }, - /** - * Derive precision for multiple progress with total and values. - * - * This helper dervices a precision that is sufficiently large to show minimum value of multiple progress. - * - * Example1 - * - total: 1122 - * - values: [325, 111, 74, 612] - * - min ratio: 74/1122 = 0.0659... - * - required precision: 100 - * - * Example2 - * - total: 10541 - * - values: [3235, 1111, 74, 6121] - * - min ratio: 74/10541 = 0.0070... - * - required precision: 1000 - * - * @param min A minimum value within multiple values - * @param total A total amount of multiple values - * @returns {number} A precison. Could be 1, 10, 100, ... 1e+10. - */ - derivePrecision: function(min, total) { - var precisionPower = 0 - var precision = 1; - var ratio = min / total; - while (precisionPower < 10) { - ratio = ratio * precision; - if (ratio > 1) { - break; - } - precision = Math.pow(10, precisionPower++); - } - return precision; - }, - forceArray: function (element) { - return Array.isArray(element) - ? element - : !isNaN(element) - ? [element] - : typeof element == 'string' - ? element.split(',') - : [] - ; - } - }, - - initialize: function() { - module.set.duration(); - module.set.transitionEvent(); - module.debug(element); - - module.read.metadata(); - module.read.settings(); - - module.instantiate(); - }, - - instantiate: function() { - module.verbose('Storing instance of progress', module); - instance = module; - $module - .data(moduleNamespace, module) - ; - }, - destroy: function() { - module.verbose('Destroying previous progress for', $module); - clearInterval(instance.interval); - module.remove.state(); - $module.removeData(moduleNamespace); - instance = undefined; - }, - - reset: function() { - module.remove.nextValue(); - module.update.progress(0); - }, - - complete: function(keepState) { - if(module.percent === undefined || module.percent < 100) { - module.remove.progressPoll(); - if(keepState !== true){ - module.set.percent(100); - } - } - }, - - read: { - metadata: function() { - var - data = { - percent : module.helper.forceArray($module.data(metadata.percent)), - total : $module.data(metadata.total), - value : module.helper.forceArray($module.data(metadata.value)) - } - ; - if(data.total !== undefined) { - module.debug('Total value set from metadata', data.total); - module.set.total(data.total); - } - if(data.value.length > 0) { - module.debug('Current value set from metadata', data.value); - module.set.value(data.value); - module.set.progress(data.value); - } - if(data.percent.length > 0) { - module.debug('Current percent value set from metadata', data.percent); - module.set.percent(data.percent); - } - }, - settings: function() { - if(settings.total !== false) { - module.debug('Current total set in settings', settings.total); - module.set.total(settings.total); - } - if(settings.value !== false) { - module.debug('Current value set in settings', settings.value); - module.set.value(settings.value); - module.set.progress(module.value); - } - if(settings.percent !== false) { - module.debug('Current percent set in settings', settings.percent); - module.set.percent(settings.percent); - } - } - }, - - bind: { - transitionEnd: function(callback) { - var - transitionEnd = module.get.transitionEnd() - ; - $bars - .one(transitionEnd + eventNamespace, function(event) { - clearTimeout(module.failSafeTimer); - callback.call(this, event); - }) - ; - module.failSafeTimer = setTimeout(function() { - $bars.triggerHandler(transitionEnd); - }, settings.duration + settings.failSafeDelay); - module.verbose('Adding fail safe timer', module.timer); - } - }, - - increment: function(incrementValue) { - var - startValue, - newValue - ; - if( module.has.total() ) { - startValue = module.get.value(); - incrementValue = incrementValue || 1; - } - else { - startValue = module.get.percent(); - incrementValue = incrementValue || module.get.randomValue(); - } - newValue = startValue + incrementValue; - module.debug('Incrementing percentage by', startValue, newValue, incrementValue); - newValue = module.get.normalizedValue(newValue); - module.set.progress(newValue); - }, - decrement: function(decrementValue) { - var - total = module.get.total(), - startValue, - newValue - ; - if(total) { - startValue = module.get.value(); - decrementValue = decrementValue || 1; - newValue = startValue - decrementValue; - module.debug('Decrementing value by', decrementValue, startValue); - } - else { - startValue = module.get.percent(); - decrementValue = decrementValue || module.get.randomValue(); - newValue = startValue - decrementValue; - module.debug('Decrementing percentage by', decrementValue, startValue); - } - newValue = module.get.normalizedValue(newValue); - module.set.progress(newValue); - }, - - has: { - progressPoll: function() { - return module.progressPoll; - }, - total: function() { - return (module.get.total() !== false); - } - }, - - get: { - text: function(templateText, index) { - var - index_ = index || 0, - value = module.get.value(index_), - total = module.get.total(), - percent = (animating) - ? module.get.displayPercent(index_) - : module.get.percent(index_), - left = (total !== false) - ? Math.max(0,total - value) - : (100 - percent) - ; - templateText = templateText || ''; - templateText = templateText - .replace('{value}', value) - .replace('{total}', total || 0) - .replace('{left}', left) - .replace('{percent}', percent) - .replace('{bar}', settings.text.bars[index_] || '') - ; - module.verbose('Adding variables to progress bar text', templateText); - return templateText; - }, - - normalizedValue: function(value) { - if(value < 0) { - module.debug('Value cannot decrement below 0'); - return 0; - } - if(module.has.total()) { - if(value > module.total) { - module.debug('Value cannot increment above total', module.total); - return module.total; - } - } - else if(value > 100 ) { - module.debug('Value cannot increment above 100 percent'); - return 100; - } - return value; - }, - - updateInterval: function() { - if(settings.updateInterval == 'auto') { - return settings.duration; - } - return settings.updateInterval; - }, - - randomValue: function() { - module.debug('Generating random increment percentage'); - return Math.floor((Math.random() * settings.random.max) + settings.random.min); - }, - - numericValue: function(value) { - return (typeof value === 'string') - ? (value.replace(/[^\d.]/g, '') !== '') - ? +(value.replace(/[^\d.]/g, '')) - : false - : value - ; - }, - - transitionEnd: function() { - var - element = document.createElement('element'), - transitions = { - 'transition' :'transitionend', - 'OTransition' :'oTransitionEnd', - 'MozTransition' :'transitionend', - 'WebkitTransition' :'webkitTransitionEnd' - }, - transition - ; - for(transition in transitions){ - if( element.style[transition] !== undefined ){ - return transitions[transition]; - } - } - }, - - // gets current displayed percentage (if animating values this is the intermediary value) - displayPercent: function(index) { - var - $bar = $($bars[index]), - barWidth = $bar.width(), - totalWidth = $module.width(), - minDisplay = parseInt($bar.css('min-width'), 10), - displayPercent = (barWidth > minDisplay) - ? (barWidth / totalWidth * 100) - : module.percent - ; - return (settings.precision > 0) - ? Math.round(displayPercent * (10 * settings.precision)) / (10 * settings.precision) - : Math.round(displayPercent) - ; - }, - - percent: function(index) { - return module.percent && module.percent[index || 0] || 0; - }, - value: function(index) { - return module.nextValue || module.value && module.value[index || 0] || 0; - }, - total: function() { - return module.total !== undefined ? module.total : false; - } - }, - - create: { - progressPoll: function() { - module.progressPoll = setTimeout(function() { - module.update.toNextValue(); - module.remove.progressPoll(); - }, module.get.updateInterval()); - }, - }, - - is: { - complete: function() { - return module.is.success() || module.is.warning() || module.is.error(); - }, - success: function() { - return $module.hasClass(className.success); - }, - warning: function() { - return $module.hasClass(className.warning); - }, - error: function() { - return $module.hasClass(className.error); - }, - active: function() { - return $module.hasClass(className.active); - }, - visible: function() { - return $module.is(':visible'); - } - }, - - remove: { - progressPoll: function() { - module.verbose('Removing progress poll timer'); - if(module.progressPoll) { - clearTimeout(module.progressPoll); - delete module.progressPoll; - } - }, - nextValue: function() { - module.verbose('Removing progress value stored for next update'); - delete module.nextValue; - }, - state: function() { - module.verbose('Removing stored state'); - delete module.total; - delete module.percent; - delete module.value; - }, - active: function() { - module.verbose('Removing active state'); - $module.removeClass(className.active); - }, - success: function() { - module.verbose('Removing success state'); - $module.removeClass(className.success); - }, - warning: function() { - module.verbose('Removing warning state'); - $module.removeClass(className.warning); - }, - error: function() { - module.verbose('Removing error state'); - $module.removeClass(className.error); - } - }, - - set: { - barWidth: function(values) { - module.debug("set bar width with ", values); - values = module.helper.forceArray(values); - var firstNonZeroIndex = -1; - var lastNonZeroIndex = -1; - var valuesSum = module.helper.sum(values); - var barCounts = $bars.length; - var isMultiple = barCounts > 1; - var percents = values.map(function(value, index) { - var allZero = (index === barCounts - 1 && valuesSum === 0); - var $bar = $($bars[index]); - if (value === 0 && isMultiple && !allZero) { - $bar.css('display', 'none'); - } else { - if (isMultiple && allZero) { - $bar.css('background', 'transparent'); - } - if (firstNonZeroIndex == -1) { - firstNonZeroIndex = index; - } - lastNonZeroIndex = index; - $bar.css({ - display: 'block', - width: value + '%' - }); - } - return parseFloat(value); - }); - values.forEach(function(_, index) { - var $bar = $($bars[index]); - $bar.css({ - borderTopLeftRadius: index == firstNonZeroIndex ? '' : 0, - borderBottomLeftRadius: index == firstNonZeroIndex ? '' : 0, - borderTopRightRadius: index == lastNonZeroIndex ? '' : 0, - borderBottomRightRadius: index == lastNonZeroIndex ? '' : 0 - }); - }); - $module - .attr('data-percent', percents) - ; - }, - duration: function(duration) { - duration = duration || settings.duration; - duration = (typeof duration == 'number') - ? duration + 'ms' - : duration - ; - module.verbose('Setting progress bar transition duration', duration); - $bars - .css({ - 'transition-duration': duration - }) - ; - }, - percent: function(percents) { - percents = module.helper.forceArray(percents).map(function(percent) { - return (typeof percent == 'string') - ? +(percent.replace('%', '')) - : percent - ; - }); - var hasTotal = module.has.total(); - var totalPercent = module.helper.sum(percents); - var isMultipleValues = percents.length > 1 && hasTotal; - var sumTotal = module.helper.sum(module.helper.forceArray(module.value)); - if (isMultipleValues && sumTotal > module.total) { - // Sum values instead of pecents to avoid precision issues when summing floats - module.error(error.sumExceedsTotal, sumTotal, module.total); - } else if (!isMultipleValues && totalPercent > 100) { - // Sum before rounding since sum of rounded may have error though sum of actual is fine - module.error(error.tooHigh, totalPercent); - } else if (totalPercent < 0) { - module.error(error.tooLow, totalPercent); - } else { - var autoPrecision = settings.precision > 0 - ? settings.precision - : isMultipleValues - ? module.helper.derivePrecision(Math.min.apply(null, module.value), module.total) - : 0; - - // round display percentage - var roundedPercents = percents.map(function (percent) { - return (autoPrecision > 0) - ? Math.round(percent * (10 * autoPrecision)) / (10 * autoPrecision) - : Math.round(percent) - ; - }); - module.percent = roundedPercents; - if (hasTotal) { - module.value = roundedPercents.map(function (percent) { - return (autoPrecision > 0) - ? Math.round((percent / 100) * module.total * (10 * autoPrecision)) / (10 * autoPrecision) - : Math.round((percent / 100) * module.total * 10) / 10 - ; - }); - if (settings.limitValues) { - module.value = module.value.map(function (value) { - return Math.max(0, Math.min(100, value)); - }); - } - } - module.set.barWidth(percents); - module.set.labelInterval(); - module.set.labels(); - } - settings.onChange.call(element, percents, module.value, module.total); - }, - labelInterval: function() { - var - animationCallback = function() { - module.verbose('Bar finished animating, removing continuous label updates'); - clearInterval(module.interval); - animating = false; - module.set.labels(); - } - ; - clearInterval(module.interval); - module.bind.transitionEnd(animationCallback); - animating = true; - module.interval = setInterval(function() { - var - isInDOM = $.contains(document.documentElement, element) - ; - if(!isInDOM) { - clearInterval(module.interval); - animating = false; - } - module.set.labels(); - }, settings.framerate); - }, - labels: function() { - module.verbose('Setting both bar progress and outer label text'); - module.set.barLabel(); - module.set.state(); - }, - label: function(text) { - text = text || ''; - if(text) { - text = module.get.text(text); - module.verbose('Setting label to text', text); - $label.text(text); - } - }, - state: function(percent) { - percent = (percent !== undefined) - ? percent - : module.helper.sum(module.percent) - ; - if(percent === 100) { - if(settings.autoSuccess && $bars.length === 1 && !(module.is.warning() || module.is.error() || module.is.success())) { - module.set.success(); - module.debug('Automatically triggering success at 100%'); - } - else { - module.verbose('Reached 100% removing active state'); - module.remove.active(); - module.remove.progressPoll(); - } - } - else if(percent > 0) { - module.verbose('Adjusting active progress bar label', percent); - module.set.active(); - } - else { - module.remove.active(); - module.set.label(settings.text.active); - } - }, - barLabel: function(text) { - $progresses.map(function(index, element){ - var $progress = $(element); - if (text !== undefined) { - $progress.text( module.get.text(text, index) ); - } - else if (settings.label == 'ratio' && module.has.total()) { - module.verbose('Adding ratio to bar label'); - $progress.text( module.get.text(settings.text.ratio, index) ); - } - else if (settings.label == 'percent') { - module.verbose('Adding percentage to bar label'); - $progress.text( module.get.text(settings.text.percent, index) ); - } - }); - }, - active: function(text) { - text = text || settings.text.active; - module.debug('Setting active state'); - if(settings.showActivity && !module.is.active() ) { - $module.addClass(className.active); - } - module.remove.warning(); - module.remove.error(); - module.remove.success(); - text = settings.onLabelUpdate('active', text, module.value, module.total); - if(text) { - module.set.label(text); - } - module.bind.transitionEnd(function() { - settings.onActive.call(element, module.value, module.total); - }); - }, - success : function(text, keepState) { - text = text || settings.text.success || settings.text.active; - module.debug('Setting success state'); - $module.addClass(className.success); - module.remove.active(); - module.remove.warning(); - module.remove.error(); - module.complete(keepState); - if(settings.text.success) { - text = settings.onLabelUpdate('success', text, module.value, module.total); - module.set.label(text); - } - else { - text = settings.onLabelUpdate('active', text, module.value, module.total); - module.set.label(text); - } - module.bind.transitionEnd(function() { - settings.onSuccess.call(element, module.total); - }); - }, - warning : function(text, keepState) { - text = text || settings.text.warning; - module.debug('Setting warning state'); - $module.addClass(className.warning); - module.remove.active(); - module.remove.success(); - module.remove.error(); - module.complete(keepState); - text = settings.onLabelUpdate('warning', text, module.value, module.total); - if(text) { - module.set.label(text); - } - module.bind.transitionEnd(function() { - settings.onWarning.call(element, module.value, module.total); - }); - }, - error : function(text, keepState) { - text = text || settings.text.error; - module.debug('Setting error state'); - $module.addClass(className.error); - module.remove.active(); - module.remove.success(); - module.remove.warning(); - module.complete(keepState); - text = settings.onLabelUpdate('error', text, module.value, module.total); - if(text) { - module.set.label(text); - } - module.bind.transitionEnd(function() { - settings.onError.call(element, module.value, module.total); - }); - }, - transitionEvent: function() { - transitionEnd = module.get.transitionEnd(); - }, - total: function(totalValue) { - module.total = totalValue; - }, - value: function(value) { - module.value = module.helper.forceArray(value); - }, - progress: function(value) { - if(!module.has.progressPoll()) { - module.debug('First update in progress update interval, immediately updating', value); - module.update.progress(value); - module.create.progressPoll(); - } - else { - module.debug('Updated within interval, setting next update to use new value', value); - module.set.nextValue(value); - } - }, - nextValue: function(value) { - module.nextValue = value; - } - }, - - update: { - toNextValue: function() { - var - nextValue = module.nextValue - ; - if(nextValue) { - module.debug('Update interval complete using last updated value', nextValue); - module.update.progress(nextValue); - module.remove.nextValue(); - } - }, - progress: function(values) { - var hasTotal = module.has.total(); - if (hasTotal) { - module.set.value(values); - } - var percentCompletes = module.helper.forceArray(values).map(function(value) { - var - percentComplete - ; - value = module.get.numericValue(value); - if (value === false) { - module.error(error.nonNumeric, value); - } - value = module.get.normalizedValue(value); - if (hasTotal) { - percentComplete = module.total > 0 ? (value / module.total) * 100 : 100; - module.debug('Calculating percent complete from total', percentComplete); - } - else { - percentComplete = value; - module.debug('Setting value to exact percentage value', percentComplete); - } - return percentComplete; - }); - module.set.percent( percentCompletes ); - } - }, - - setting: function(name, value) { - module.debug('Changing setting', name, value); - if( $.isPlainObject(name) ) { - $.extend(true, settings, name); - } - else if(value !== undefined) { - if($.isPlainObject(settings[name])) { - $.extend(true, settings[name], value); - } - else { - settings[name] = value; - } - } - else { - return settings[name]; - } - }, - internal: function(name, value) { - if( $.isPlainObject(name) ) { - $.extend(true, module, name); - } - else if(value !== undefined) { - module[name] = value; - } - else { - return module[name]; - } - }, - debug: function() { - if(!settings.silent && settings.debug) { - if(settings.performance) { - module.performance.log(arguments); - } - else { - module.debug = Function.prototype.bind.call(console.info, console, settings.name + ':'); - module.debug.apply(console, arguments); - } - } - }, - verbose: function() { - if(!settings.silent && settings.verbose && settings.debug) { - if(settings.performance) { - module.performance.log(arguments); - } - else { - module.verbose = Function.prototype.bind.call(console.info, console, settings.name + ':'); - module.verbose.apply(console, arguments); - } - } - }, - error: function() { - if(!settings.silent) { - module.error = Function.prototype.bind.call(console.error, console, settings.name + ':'); - module.error.apply(console, arguments); - } - }, - performance: { - log: function(message) { - var - currentTime, - executionTime, - previousTime - ; - if(settings.performance) { - currentTime = new Date().getTime(); - previousTime = time || currentTime; - executionTime = currentTime - previousTime; - time = currentTime; - performance.push({ - 'Name' : message[0], - 'Arguments' : [].slice.call(message, 1) || '', - 'Element' : element, - 'Execution Time' : executionTime - }); - } - clearTimeout(module.performance.timer); - module.performance.timer = setTimeout(module.performance.display, 500); - }, - display: function() { - var - title = settings.name + ':', - totalTime = 0 - ; - time = false; - clearTimeout(module.performance.timer); - $.each(performance, function(index, data) { - totalTime += data['Execution Time']; - }); - title += ' ' + totalTime + 'ms'; - if(moduleSelector) { - title += ' \'' + moduleSelector + '\''; - } - if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) { - console.groupCollapsed(title); - if(console.table) { - console.table(performance); - } - else { - $.each(performance, function(index, data) { - console.log(data['Name'] + ': ' + data['Execution Time']+'ms'); - }); - } - console.groupEnd(); - } - performance = []; - } - }, - invoke: function(query, passedArguments, context) { - var - object = instance, - maxDepth, - found, - response - ; - passedArguments = passedArguments || queryArguments; - context = element || context; - if(typeof query == 'string' && object !== undefined) { - query = query.split(/[\. ]/); - maxDepth = query.length - 1; - $.each(query, function(depth, value) { - var camelCaseValue = (depth != maxDepth) - ? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1) - : query - ; - if( $.isPlainObject( object[camelCaseValue] ) && (depth != maxDepth) ) { - object = object[camelCaseValue]; - } - else if( object[camelCaseValue] !== undefined ) { - found = object[camelCaseValue]; - return false; - } - else if( $.isPlainObject( object[value] ) && (depth != maxDepth) ) { - object = object[value]; - } - else if( object[value] !== undefined ) { - found = object[value]; - return false; - } - else { - module.error(error.method, query); - return false; - } - }); - } - if ( $.isFunction( found ) ) { - response = found.apply(context, passedArguments); - } - else if(found !== undefined) { - response = found; - } - if(Array.isArray(returnedValue)) { - returnedValue.push(response); - } - else if(returnedValue !== undefined) { - returnedValue = [returnedValue, response]; - } - else if(response !== undefined) { - returnedValue = response; - } - return found; - } - }; - - if(methodInvoked) { - if(instance === undefined) { - module.initialize(); - } - module.invoke(query); - } - else { - if(instance !== undefined) { - instance.invoke('destroy'); - } - module.initialize(); - } - }) - ; - - return (returnedValue !== undefined) - ? returnedValue - : this - ; -}; - -$.fn.progress.settings = { - - name : 'Progress', - namespace : 'progress', - - silent : false, - debug : false, - verbose : false, - performance : true, - - random : { - min : 2, - max : 5 - }, - - duration : 300, - - updateInterval : 'auto', - - autoSuccess : true, - showActivity : true, - limitValues : true, - - label : 'percent', - precision : 0, - framerate : (1000 / 30), /// 30 fps - - percent : false, - total : false, - value : false, - - // delay in ms for fail safe animation callback - failSafeDelay : 100, - - onLabelUpdate : function(state, text, value, total){ - return text; - }, - onChange : function(percent, value, total){}, - onSuccess : function(total){}, - onActive : function(value, total){}, - onError : function(value, total){}, - onWarning : function(value, total){}, - - error : { - method : 'The method you called is not defined.', - nonNumeric : 'Progress value is non numeric', - tooHigh : 'Value specified is above 100%', - tooLow : 'Value specified is below 0%', - sumExceedsTotal : 'Sum of multple values exceed total', - }, - - regExp: { - variable: /\{\$*[A-z0-9]+\}/g - }, - - metadata: { - percent : 'percent', - total : 'total', - value : 'value' - }, - - selector : { - bar : '> .bar', - label : '> .label', - progress : '.bar > .progress' - }, - - text : { - active : false, - error : false, - success : false, - warning : false, - percent : '{percent}%', - ratio : '{value} of {total}', - bars : [''] - }, - - className : { - active : 'active', - error : 'error', - success : 'success', - warning : 'warning' - } - -}; - - })( jQuery, window, document ); /*! diff --git a/web_src/fomantic/semantic.json b/web_src/fomantic/semantic.json index a6c7eb1b27..ff45cc465c 100644 --- a/web_src/fomantic/semantic.json +++ b/web_src/fomantic/semantic.json @@ -45,7 +45,6 @@ "message", "modal", "popup", - "progress", "reset", "search", "segment", diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index 57fd549019..241a357703 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -116,9 +116,6 @@ export function initGlobalCommon() { fullTextSearch: 'exact' }); $('.ui.checkbox').checkbox(); - $('.ui.progress').progress({ - showActivity: false - }); // init popups $('.tooltip').each((_, el) => { diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 4aff590de4..461195df01 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -207,6 +207,22 @@ details summary > * { display: inline; } +progress { + background: var(--color-secondary); + border-radius: 6px; + border: none; + overflow: hidden; +} +progress::-webkit-progress-bar { + background: var(--color-secondary); +} +progress::-webkit-progress-value { + background-color: var(--color-secondary-dark-3); +} +progress::-moz-progress-bar { + background: var(--color-secondary-dark-3); +} + * { scrollbar-color: var(--color-primary) transparent; caret-color: var(--color-caret); @@ -620,10 +636,6 @@ a.ui.card:hover, color: var(--color-primary); } -.ui.progress[data-percent="0"] .bar .progress { - color: var(--color-text); -} - .ui.attached.table { border-color: var(--color-secondary); } diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index f6f86e3260..37c8b9cc21 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -1238,26 +1238,9 @@ padding-bottom: 10px; border-bottom: 1px dashed var(--color-secondary); - > a { - padding-top: 5px; - padding-right: 10px; - font-size: 1.5rem; - color: var(--color-text); - - &:hover { - color: var(--color-primary); - } - } - - .ui.progress { - width: 40%; - padding: 0; - border: 0; - margin: 0; - - .bar { - height: 20px; - } + progress { + width: 200px; + height: 16px; } .meta { diff --git a/web_src/less/shared/issuelist.less b/web_src/less/shared/issuelist.less index dfc0acfeff..32fd206827 100644 --- a/web_src/less/shared/issuelist.less +++ b/web_src/less/shared/issuelist.less @@ -83,21 +83,13 @@ .checklist { padding-left: 5px; - .progress-bar { + progress { margin-left: 2px; width: 80px; height: 6px; display: inline-block; - background-color: var(--color-secondary); - overflow: hidden; border-radius: 3px; vertical-align: 2px !important; - - .progress { - background-color: var(--color-secondary-dark-3); - display: block; - height: 100%; - } } } diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 0b8d92b01f..01150d353e 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -140,14 +140,6 @@ background-color: #383c4a; } -.ui.green.progress .bar { - background-color: #668844; -} - -.ui.progress.success .bar { - background-color: #7b9e57 !important; -} - .following.bar.light { background: #2e323e; border-color: var(--color-secondary-alpha-40);