From 7ebdf59737607dab97210e92f2c6d54203042e73 Mon Sep 17 00:00:00 2001
From: Alison Joseph <alisonejoseph@gmail.com>
Date: Wed, 24 Oct 2018 11:36:41 -0500
Subject: [PATCH 1/2] fix(notification): add correct icon svgs for different
 types

---
 src/components/notification/notification.hbs | 23 +++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/components/notification/notification.hbs b/src/components/notification/notification.hbs
index bf6683a04e67..31297eafc667 100644
--- a/src/components/notification/notification.hbs
+++ b/src/components/notification/notification.hbs
@@ -2,9 +2,26 @@
   <div data-notification class="bx--{{../variant}}-notification bx--{{../variant}}-notification--{{type}}" role="alert">
     <div class="bx--{{../variant}}-notification__details">
       {{#is ../variant "inline"}}
-        <svg class="bx--{{../variant}}-notification__icon" width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-          <path d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16zM3.293 4.707l8 8 1.414-1.414-8-8-1.414 1.414z" fill-rule="evenodd" />
-        </svg>
+        {{#is type "error"}}
+          <svg class="bx--{{../variant}}-notification__icon" width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+            <path d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16zM3.293 4.707l8 8 1.414-1.414-8-8-1.414 1.414z" fill-rule="evenodd" />
+          </svg>
+        {{/is}}
+         {{#is type "info"}}
+          <svg class="bx--{{../variant}}-notification__icon" width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+            <path d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16zm1-3V7H7v6h2zM8 5a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"></path>
+          </svg>
+        {{/is}}
+         {{#is type "success"}}
+          <svg class="bx--{{../variant}}-notification__icon" width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+            <path d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16zm3.293-11.332L6.75 9.21 4.707 7.168 3.293 8.582 6.75 12.04l5.957-5.957-1.414-1.414z"></path>
+          </svg>
+        {{/is}}
+         {{#is type "warning"}}
+          <svg class="bx--{{../variant}}-notification__icon" width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+            <path d="M.75 16a.75.75 0 0 1-.67-1.085L7.33.415a.75.75 0 0 1 1.34 0l7.25 14.5A.75.75 0 0 1 15.25 16H.75zm6.5-10v5h1.5V6h-1.5zM8 13.5A.75.75 0 1 0 8 12a.75.75 0 0 0 0 1.5z"></path>
+          </svg>
+        {{/is}}
         <div class="bx--{{../variant}}-notification__text-wrapper">
           <p class="bx--{{../variant}}-notification__title">{{title}}</p>
           <p class="bx--{{../variant}}-notification__subtitle">{{subtitle}}</p>

From c7039c522428a7306d781c3e90373be266e5aafe Mon Sep 17 00:00:00 2001
From: Alison Joseph <alisonejoseph@gmail.com>
Date: Thu, 1 Nov 2018 21:26:56 -0500
Subject: [PATCH 2/2] fix: replace bx with prefix variable

---
 src/components/combo-box/_combo-box.scss             | 2 +-
 src/components/multi-select/_multi-select.scss       | 4 ++--
 src/components/overflow-menu/_overflow-menu.scss     | 2 +-
 src/components/select/_select.scss                   | 8 ++++----
 src/components/structured-list/_structured-list.scss | 4 ++--
 src/components/tile/_tile.scss                       | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/combo-box/_combo-box.scss b/src/components/combo-box/_combo-box.scss
index c16686bd93a7..f2eb5fbf8c72 100644
--- a/src/components/combo-box/_combo-box.scss
+++ b/src/components/combo-box/_combo-box.scss
@@ -11,7 +11,7 @@
 @import '../list-box/list-box';
 
 @include exports('combo-box') {
-  .bx--combo-box > .bx--list-box__field {
+  .#{$prefix}--combo-box > .#{$prefix}--list-box__field {
     padding: 0;
   }
 }
diff --git a/src/components/multi-select/_multi-select.scss b/src/components/multi-select/_multi-select.scss
index 484a1180f3ad..77e803f7052a 100644
--- a/src/components/multi-select/_multi-select.scss
+++ b/src/components/multi-select/_multi-select.scss
@@ -13,11 +13,11 @@
 @import '../list-box/list-box';
 
 @include exports('multi-select') {
-  .bx--multi-select.bx--combo-box > .bx--list-box__field {
+  .#{$prefix}--multi-select.#{$prefix}--combo-box > .#{$prefix}--list-box__field {
     padding: 0 1rem;
   }
 
-  .bx--multi-select.bx--combo-box input[role='combobox'] {
+  .#{$prefix}--multi-select.#{$prefix}--combo-box input[role='combobox'] {
     padding: 0;
     outline: none;
   }
diff --git a/src/components/overflow-menu/_overflow-menu.scss b/src/components/overflow-menu/_overflow-menu.scss
index d22b3cc15e67..233d0636cb89 100644
--- a/src/components/overflow-menu/_overflow-menu.scss
+++ b/src/components/overflow-menu/_overflow-menu.scss
@@ -145,7 +145,7 @@
   }
 
   .#{$prefix}--overflow-menu-options__option--danger {
-    .bx--overflow-menu-options__btn {
+    .#{$prefix}--overflow-menu-options__btn {
       &:hover,
       &:focus {
         color: $inverse-01;
diff --git a/src/components/select/_select.scss b/src/components/select/_select.scss
index 58b409f4a10a..f2514ed3600d 100644
--- a/src/components/select/_select.scss
+++ b/src/components/select/_select.scss
@@ -257,7 +257,7 @@
     }
   }
 
-  .#{$prefix}--select-input:disabled ~ .bx--select__arrow {
+  .#{$prefix}--select-input:disabled ~ .#{$prefix}--select__arrow {
     fill: $disabled;
   }
 
@@ -346,7 +346,7 @@
     @include focus-outline('invalid');
   }
 
-  .#{$prefix}--select--inline .bx--select-input:disabled {
+  .#{$prefix}--select--inline .#{$prefix}--select-input:disabled {
     color: $disabled;
     cursor: not-allowed;
 
@@ -369,7 +369,7 @@
     }
   }
 
-  .#{$prefix}--select--inline .bx--select-input:disabled {
+  .#{$prefix}--select--inline .#{$prefix}--select-input:disabled {
     cursor: not-allowed;
     // THIS SHOULD BE MOVED TO AN INLINE SVG IN NEXT MAJOR RELEASE
     background-image: url("data:image/svg+xml;charset=UTF-8, %3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' width='16' height='16' class='ibm-icons ibm-icons--error--filled' fill='%23bebebe'%3e%3cpath d='M6.95 26.66A14 14 0 0 0 26.67 6.93zM16 2A14 14 0 0 0 5.35 25.07L25.08 5.34A13.93 13.93 0 0 0 16 2z'/%3e%3c/svg%3e");
@@ -377,7 +377,7 @@
     background-position: calc(100% - 8px) 50%;
   }
 
-  .#{$prefix}--select--inline .bx--select-input:disabled ~ .#{$prefix}--select__arrow {
+  .#{$prefix}--select--inline .#{$prefix}--select-input:disabled ~ .#{$prefix}--select__arrow {
     display: none;
   }
 
diff --git a/src/components/structured-list/_structured-list.scss b/src/components/structured-list/_structured-list.scss
index 682abe0561ab..27023df04366 100644
--- a/src/components/structured-list/_structured-list.scss
+++ b/src/components/structured-list/_structured-list.scss
@@ -151,7 +151,7 @@
       }
     }
 
-    .bx--structured-list-th span {
+    .#{$prefix}--structured-list-th span {
       @include skeleton;
       width: 75%;
       height: 1rem;
@@ -316,7 +316,7 @@
       }
     }
 
-    .bx--structured-list-th span {
+    .#{$prefix}--structured-list-th span {
       @include skeleton;
       width: 75%;
       height: 1rem;
diff --git a/src/components/tile/_tile.scss b/src/components/tile/_tile.scss
index 9bb369b085e2..d838e32a36da 100644
--- a/src/components/tile/_tile.scss
+++ b/src/components/tile/_tile.scss
@@ -291,7 +291,7 @@
     outline-offset: -1px;
   }
 
-  .#{$prefix}--tile--is-selected .bx--tile__checkmark {
+  .#{$prefix}--tile--is-selected .#{$prefix}--tile__checkmark {
     opacity: 1;
   }