From 9bc627e9242936fbf41154971bebc927867b15e9 Mon Sep 17 00:00:00 2001 From: asvae Date: Wed, 18 Apr 2018 15:01:31 +0300 Subject: [PATCH] IE11 fixes (#155) * IE11 fixes * Fix dashboard link * Remove border for inner tooltip container (looked weird in IE11) * Minor * Minor --- package.json | 1 + .../forms/form-wizard/FormWizard.vue | 273 ++++++++++++------ src/components/layout/navbar/Navbar.vue | 4 +- .../ui/tree-view/TreeViewEditablePreview.vue | 2 +- src/main.js | 6 + src/sass/_override-custom-libs.scss | 1 + .../vuestic-wizard/VuesticWizard.vue | 1 + yarn.lock | 4 + 8 files changed, 198 insertions(+), 94 deletions(-) diff --git a/package.json b/package.json index 1360aecd1..2a8999512 100644 --- a/package.json +++ b/package.json @@ -61,6 +61,7 @@ "connect-history-api-fallback": "1.3.0", "copy-webpack-plugin": "4.0.1", "css-loader": "0.28.0", + "es6-promise": "^4.2.4", "eslint": "3.19.0", "eslint-config-standard": "10.2.1", "eslint-friendly-formatter": "3.0.0", diff --git a/src/components/forms/form-wizard/FormWizard.vue b/src/components/forms/form-wizard/FormWizard.vue index 9e09f3aa0..24f703824 100644 --- a/src/components/forms/form-wizard/FormWizard.vue +++ b/src/components/forms/form-wizard/FormWizard.vue @@ -2,14 +2,21 @@
- +
-

Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!"

-
+
+

Zebras communicate with facial expressions and sounds. They + make loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide + open their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back + means trouble, or "you better follow orders!"

+
+
- + - - {{ errors.first('hsName') }} + + + {{ errors.first('hsName') }} +
-

Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!"

+
+

Zebras communicate with facial expressions and sounds. They + make loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide + open their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back + means trouble, or "you better follow orders!"

+

{{'forms.wizard.confirmSelection' | translate}}

- Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!" + Zebras communicate with facial expressions and sounds. They make + loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide open + their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back means + trouble, or "you better follow orders!"

{{'forms.wizard.completed' | translate}}

- Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!" + Zebras communicate with facial expressions and sounds. They make + loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide open + their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back means + trouble, or "you better follow orders!"

@@ -60,15 +82,22 @@
- +
-

Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!"

-
+
+

Zebras communicate with facial expressions and sounds. They + make loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide + open their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back + means trouble, or "you better follow orders!"

+
+
- + - - {{ errors.first('hrName') }} + + + {{ errors.first('hrName') }} +
-

Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!"

+
+

Zebras communicate with facial expressions and sounds. They + make loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide + open their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back + means trouble, or "you better follow orders!"

+

{{'forms.wizard.confirmSelection' | translate}}

- Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!" + Zebras communicate with facial expressions and sounds. They make + loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide open + their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back means + trouble, or "you better follow orders!"

{{'forms.wizard.completed' | translate}}

- Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!" + Zebras communicate with facial expressions and sounds. They make + loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide open + their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back means + trouble, or "you better follow orders!"

@@ -125,10 +169,16 @@ wizard-layout="vertical" wizard-type="rich">
-

Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!"

-
+
+

Zebras communicate with facial expressions and sounds. They + make loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide + open their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back + means trouble, or "you better follow orders!"

+
+
- + - - {{ errors.first('vrName') }} + + + {{ errors.first('vrName') }} +
-

Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!"

+
+

Zebras communicate with facial expressions and sounds. They + make loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide + open their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back + means trouble, or "you better follow orders!"

+

{{'forms.wizard.confirmSelection' | translate}}

- Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!" + Zebras communicate with facial expressions and sounds. They make + loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide open + their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back means + trouble, or "you better follow orders!"

{{'forms.wizard.completed' | translate}}

- Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!" + Zebras communicate with facial expressions and sounds. They make + loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide open + their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back means + trouble, or "you better follow orders!"

@@ -179,16 +244,23 @@
- +
-

Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!"

-
+
+

Zebras communicate with facial expressions and sounds. They + make loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide + open their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back + means trouble, or "you better follow orders!"

+
+
- + - - {{ errors.first('vsName') }} + + + {{ errors.first('vsName') }} +
-

Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!"

+
+

Zebras communicate with facial expressions and sounds. They + make loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide + open their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back + means trouble, or "you better follow orders!"

+

{{'forms.wizard.confirmSelection' | translate}}

-

- Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!" -

+
+

Zebras communicate with facial expressions and sounds. They + make loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide + open their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back + means trouble, or "you better follow orders!"

+

{{'forms.wizard.completed' | translate}}

-

- Zebras communicate with facial expressions and sounds. They make loud braying or barking sounds and - soft snorting sounds. The position of their ears, how wide open their eyes are, and whether they show - their teeth all send a signal. For example, ears flat back means trouble, or "you better follow orders!" -

+
+

Zebras communicate with facial expressions and sounds. They + make loud braying or barking sounds and + soft snorting sounds. The position of their ears, how wide + open their eyes are, and whether they show + their teeth all send a signal. For example, ears flat back + means trouble, or "you better follow orders!"

+
@@ -256,7 +343,7 @@ }, isValid: () => { return this.isFormFieldValid('hsName') - } + }, }, { label: this.$t('forms.wizard.stepTwo'), @@ -266,12 +353,12 @@ }, isValid: () => { return this.$refs.hsCountrySelect.isValid() - } + }, }, { label: this.$t('forms.wizard.stepThree'), - slot: 'page3' - } + slot: 'page3', + }, ] }, hrSteps () { @@ -284,7 +371,7 @@ }, isValid: () => { return this.isFormFieldValid('hrName') - } + }, }, { label: this.$t('forms.wizard.stepTwo'), @@ -294,12 +381,12 @@ }, isValid: () => { return this.$refs.hrCountrySelect.isValid() - } + }, }, { label: this.$t('forms.wizard.stepThree'), - slot: 'page3' - } + slot: 'page3', + }, ] }, vrSteps () { @@ -312,7 +399,7 @@ }, isValid: () => { return this.isFormFieldValid('vrName') - } + }, }, { label: this.$t('forms.wizard.stepTwo'), @@ -322,12 +409,12 @@ }, isValid: () => { return this.$refs.vrCountrySelect.isValid() - } + }, }, { label: this.$t('forms.wizard.stepThree'), - slot: 'page3' - } + slot: 'page3', + }, ] }, vsSteps () { @@ -340,7 +427,7 @@ }, isValid: () => { return this.isFormFieldValid('vsName') - } + }, }, { label: this.$t('forms.wizard.stepTwo'), @@ -350,14 +437,14 @@ }, isValid: () => { return this.$refs.vsCountrySelect.isValid() - } + }, }, { label: this.$t('forms.wizard.stepThree'), - slot: 'page3' - } + slot: 'page3', + }, ] - } + }, }, data () { return { @@ -371,7 +458,7 @@ vsCountry: '', email: '', countriesList: CountriesList, - chosenCountry: '' + chosenCountry: '', } }, methods: { @@ -384,8 +471,8 @@ }, validateFormField (fieldName) { this.$validator.validate(fieldName, this[fieldName]) - } - } + }, + }, } @@ -411,4 +498,8 @@ width: 80%; } } + + .form-wizard-tab-content-text { + width: 100%; // IE11 only + } diff --git a/src/components/layout/navbar/Navbar.vue b/src/components/layout/navbar/Navbar.vue index 25a3296dd..6ac5ebc0d 100644 --- a/src/components/layout/navbar/Navbar.vue +++ b/src/components/layout/navbar/Navbar.vue @@ -1,9 +1,9 @@