From 1619b0ed50862d0e5e00ebf2b5d7699b74d194ae Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Fri, 23 Oct 2020 11:39:16 -0700
Subject: [PATCH 1/2] divider fix

---
 assets/styles/base/_mixins.scss                      |  4 ++--
 components/AsyncButton.vue                           |  4 ++--
 components/form/Command.vue                          |  2 +-
 components/form/Container.vue                        | 10 +++++-----
 components/form/HealthCheck.vue                      |  4 ++--
 components/form/Networking.vue                       |  6 +++---
 components/form/PodScheduling.vue                    |  2 +-
 components/form/Scheduling.vue                       |  6 +++---
 components/form/Security.vue                         |  4 ++--
 .../providers/elasticsearch.vue                      |  4 ++--
 edit/resources.cattle.io.restore.vue                 |  2 +-
 edit/workload/index.vue                              | 12 ++++++------
 edit/workload/storage/ephemeralVolume/index.vue      |  2 +-
 13 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/assets/styles/base/_mixins.scss b/assets/styles/base/_mixins.scss
index 270928e87e..bd12c836f6 100755
--- a/assets/styles/base/_mixins.scss
+++ b/assets/styles/base/_mixins.scss
@@ -58,7 +58,7 @@
   padding-bottom: 20px;
 }
 
