diff --git a/src-docs/src/views/progress/playground.js b/src-docs/src/views/progress/playground.js index 203101a7741..96e194c21b3 100644 --- a/src-docs/src/views/progress/playground.js +++ b/src-docs/src/views/progress/playground.js @@ -25,6 +25,12 @@ export default () => { type: PropTypes.String, }; + propsToUse.color = { + ...propsToUse.color, + value: 'success', + type: PropTypes.String, + }; + return { config: { componentName: 'EuiProgress', diff --git a/src-docs/src/views/theme/_json/eui_theme_dark.json b/src-docs/src/views/theme/_json/eui_theme_dark.json index 369f0a39833..b0b7529f1d2 100644 --- a/src-docs/src/views/theme/_json/eui_theme_dark.json +++ b/src-docs/src/views/theme/_json/eui_theme_dark.json @@ -202,31 +202,6 @@ "euiMarkdownEditorMinHeight": "150px", "euiPopoverArrowSize": "12px", "euiPopoverTranslateDistance": "8px", - "euiProgressSizes": { - "xs": "2px", - "s": "4px", - "m": "8px", - "l": "16px" - }, - "euiProgressColors": { - "primary": "#36a2ef", - "success": "#7dded8", - "warning": "#f3d371", - "danger": "#f86b63", - "accent": "#f68fbe", - "subdued": "#7a7f89", - "vis0": "#54b399", - "vis1": "#6092c0", - "vis2": "#d36086", - "vis3": "#9170b8", - "vis4": "#ca8eae", - "vis5": "#d6bf57", - "vis6": "#b9a888", - "vis7": "#da8b45", - "vis8": "#aa6556", - "vis9": "#e7664c", - "customColor": "currentColor" - }, "euiResizableButtonTransitionSpeed": "150ms", "euiResizableButtonSize": "16px", "euiSelectableListItemBorder": "1px solid #202128", @@ -698,4 +673,4 @@ "warning": "#f3d371", "danger": "#f86b63" } -} \ No newline at end of file +} diff --git a/src-docs/src/views/theme/_json/eui_theme_light.json b/src-docs/src/views/theme/_json/eui_theme_light.json index b29febd3397..3700c6232ea 100644 --- a/src-docs/src/views/theme/_json/eui_theme_light.json +++ b/src-docs/src/views/theme/_json/eui_theme_light.json @@ -202,31 +202,6 @@ "euiMarkdownEditorMinHeight": "150px", "euiPopoverArrowSize": "12px", "euiPopoverTranslateDistance": "8px", - "euiProgressSizes": { - "xs": "2px", - "s": "4px", - "m": "8px", - "l": "16px" - }, - "euiProgressColors": { - "primary": "#0077cc", - "success": "#00bfb3", - "warning": "#fec514", - "danger": "#bd271e", - "accent": "#f04e98", - "subdued": "#69707d", - "vis0": "#54b399", - "vis1": "#6092c0", - "vis2": "#d36086", - "vis3": "#9170b8", - "vis4": "#ca8eae", - "vis5": "#d6bf57", - "vis6": "#b9a888", - "vis7": "#da8b45", - "vis8": "#aa6556", - "vis9": "#e7664c", - "customColor": "currentColor" - }, "euiResizableButtonTransitionSpeed": "150ms", "euiResizableButtonSize": "16px", "euiSelectableListItemBorder": "1px solid #eef2f7", @@ -698,4 +673,4 @@ "warning": "#fec514", "danger": "#bd271e" } -} \ No newline at end of file +} diff --git a/src/components/index.scss b/src/components/index.scss index e427ac5416b..25e3f18f19c 100644 --- a/src/components/index.scss +++ b/src/components/index.scss @@ -39,7 +39,6 @@ @import 'page/index'; // Page needs to come after Panel for cascade specificity @import 'popover/index'; @import 'portal/index'; -@import 'progress/index'; @import 'tree_view/index'; @import 'resizable_container/index'; @import 'side_nav/index'; diff --git a/src/components/progress/__snapshots__/progress.styles.test.ts.snap b/src/components/progress/__snapshots__/progress.styles.test.ts.snap new file mode 100644 index 00000000000..469deaa14e0 --- /dev/null +++ b/src/components/progress/__snapshots__/progress.styles.test.ts.snap @@ -0,0 +1,355 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`euiProgressStyles indeterminate div CSS colors accent 1`] = ` +" + &:before { + background-color: #F04E98; + } +;;label:accent;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors danger 1`] = ` +" + &:before { + background-color: #BD271E; + } +;;label:danger;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors primary 1`] = ` +" + &:before { + background-color: #07C; + } +;;label:primary;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors subdued 1`] = ` +" + &:before { + background-color: #646a77; + } +;;label:subdued;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors success 1`] = ` +" + &:before { + background-color: #00BFB3; + } +;;label:success;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors vis0 1`] = ` +" + &:before { + background-color: #54B399; + } +;;label:vis0;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors vis1 1`] = ` +" + &:before { + background-color: #6092C0; + } +;;label:vis1;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors vis2 1`] = ` +" + &:before { + background-color: #D36086; + } +;;label:vis2;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors vis3 1`] = ` +" + &:before { + background-color: #9170B8; + } +;;label:vis3;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors vis4 1`] = ` +" + &:before { + background-color: #CA8EAE; + } +;;label:vis4;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors vis5 1`] = ` +" + &:before { + background-color: #D6BF57; + } +;;label:vis5;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors vis6 1`] = ` +" + &:before { + background-color: #B9A888; + } +;;label:vis6;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors vis7 1`] = ` +" + &:before { + background-color: #DA8B45; + } +;;label:vis7;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors vis8 1`] = ` +" + &:before { + background-color: #AA6556; + } +;;label:vis8;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors vis9 1`] = ` +" + &:before { + background-color: #E7664C; + } +;;label:vis9;" +`; + +exports[`euiProgressStyles indeterminate div CSS colors warning 1`] = ` +" + &:before { + background-color: #FEC514; + } +;;label:warning;" +`; + +exports[`euiProgressStyles indeterminate div CSS positions absolute 1`] = ` +"position:absolute; + top: 0; + left: 0; + right: 0; + background-color: transparent; + +;;label:absolute;" +`; + +exports[`euiProgressStyles indeterminate div CSS positions fixed 1`] = ` +"position:fixed;z-index:1001; + top: 0; + left: 0; + right: 0; + background-color: transparent; + +;;label:fixed;" +`; + +exports[`euiProgressStyles indeterminate div CSS positions static 1`] = `"position:relative;label:static;"`; + +exports[`euiProgressStyles native progress CSS colors accent 1`] = ` +" + &::-webkit-progress-value { + background-color: #F04E98; + } + &::-moz-progress-bar { + background-color: #F04E98; + } +;;label:accent;" +`; + +exports[`euiProgressStyles native progress CSS colors danger 1`] = ` +" + &::-webkit-progress-value { + background-color: #BD271E; + } + &::-moz-progress-bar { + background-color: #BD271E; + } +;;label:danger;" +`; + +exports[`euiProgressStyles native progress CSS colors primary 1`] = ` +" + &::-webkit-progress-value { + background-color: #07C; + } + &::-moz-progress-bar { + background-color: #07C; + } +;;label:primary;" +`; + +exports[`euiProgressStyles native progress CSS colors subdued 1`] = ` +" + &::-webkit-progress-value { + background-color: #646a77; + } + &::-moz-progress-bar { + background-color: #646a77; + } +;;label:subdued;" +`; + +exports[`euiProgressStyles native progress CSS colors success 1`] = ` +" + &::-webkit-progress-value { + background-color: #00BFB3; + } + &::-moz-progress-bar { + background-color: #00BFB3; + } +;;label:success;" +`; + +exports[`euiProgressStyles native progress CSS colors vis0 1`] = ` +" + &::-webkit-progress-value { + background-color: #54B399; + } + &::-moz-progress-bar { + background-color: #54B399; + } +;;label:vis0;" +`; + +exports[`euiProgressStyles native progress CSS colors vis1 1`] = ` +" + &::-webkit-progress-value { + background-color: #6092C0; + } + &::-moz-progress-bar { + background-color: #6092C0; + } +;;label:vis1;" +`; + +exports[`euiProgressStyles native progress CSS colors vis2 1`] = ` +" + &::-webkit-progress-value { + background-color: #D36086; + } + &::-moz-progress-bar { + background-color: #D36086; + } +;;label:vis2;" +`; + +exports[`euiProgressStyles native progress CSS colors vis3 1`] = ` +" + &::-webkit-progress-value { + background-color: #9170B8; + } + &::-moz-progress-bar { + background-color: #9170B8; + } +;;label:vis3;" +`; + +exports[`euiProgressStyles native progress CSS colors vis4 1`] = ` +" + &::-webkit-progress-value { + background-color: #CA8EAE; + } + &::-moz-progress-bar { + background-color: #CA8EAE; + } +;;label:vis4;" +`; + +exports[`euiProgressStyles native progress CSS colors vis5 1`] = ` +" + &::-webkit-progress-value { + background-color: #D6BF57; + } + &::-moz-progress-bar { + background-color: #D6BF57; + } +;;label:vis5;" +`; + +exports[`euiProgressStyles native progress CSS colors vis6 1`] = ` +" + &::-webkit-progress-value { + background-color: #B9A888; + } + &::-moz-progress-bar { + background-color: #B9A888; + } +;;label:vis6;" +`; + +exports[`euiProgressStyles native progress CSS colors vis7 1`] = ` +" + &::-webkit-progress-value { + background-color: #DA8B45; + } + &::-moz-progress-bar { + background-color: #DA8B45; + } +;;label:vis7;" +`; + +exports[`euiProgressStyles native progress CSS colors vis8 1`] = ` +" + &::-webkit-progress-value { + background-color: #AA6556; + } + &::-moz-progress-bar { + background-color: #AA6556; + } +;;label:vis8;" +`; + +exports[`euiProgressStyles native progress CSS colors vis9 1`] = ` +" + &::-webkit-progress-value { + background-color: #E7664C; + } + &::-moz-progress-bar { + background-color: #E7664C; + } +;;label:vis9;" +`; + +exports[`euiProgressStyles native progress CSS colors warning 1`] = ` +" + &::-webkit-progress-value { + background-color: #FEC514; + } + &::-moz-progress-bar { + background-color: #FEC514; + } +;;label:warning;" +`; + +exports[`euiProgressStyles native progress CSS positions absolute 1`] = ` +"position:absolute; + top: 0; + left: 0; + right: 0; + background-color: transparent; + + &::-webkit-progress-bar { + background-color: transparent; + } +;;label:absolute;" +`; + +exports[`euiProgressStyles native progress CSS positions fixed 1`] = ` +"position:fixed;z-index:1001; + top: 0; + left: 0; + right: 0; + background-color: transparent; + + &::-webkit-progress-bar { + background-color: transparent; + } +;;label:fixed;" +`; + +exports[`euiProgressStyles native progress CSS positions static 1`] = `"position:relative;label:static;"`; diff --git a/src/components/progress/__snapshots__/progress.test.tsx.snap b/src/components/progress/__snapshots__/progress.test.tsx.snap index 37e3ce16f1c..7570d44c4a2 100644 --- a/src/components/progress/__snapshots__/progress.test.tsx.snap +++ b/src/components/progress/__snapshots__/progress.test.tsx.snap @@ -2,114 +2,114 @@ exports[`EuiProgress color #885522 is rendered 1`] = `
`; exports[`EuiProgress color accent is rendered 1`] = `
`; exports[`EuiProgress color danger is rendered 1`] = `
`; exports[`EuiProgress color primary is rendered 1`] = `
`; exports[`EuiProgress color subdued is rendered 1`] = `
`; exports[`EuiProgress color success is rendered 1`] = `
`; exports[`EuiProgress color vis0 is rendered 1`] = `
`; exports[`EuiProgress color vis1 is rendered 1`] = `
`; exports[`EuiProgress color vis2 is rendered 1`] = `
`; exports[`EuiProgress color vis3 is rendered 1`] = `
`; exports[`EuiProgress color vis4 is rendered 1`] = `
`; exports[`EuiProgress color vis5 is rendered 1`] = `
`; exports[`EuiProgress color vis6 is rendered 1`] = `
`; exports[`EuiProgress color vis7 is rendered 1`] = `
`; exports[`EuiProgress color vis8 is rendered 1`] = `
`; exports[`EuiProgress color vis9 is rendered 1`] = `
`; exports[`EuiProgress color warning is rendered 1`] = `
`; exports[`EuiProgress has labelProps 1`] = ` Array [
150 @@ -117,7 +117,7 @@ Array [ @@ -138,7 +138,7 @@ exports[`EuiProgress has max 1`] = ` exports[`EuiProgress has value 1`] = `
`; @@ -146,15 +146,15 @@ exports[`EuiProgress has value 1`] = ` exports[`EuiProgress has valueText and label 1`] = ` Array [
Label 150 @@ -162,7 +162,7 @@ Array [