From a27887ff025d65b6126625b08119968cee68741b Mon Sep 17 00:00:00 2001
From: Tayler Aitken <taitken@us.ibm.com@taylers-mbp.attlocal.net>
Date: Fri, 22 Jun 2018 12:08:07 -0500
Subject: [PATCH 1/2] fix(multiple-components): updating components so they are
 consistent with designs

---
 src/components/list-box/_list-box.scss | 2 +-
 src/components/modal/_modal.scss       | 1 +
 src/components/toggle/_toggle.scss     | 1 +
 src/components/tooltip/_tooltip.scss   | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/list-box/_list-box.scss b/src/components/list-box/_list-box.scss
index fc1ef23fca94..3ab409e25394 100644
--- a/src/components/list-box/_list-box.scss
+++ b/src/components/list-box/_list-box.scss
@@ -69,7 +69,7 @@ $list-box-menu-width: rem(300px);
 
   .#{$prefix}--list-box--inline .#{$prefix}--list-box__menu-icon {
     position: static;
-    padding: 0 rem(10px) 0 rem(12px);
+    padding: 0 rem(8px) 0 rem(8px);
   }
 
   .#{$prefix}--list-box--inline > .#{$prefix}--list-box__menu {
diff --git a/src/components/modal/_modal.scss b/src/components/modal/_modal.scss
index f7748705bc0a..25edab762cc0 100644
--- a/src/components/modal/_modal.scss
+++ b/src/components/modal/_modal.scss
@@ -98,6 +98,7 @@
     overflow-y: auto;
     margin-bottom: $spacing-3xl;
     color: $text-01;
+    font-weight: 400;
 
     > * {
       @include reset;
diff --git a/src/components/toggle/_toggle.scss b/src/components/toggle/_toggle.scss
index e735ce8d5ae1..e49f9597a2b1 100644
--- a/src/components/toggle/_toggle.scss
+++ b/src/components/toggle/_toggle.scss
@@ -23,6 +23,7 @@
     transition: $transition--base $carbon--standard-easing;
     cursor: pointer;
     margin: $spacing-md 0;
+    color: $text-01;
   }
 
   .#{$prefix}--toggle__appearance {
diff --git a/src/components/tooltip/_tooltip.scss b/src/components/tooltip/_tooltip.scss
index 594c684f9211..2b4f8f678e84 100644
--- a/src/components/tooltip/_tooltip.scss
+++ b/src/components/tooltip/_tooltip.scss
@@ -70,6 +70,7 @@
     border-radius: rem(4px);
     z-index: z('floating');
     word-wrap: break-word;
+    color: $text-01;
 
     p {
       @include font-family;

From 02bbc3362a32c40fbd2442a2b8ab96a9d5f20482 Mon Sep 17 00:00:00 2001
From: Tayler Aitken <taitken@us.ibm.com@taylers-mbp.attlocal.net>
Date: Fri, 22 Jun 2018 17:00:51 -0500
Subject: [PATCH 2/2] fix(tooltip): swapped tooltip positioning to percentage
 base units

---
 src/components/tooltip/_tooltip.scss | 43 +++++++++++++++++-----------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/components/tooltip/_tooltip.scss b/src/components/tooltip/_tooltip.scss
index 2b4f8f678e84..f521461efacd 100644
--- a/src/components/tooltip/_tooltip.scss
+++ b/src/components/tooltip/_tooltip.scss
@@ -21,13 +21,16 @@
     align-items: center;
     color: $text-01;
     font-weight: normal;
+
+    .#{$prefix}--tooltip__trigger {
+      margin-left: $spacing-xs;
+    }
   }
 
   .#{$prefix}--tooltip__trigger {
     @include button-reset($width: false);
     display: inline-flex;
     align-items: center;
-    margin-left: $spacing-xs;
     cursor: pointer;
     font-size: 1rem;
 
@@ -241,6 +244,16 @@
     }
 
     &:before {
+      right: 0;
+      left: 0;
+      width: 0.6rem;
+      height: 0.6rem;
+      margin: 0 auto;
+      content: '';
+      margin-top: 1px;
+    }
+
+    &:after {
       @include typescale('omega');
       @include layer('overlay');
       max-width: rem(176px);
@@ -255,16 +268,6 @@
       pointer-events: none;
     }
 
-    &:after {
-      right: 0;
-      left: 0;
-      width: 0.6rem;
-      height: 0.6rem;
-      margin: 0 auto;
-      content: '';
-      margin-top: 1px;
-    }
-
     &:hover,
     &:focus {
       path {
@@ -290,24 +293,30 @@
   // Tooltip Icon caret - top position
   .#{$prefix}--tooltip--icon__top {
     &:before {
-      bottom: 1.8rem;
+      top: 0;
+      transform: translate(-50%, calc(-100% - 10px)) rotate(45deg);
+      margin-left: 50%;
     }
 
     &:after {
-      bottom: 1.5rem;
-      transform: rotate(45deg);
+      top: 0;
+      transform: translate(-50%, calc(-100% - 10px));
+      margin-left: 50%;
     }
   }
 
   // Tooltip Icon caret - bottom position
   .#{$prefix}--tooltip--icon__bottom {
     &:before {
-      top: 1.8rem;
+      bottom: 0;
+      transform: translate(-50%, calc(100% + 10px)) rotate(135deg);
+      margin-left: 50%;
     }
 
     &:after {
-      top: 1.5rem;
-      transform: rotate(-135deg);
+      bottom: 0;
+      transform: translate(-50%, calc(100% + 10px));
+      margin-left: 50%;
     }
   }