-@mixin divider {
+@mixin section-divider {
   margin-bottom: 20px;
   margin-top: 20px;
 }
@@ -72,7 +72,7 @@
 .clip             { @include clip }
 .force-wrap       { @include force-wrap }
 .bordered-section { @include bordered-section }
-.divider          { @include divider }
+.section-divider  { @include section-divider }
 
 /// Sets the specified background color and calculates a dark or light contrasted text color.
 @mixin contrasted($background-color, $dark: $contrasted-dark, $light: $contrasted-light) {
diff --git a/components/AsyncButton.vue b/components/AsyncButton.vue
index 352aca4f17..b16ffb60e5 100644
--- a/components/AsyncButton.vue
+++ b/components/AsyncButton.vue
@@ -196,7 +196,7 @@ export default {
     :tab-index="tabIndex"
     @click="clicked"
   >
-    <i v-if="displayIcon" :class="{icon: true, 'icon-lg': true, [displayIcon]: true, 'pr-5': showLabel && displayLabel}" />
-    <span v-if="showLabel" v-html="displayLabel" />
+    <i v-if="displayIcon" :class="{icon: true, 'icon-lg': true, [displayIcon]: true}" />
+    <span v-if="showLabel" class="pl-5" v-html="displayLabel" />
   </button>
 </template>
diff --git a/components/form/Command.vue b/components/form/Command.vue
index dee14198ef..86b968269d 100644
--- a/components/form/Command.vue
+++ b/components/form/Command.vue
@@ -146,7 +146,7 @@ export default {
         </div>
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
     <h3>{{ t('workload.container.titles.env') }}</h3>
     <EnvVars :mode="mode" :config-maps="configMaps" :secrets="secrets" :value="value" />
   </div>
diff --git a/components/form/Container.vue b/components/form/Container.vue
index be4159d69d..b68afcffdc 100644
--- a/components/form/Container.vue
+++ b/components/form/Container.vue
@@ -78,7 +78,7 @@ export default {
 
 <template>
   <div v-if="isView">
-    <hr class="divider" />
+    <hr class="section-divider" />
     <div>
       <div class="row">
         <div class="col span-4">
@@ -102,7 +102,7 @@ export default {
         </div>
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
     <div>
       <h3><t k="workload.container.titles.ports" /></h3>
       <WorkloadPorts v-if="value.ports" v-model="value.ports" :mode="mode" />
@@ -111,13 +111,13 @@ export default {
       </div>
     </div>
 
-    <hr class="divider" />
+    <hr class="section-divider" />
     <div>
       <h3><t k="workload.container.titles.command" /></h3>
       <Command v-model="value" :mode="mode" :secrets="[]" :config-maps="[]" />
     </div>
 
-    <hr class="divider" />
+    <hr class="section-divider" />
     <div>
       <h3><t k="workload.container.titles.resources" /></h3>
       <ContainerResourceLimit v-if="hasResourceLimits" v-model="flatResources" :mode="mode" :show-tip="false" />
@@ -126,7 +126,7 @@ export default {
       </div>
     </div>
 
-    <hr class="divider" />
+    <hr class="section-divider" />
     <div>
       <h3><t k="workload.container.titles.healthCheck" /></h3>
       <HealthCheck v-if="hasHealthCheck" v-model="healthCheck" :mode="mode" />
diff --git a/components/form/HealthCheck.vue b/components/form/HealthCheck.vue
index de5d7221fe..ef7fa61fa8 100644
--- a/components/form/HealthCheck.vue
+++ b/components/form/HealthCheck.vue
@@ -54,7 +54,7 @@ export default {
         />
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
 
     <div>
       <div class="row">
@@ -68,7 +68,7 @@ export default {
         />
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
 
     <div class="row">
       <Probe
diff --git a/components/form/Networking.vue b/components/form/Networking.vue
index ce58de63ea..ec47d95886 100644
--- a/components/form/Networking.vue
+++ b/components/form/Networking.vue
@@ -190,7 +190,7 @@ export default {
         </div>
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
 
     <div>
       <h3>{{ t('workload.networking.dns') }}</h3>
@@ -225,7 +225,7 @@ export default {
         </div>
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
 
     <div>
       <div class="row">
@@ -241,7 +241,7 @@ export default {
         />
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
 
     <div class="row">
       <div class="col span-12">
diff --git a/components/form/PodScheduling.vue b/components/form/PodScheduling.vue
index f0843bf454..885d6e3020 100644
--- a/components/form/PodScheduling.vue
+++ b/components/form/PodScheduling.vue
@@ -47,7 +47,7 @@ export default {
       </h4>
       <PodAffinity v-model="podAffinity" :mode="mode" />
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
 
     <h4 class="mb-10">
       <t k="workload.scheduling.affinity.antiAffinityTitle" />
diff --git a/components/form/Scheduling.vue b/components/form/Scheduling.vue
index fd6050adb5..32f85e51bb 100644
--- a/components/form/Scheduling.vue
+++ b/components/form/Scheduling.vue
@@ -78,7 +78,7 @@ export default {
         </div>
       </template>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
 
     <div>
       <h3 class="mb-10">
@@ -88,10 +88,10 @@ export default {
         <Tolerations v-model="value.tolerations" :mode="mode" />
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
 
     <div>
-      <hr class="divider" />
+      <hr class="section-divider" />
       <h3 class="mb-10">
         <t k="workload.scheduling.titles.priority" />
       </h3>
diff --git a/components/form/Security.vue b/components/form/Security.vue
index fef947cc32..1adca2fec2 100644
--- a/components/form/Security.vue
+++ b/components/form/Security.vue
@@ -131,7 +131,7 @@ export default {
         </div>
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
 
     <div>
       <div class="row">
@@ -158,7 +158,7 @@ export default {
         </div>
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
 
     <div class="row mb-10">
       <div class="col span-6">
diff --git a/edit/logging.banzaicloud.io.output/providers/elasticsearch.vue b/edit/logging.banzaicloud.io.output/providers/elasticsearch.vue
index 82fed49f8c..aaff4863a4 100644
--- a/edit/logging.banzaicloud.io.output/providers/elasticsearch.vue
+++ b/edit/logging.banzaicloud.io.output/providers/elasticsearch.vue
@@ -75,7 +75,7 @@ export default {
         </div>
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
 
     <div>
       <h3>{{ t('logging.output.sections.access') }}</h3>
@@ -95,7 +95,7 @@ export default {
         </div>
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
 
     <h3>{{ t('logging.output.sections.certificate') }}</h3>
     <div class="row mb-10">
diff --git a/edit/resources.cattle.io.restore.vue b/edit/resources.cattle.io.restore.vue
index 7f35c3e737..fd00de07ed 100644
--- a/edit/resources.cattle.io.restore.vue
+++ b/edit/resources.cattle.io.restore.vue
@@ -215,7 +215,7 @@ export default {
             </div>
           </div>
         </div>
-        <hr class="divider" />
+        <hr class="section-divider" />
 
         <div>
           <div :style="{'align-items':'center'}" class="row mb-10">
diff --git a/edit/workload/index.vue b/edit/workload/index.vue
index f31040c6a7..e9b3247d9b 100644
--- a/edit/workload/index.vue
+++ b/edit/workload/index.vue
@@ -603,7 +603,7 @@ export default {
             </div>
           </div>
 
-          <hr class="divider" />
+          <hr class="section-divider" />
           <div>
             <h3>{{ t('workload.container.titles.image') }}</h3>
             <div class="row">
@@ -626,7 +626,7 @@ export default {
             </div>
           </div>
 
-          <hr class="divider" />
+          <hr class="section-divider" />
           <div>
             <h3>{{ t('workload.container.titles.ports') }}</h3>
             <div class="row">
@@ -634,12 +634,12 @@ export default {
             </div>
           </div>
 
-          <hr class="divider" />
+          <hr class="section-divider" />
           <div>
             <h3>{{ t('workload.container.titles.command') }}</h3>
             <Command v-model="container" :secrets="namespacedSecrets" :config-maps="namespacedConfigMaps" :mode="mode" />
           </div>
-          <hr class="divider" />
+          <hr class="section-divider" />
           <div>
             <h3>{{ t('workload.container.titles.podLabels') }}</h3>
             <div class="row mb-20">
@@ -679,7 +679,7 @@ export default {
         </Tab>
         <Tab :label="t('workload.container.titles.resources')" name="resources">
           <ContainerResourceLimit v-model="flatResources" :mode="mode" :show-tip="false" />
-          <hr class="divider" />
+          <hr class="section-divider" />
           <div>
             <h3 class="mb-10">
               <t k="workload.scheduling.titles.tolerations" />
@@ -690,7 +690,7 @@ export default {
           </div>
 
           <div>
-            <hr class="divider" />
+            <hr class="section-divider" />
             <h3 class="mb-10">
               <t k="workload.scheduling.titles.priority" />
             </h3>
diff --git a/edit/workload/storage/ephemeralVolume/index.vue b/edit/workload/storage/ephemeralVolume/index.vue
index fa8c077488..df8669e255 100644
--- a/edit/workload/storage/ephemeralVolume/index.vue
+++ b/edit/workload/storage/ephemeralVolume/index.vue
@@ -70,7 +70,7 @@ export default {
         </div>
       </div>
     </div>
-    <hr class="divider" />
+    <hr class="section-divider" />
     <Mount :pod-spec="podSpec" :name="value.name" :mode="mode" />
   </div>
 </template>

From 97b29116f91520539d6aed8a8c2daa9fe30d9842 Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Mon, 26 Oct 2020 11:55:36 -0700
Subject: [PATCH 2/2] Lint

---
 components/form/Networking.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/form/Networking.vue b/components/form/Networking.vue
index 94aa8528d6..a723a73dbe 100644
--- a/components/form/Networking.vue
+++ b/components/form/Networking.vue
@@ -244,7 +244,6 @@ export default {
     </div>
     <hr class="section-divider" />
 
-
     <div class="row mt-20">
       <div class="col span-12">
         <KeyValue