From db3590e7ae41707c0eef58d9a4c1c2ede36687f6 Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Mon, 12 Oct 2020 13:10:55 -0700
Subject: [PATCH 1/8] 1556

---
 assets/styles/global/_tooltip.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/styles/global/_tooltip.scss b/assets/styles/global/_tooltip.scss
index eb6c27190f..e8467cf3fc 100644
--- a/assets/styles/global/_tooltip.scss
+++ b/assets/styles/global/_tooltip.scss
@@ -5,6 +5,7 @@
 
   display: block !important;
   z-index: z-index('tooltip');
+  max-width: 450px;
 
   .tooltip-inner {
     background: var(--tooltip-bg);

From 9abf27e3b65edb10795ef99706f771be3068aec6 Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Tue, 13 Oct 2020 12:00:01 -0700
Subject: [PATCH 2/8] spacing tabs

---
 assets/styles/fonts/_icons.scss    | 24 ++++++++++--------------
 components/form/KeyValue.vue       |  2 +-
 components/form/WorkloadPorts.vue  |  5 +----
 components/nav/ClusterSwitcher.vue |  3 ++-
 components/nav/NamespaceFilter.vue |  4 ++++
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/assets/styles/fonts/_icons.scss b/assets/styles/fonts/_icons.scss
index 64231dcd08..823e5588ae 100644
--- a/assets/styles/fonts/_icons.scss
+++ b/assets/styles/fonts/_icons.scss
@@ -7,29 +7,25 @@ $icomoon-font-family: 'icons' !global;
 // Animated Icons
 // --------------------------
 .icon-spin {
-  -webkit-animation: icon-spin 2s infinite steps(8);
-          animation: icon-spin 2s infinite steps(8);
+  -webkit-animation: icon-spin 5000ms infinite linear;
+          animation: icon-spin 5000ms infinite linear;
 }
 
 @-webkit-keyframes icon-spin {
-  0% {
-    -webkit-transform: rotateZ(0deg);
-            transform: rotateZ(0deg);
+  from {
+      transform:rotate(0deg);
   }
-  100% {
-    -webkit-transform: rotateZ(360deg);
-            transform: rotateZ(360deg);
+  to {
+      transform:rotate(360deg);
   }
 }
 
 @keyframes icon-spin {
-  0% {
-    -webkit-transform: rotateZ(0deg);
-            transform: rotateZ(0deg);
+  from {
+      transform:rotate(0deg);
   }
-  100% {
-    -webkit-transform: rotateZ(360deg);
-            transform: rotateZ(360deg);
+  to {
+      transform:rotate(360deg);
   }
 }
 
diff --git a/components/form/KeyValue.vue b/components/form/KeyValue.vue
index b52fdd1ca0..04665584ff 100644
--- a/components/form/KeyValue.vue
+++ b/components/form/KeyValue.vue
@@ -463,7 +463,7 @@ export default {
       </div>
     </div>
 
-    <div v-if="!titleAdd && (showAdd || showRead)" class="footer mt-10">
+    <div v-if="!titleAdd && (showAdd || showRead)" class="footer">
       <slot name="add" :add="add">
         <ButtonDropdown size="sm">
           <template #button-content>
diff --git a/components/form/WorkloadPorts.vue b/components/form/WorkloadPorts.vue
index 492a1579d2..328f076ac8 100644
--- a/components/form/WorkloadPorts.vue
+++ b/components/form/WorkloadPorts.vue
@@ -194,7 +194,7 @@ export default {
       </div>
     </div>
     <div v-if="showAdd" class="footer">
-      <button type="button" class="btn role-tertiary add mt-10" @click="add()">
+      <button type="button" class="btn role-tertiary add" @click="add()">
         Add Port
       </button>
     </div>
@@ -246,9 +246,6 @@ export default {
   }
 
   .footer {
-    margin-top: 10px;
-    margin-left: 5px;
-
     .protip {
       float: right;
       padding: 5px 0;
diff --git a/components/nav/ClusterSwitcher.vue b/components/nav/ClusterSwitcher.vue
index e3d09732f4..edc52e1b1e 100644
--- a/components/nav/ClusterSwitcher.vue
+++ b/components/nav/ClusterSwitcher.vue
@@ -104,7 +104,7 @@ export default {
     }
 
     .vs__dropdown-toggle {
-      height: calc(var(--header-height) - 18px);
+      height: calc(var(--header-height) - 19px);
       background-color: transparent;
       border: 0;
 
@@ -117,6 +117,7 @@ export default {
       user-select: none;
       cursor: default;
       color: white;
+      line-height: calc(var(--header-height) - 32px);
     }
   }
 
diff --git a/components/nav/NamespaceFilter.vue b/components/nav/NamespaceFilter.vue
index 9371f62285..6de6fcc3e8 100644
--- a/components/nav/NamespaceFilter.vue
+++ b/components/nav/NamespaceFilter.vue
@@ -250,6 +250,10 @@ export default {
     fill: white !important;
     color: white !important;
 }
+
+  .filter ::v-deep INPUT[type='search'] {
+    padding: 7px;
+  }
 </style>
 
 <template>

From 427fa4afdb388046dc2ec8e8519eea9501022653 Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Tue, 13 Oct 2020 14:19:20 -0700
Subject: [PATCH 3/8] add volume drop down

---
 edit/workload/storage/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/edit/workload/storage/index.vue b/edit/workload/storage/index.vue
index 8176bbba30..9f831093e8 100644
--- a/edit/workload/storage/index.vue
+++ b/edit/workload/storage/index.vue
@@ -161,9 +161,11 @@ export default {
     </div>
     <div class="row">
       <div class="col span-6">
-        <ButtonDropdown v-if="!isView" :dual-action="false">
+        <ButtonDropdown v-if="mode!=='view'" ref="buttonDropdown" size="sm">
           <template #button-content>
-            <span>{{ t('workload.storage.addVolume') }}</span>
+            <button v-if="mode!=='view'" type="button" class="btn btn-sm text-primary bg-transparent" @click="addVolume(opt)">
+              {{ t('workload.storage.addVolume') }}
+            </button>
           </template>
           <template #popover-content>
             <ul class="list-unstyled menu">

From 90f03accc0af9b98d933be8aeebafe49be92eb88 Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Tue, 13 Oct 2020 15:34:02 -0700
Subject: [PATCH 4/8] 1648 info bubble fix

---
 assets/styles/base/_variables.scss       |  5 +++--
 assets/styles/global/_labeled-input.scss | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/assets/styles/base/_variables.scss b/assets/styles/base/_variables.scss
index ff3d9e23b0..e161f04bec 100644
--- a/assets/styles/base/_variables.scss
+++ b/assets/styles/base/_variables.scss
@@ -6,6 +6,7 @@ $column-gutter: 1.75%;
 $sideways-tabs-width: 200px;
 
 $z-indexes: (
+  zero: 0,
   default: 1,
   overContent: 2,
   hoverOverContent: 3,
@@ -18,8 +19,8 @@ $z-indexes: (
 
   tooltip: 30,
 
-  dropdownOverlay: 40,
-  dropdownContent: 41,
+  dropdownOverlay: 1000,
+  dropdownContent: 1001,
 
   loadingOverlay: 50,
   loadingContent: 51
diff --git a/assets/styles/global/_labeled-input.scss b/assets/styles/global/_labeled-input.scss
index b1e12cf999..59a7cbac17 100644
--- a/assets/styles/global/_labeled-input.scss
+++ b/assets/styles/global/_labeled-input.scss
@@ -11,11 +11,11 @@
     transition-property: transform, font-size;
     transition-duration: 0.1s;
     transition-timing-function: ease-in-out;
-    // z-index: z-index('overContent');
+    z-index: z-index('zero');
     color: var(--input-label);
-    &.has-tooltip{
-      // z-index: z-index('hoverOverContent')
-    }
+    // &.has-tooltip{
+    //   z-index: z-index('hoverOverContent');
+    // }
   }
 
   /*
@@ -63,7 +63,8 @@
     background-color: transparent;
     outline: 0;
     box-shadow: none;
-    padding: 17px 0 0 0;
+    margin: 17px 0 0 0;
+    padding: 0;
     line-height: 1.25rem;
 
     &.no-label {

From e1c43365041fce9136ddf2cb234fbfc3b802ebd5 Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Wed, 21 Oct 2020 09:03:44 -0700
Subject: [PATCH 5/8] fix for tooltips

---
 assets/styles/base/_variables.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/styles/base/_variables.scss b/assets/styles/base/_variables.scss
index e161f04bec..db1a75e84d 100644
--- a/assets/styles/base/_variables.scss
+++ b/assets/styles/base/_variables.scss
@@ -19,8 +19,8 @@ $z-indexes: (
 
   tooltip: 30,
 
-  dropdownOverlay: 1000,
-  dropdownContent: 1001,
+  dropdownOverlay: 40,
+  dropdownContent: 41,
 
   loadingOverlay: 50,
   loadingContent: 51

From ac1c5cc60ad3618b6c1dae4a943b3f82808b7a22 Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Tue, 27 Oct 2020 15:22:17 -0700
Subject: [PATCH 6/8] tooltip label fix

---
 assets/styles/global/_button.scss        | 2 +-
 assets/styles/global/_labeled-input.scss | 9 +++++----
 assets/styles/global/_tooltip.scss       | 8 +-------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/assets/styles/global/_button.scss b/assets/styles/global/_button.scss
index 8b6318e124..e0adb11c35 100644
--- a/assets/styles/global/_button.scss
+++ b/assets/styles/global/_button.scss
@@ -1,6 +1,6 @@
 $btn-padding: 15px 40px;
 $xs-padding: 2px 3px;
-$sm-padding: 8px 14px;
+$sm-padding: 8px 13px;
 $lg-padding: 18px 30px;
 
 // -----------------------------------------------------------------------------
diff --git a/assets/styles/global/_labeled-input.scss b/assets/styles/global/_labeled-input.scss
index 59a7cbac17..c37fc5e898 100644
--- a/assets/styles/global/_labeled-input.scss
+++ b/assets/styles/global/_labeled-input.scss
@@ -11,11 +11,12 @@
     transition-property: transform, font-size;
     transition-duration: 0.1s;
     transition-timing-function: ease-in-out;
-    z-index: z-index('zero');
     color: var(--input-label);
-    // &.has-tooltip{
-    //   z-index: z-index('hoverOverContent');
-    // }
+    pointer-events: none;
+    z-index: z-index('overContent');
+    i {
+      pointer-events: initial;
+    }
   }
 
   /*
diff --git a/assets/styles/global/_tooltip.scss b/assets/styles/global/_tooltip.scss
index e8467cf3fc..644ac3952e 100644
--- a/assets/styles/global/_tooltip.scss
+++ b/assets/styles/global/_tooltip.scss
@@ -233,14 +233,8 @@
 
     .button-divider {
       border-right: 1px solid var(--link-text);
-      margin: 10px 0;
-    }
-
-    &.btn-xs {
-      .button-divider {
-        margin: 1px 0;
-      }
     }
+    
     &.bg-primary:hover {
       background: var(--accent-btn-hover);
     }

From 717acb62a67117f26493178413bbaf0dffb0de31 Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Tue, 27 Oct 2020 15:39:05 -0700
Subject: [PATCH 7/8] margin v padding

---
 assets/styles/global/_labeled-input.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/assets/styles/global/_labeled-input.scss b/assets/styles/global/_labeled-input.scss
index c37fc5e898..eabbfe7c81 100644
--- a/assets/styles/global/_labeled-input.scss
+++ b/assets/styles/global/_labeled-input.scss
@@ -64,8 +64,7 @@
     background-color: transparent;
     outline: 0;
     box-shadow: none;
-    margin: 17px 0 0 0;
-    padding: 0;
+    padding: 17px 0 0 0;
     line-height: 1.25rem;
 
     &.no-label {

From d17da7726eae2db639cc55f72e41179b882ab823 Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Tue, 27 Oct 2020 16:20:41 -0700
Subject: [PATCH 8/8] Update _tooltip.scss

---
 assets/styles/global/_tooltip.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/styles/global/_tooltip.scss b/assets/styles/global/_tooltip.scss
index 644ac3952e..cc731e6594 100644
--- a/assets/styles/global/_tooltip.scss
+++ b/assets/styles/global/_tooltip.scss
@@ -5,7 +5,7 @@
 
   display: block !important;
   z-index: z-index('tooltip');
-  max-width: 450px;
+  max-width: 50vw;
 
   .tooltip-inner {
     background: var(--tooltip-bg);