diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 823ce79fd..e8cf4a967 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -22,7 +22,6 @@
:selectingInitiatesLoad="selectingInitiatesLoad"
:loaderColor="loaderColor"
:loaderPosition="loaderPosition"
- :sizeInRem="sizeInRem"
:isWide="isWide"
:isRequired="isRequired"
:buttonImage="answer.AnswerImageUrl"
@@ -74,10 +73,6 @@ export default {
type: String,
default: "right",
},
- sizeInRem: {
- type: [String, Number],
- default: 1.5,
- },
isRequired: Boolean,
isOverflowScrollable: Boolean,
isWide: Boolean,
diff --git a/src/common-components/funnel-footer/funnel-footer.vue b/src/common-components/funnel-footer/funnel-footer.vue
index cd9ad0975..062a3574a 100644
--- a/src/common-components/funnel-footer/funnel-footer.vue
+++ b/src/common-components/funnel-footer/funnel-footer.vue
@@ -21,7 +21,6 @@
isPrimary
:buttonText="buttonText"
loaderColor="white"
- sizeInRem="1"
:class="isDisabled && 'form-test-invalid'"
:aria-disabled="isDisabled"
:isDisabled="isDisabled"
diff --git a/src/layouts/component-test/component-test.vue b/src/layouts/component-test/component-test.vue
index 062a6d608..e18664bec 100644
--- a/src/layouts/component-test/component-test.vue
+++ b/src/layouts/component-test/component-test.vue
@@ -75,7 +75,7 @@
isPrimary
buttonText="Primary"
loaderColor="white"
- sizeInRem="1"
+
/>
@@ -85,7 +85,7 @@
isPrimary
buttonText="Primary Disabled"
loaderColor="white"
- sizeInRem="1"
+
disabled
/>
@@ -95,7 +95,7 @@
@@ -104,7 +104,7 @@
@@ -390,7 +390,6 @@
textPosition="text-start"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
screenReaderOnlyText=" opens new window"
/>
Checkbox with Error
@@ -431,7 +428,6 @@
textPosition="text-start"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
screenReaderOnlyText=" opens new window"
hasError
/>
@@ -456,7 +452,6 @@
textPosition="text-start"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
screenReaderOnlyText=" opens new window"
/>
Radio Button with Error
@@ -494,7 +487,6 @@
textPosition="text-start"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
screenReaderOnlyText=" opens new window"
hasError
/>
@@ -525,7 +517,6 @@
textPosition="text-start"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
screenReaderOnlyText=" opens new window"
/>
@@ -576,7 +565,6 @@
textPosition="text-start"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
screenReaderOnlyText=" opens new window"
/>
@@ -633,7 +619,6 @@
textPosition="text-center"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
screenReaderOnlyText=" opens new window"
/>
@@ -684,7 +667,6 @@
textPosition="text-center"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
screenReaderOnlyText=" opens new window"
/>
@@ -738,7 +718,6 @@
textPosition="text-center"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
v-bind:totalInGroup="3"
v-bind:positionInGroup="1"
screenReaderOnlyText=" opens new window"
@@ -752,7 +731,6 @@
textPosition="text-center"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
v-bind:totalInGroup="3"
v-bind:positionInGroup="2"
screenReaderOnlyText=" opens new window"
@@ -766,7 +744,6 @@
textPosition="text-center"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
v-bind:totalInGroup="3"
v-bind:positionInGroup="3"
screenReaderOnlyText=" opens new window"
@@ -793,7 +770,6 @@
textPosition="text-center"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
v-bind:totalInGroup="3"
v-bind:positionInGroup="1"
screenReaderOnlyText=" opens new window"
@@ -808,7 +784,6 @@
textPosition="text-center"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
v-bind:totalInGroup="3"
v-bind:positionInGroup="2"
screenReaderOnlyText=" opens new window"
@@ -823,7 +798,6 @@
textPosition="text-center"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
v-bind:totalInGroup="3"
v-bind:positionInGroup="3"
screenReaderOnlyText=" opens new window"
@@ -850,7 +824,6 @@
loaderEnabled="true"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
v-bind:totalInGroup="3"
v-bind:positionInGroup="1"
screenReaderOnlyText=" opens new window"
@@ -864,7 +837,6 @@
loaderEnabled="true"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
v-bind:totalInGroup="3"
v-bind:positionInGroup="2"
screenReaderOnlyText=" opens new window"
@@ -878,7 +850,6 @@
loaderEnabled="true"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
v-bind:totalInGroup="3"
v-bind:positionInGroup="3"
screenReaderOnlyText=" opens new window"
@@ -905,7 +876,6 @@
loaderEnabled="true"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
v-bind:totalInGroup="3"
v-bind:positionInGroup="1"
screenReaderOnlyText=" opens new window"
@@ -920,7 +890,6 @@
loaderEnabled="true"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
v-bind:totalInGroup="3"
v-bind:positionInGroup="2"
screenReaderOnlyText=" opens new window"
@@ -935,7 +904,6 @@
loaderEnabled="true"
loaderColor="blue"
loaderPosition="right"
- sizeInRem="1"
v-bind:totalInGroup="3"
v-bind:positionInGroup="3"
screenReaderOnlyText=" opens new window"
diff --git a/src/ux-components/button-main/button-main.spec.js b/src/ux-components/button-main/button-main.spec.js
index bbdbbe134..f72040736 100644
--- a/src/ux-components/button-main/button-main.spec.js
+++ b/src/ux-components/button-main/button-main.spec.js
@@ -76,26 +76,3 @@ describe("buttonMain.vue", () => {
expect(loader.attributes("class")).toContain("right");
});
-
- it("Should return loader size in rem", async () => {
- // Act
- const wrapper = shallowMount(buttonMain, {
- propsData: {
- sizeInRem: 1,
- loaderEnabled: true,
- },
- });
-
- // Assert
-
- const label = wrapper.find("label");
-
- wrapper.vm.clicked();
-
- await nextTick();
-
- const loader = wrapper.find("loader-stub");
-
- expect(loader.attributes("style")).toContain("1rem");
- });
-});
diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue
index 2621d6bcd..c1f65dac1 100644
--- a/src/ux-components/button-main/button-main.vue
+++ b/src/ux-components/button-main/button-main.vue
@@ -9,7 +9,6 @@
@@ -25,7 +24,6 @@ export default {
isDisabled: Boolean,
loaderColor: String,
loaderPosition: String,
- sizeInRem: [Number, String],
isFloat: Boolean,
},
data() {
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js b/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
index ba1f12d23..d1175620c 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
@@ -155,29 +155,6 @@ describe("list-button-horizontal.vue", () => {
expect(loader.attributes("class")).toContain("right");
});
- it("Should return loader size in rem", async () => {
- // Act
- const wrapper = shallowMount(listButtonHorizontal, {
- propsData: {
- sizeInRem: 1,
- selectingInitiatesLoad: true,
- },
- });
-
- // Assert
-
- const label = wrapper.find("label");
-
- wrapper.vm.handleCheckChange = jest.fn();
- wrapper.vm.handleClick();
-
- await nextTick();
-
- const loader = wrapper.find("loader-stub");
-
- expect(loader.attributes("style")).toContain("1rem");
- });
-
it("Should emit button value on click", async () => {
// Act
const wrapper = shallowMount(listButtonHorizontal, {
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
index 18d6c586d..cc712e613 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
@@ -39,7 +39,6 @@
@@ -64,7 +63,6 @@ export default {
selectingInitiatesLoad: Boolean,
loaderColor: String,
loaderPosition: String,
- sizeInRem: [Number, String],
isRequired: Boolean,
value: {
// Field initial value
diff --git a/src/ux-components/list-button/list-button.spec.js b/src/ux-components/list-button/list-button.spec.js
index d643201ef..1e900ce62 100644
--- a/src/ux-components/list-button/list-button.spec.js
+++ b/src/ux-components/list-button/list-button.spec.js
@@ -153,29 +153,6 @@ describe("list-button.vue", () => {
expect(loader.attributes("class")).toContain("right");
});
- it("Should return loader size in rem", async () => {
- // Act
- const wrapper = shallowMount(listButton, {
- propsData: {
- sizeInRem: 1,
- selectingInitiatesLoad: true,
- },
- });
-
- // Assert
-
- const label = wrapper.find("label");
-
- wrapper.vm.handleCheckChange = jest.fn();
- wrapper.vm.handleClick();
-
- await nextTick();
-
- const loader = wrapper.find("loader-stub");
-
- expect(loader.attributes("style")).toContain("1rem");
- });
-
it("Should emit button value on click", async () => {
// Act
const wrapper = shallowMount(listButton, {
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index 4c3e2d7b3..3c5c4c27e 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -42,7 +42,6 @@
@@ -67,7 +66,6 @@ export default {
selectingInitiatesLoad: Boolean,
loaderColor: String,
loaderPosition: String,
- sizeInRem: [Number,String],
value: {
// Field initial value
type: [String, Number],
diff --git a/src/ux-components/loader/loader.vue b/src/ux-components/loader/loader.vue
index 247e15665..9b3473eb1 100644
--- a/src/ux-components/loader/loader.vue
+++ b/src/ux-components/loader/loader.vue
@@ -3,7 +3,6 @@
class="loader"
role="alert"
aria-label="Loading new page"
- v-bind:style="{ width: `${sizeInRem}rem`, height: `${sizeInRem}rem` }"
v-bind:class="[this.loaderColor, this.loaderPosition]"
>
@@ -13,10 +12,6 @@ export default {
name: "loader",
/* Specify size in number value which translates to rem value. For example, 1.5 = 1.5rem = 24px */
props: {
- sizeInRem: {
- type: Number,
- default: 1,
- },
/* Color options: red, green, blue, white, black */
loaderColor: {
type: String,
@@ -50,8 +45,8 @@ export default {
mask: url(../../assets/img/icons/spinner.svg);
mask-size: cover;
position: relative;
- width: 100%;
- height: 100%;
+ width: 1rem;
+ height: 1rem;
animation: rotation 1s infinite linear;
@keyframes rotation {
100% {