Merge pull request #476 from eBay/6.3.0

Merge 6.3.0 branch into master prior to release
eBay · Dec 12, 2018 · c7a4aad · c7a4aad
2 parents 194ea8b + 3564cc0
commit c7a4aad
Show file tree

Hide file tree

Showing 44 changed files with 3,771 additions and 3,415 deletions.
diff --git a/browser.json b/browser.json
@@ -12,8 +12,6 @@
         "@ebay/skin/dialog",
         "@ebay/skin/field",
         "@ebay/skin/grid",
-        "@ebay/skin/icon",
-        "@ebay/skin/iconfont",
         "@ebay/skin/listbox",
         "@ebay/skin/marketsans",
         "@ebay/skin/menu",
@@ -24,6 +22,12 @@
         "@ebay/skin/switch",
         "@ebay/skin/tab",
         "@ebay/skin/textbox",
-        "@ebay/skin/typography"
+        "@ebay/skin/typography",
+        {
+            "if-not-flag": "skin-icon-opt-out",
+            "dependencies": [
+                "@ebay/skin/icon"
+            ]
+        }
     ]
 }
diff --git a/combo.browser.json b/combo.browser.json
@@ -7,7 +7,6 @@
         {
             "if-not-flag": "skin-icon-opt-out",
             "dependencies": [
-                "@ebay/skin/iconfont",
                 "@ebay/skin/icon"
             ]
         }

diff --git a/dist/grid/ds4/grid-full.css b/dist/grid/ds4/grid-full.css
@@ -1,5 +1,5 @@
 /*!
-Skin v6.2.0
+Skin v6.3.0-0
 Copyright 2017 eBay! Inc. All rights reserved.
 Licensed under the BSD License.
 https://github.com/eBay/skin/blob/master/LICENSE.txt"

diff --git a/dist/icon/ds4/icon.css → dist/icon/background/ds4/background.css b/dist/icon/ds4/icon.css → dist/icon/background/ds4/background.css
diff --git a/dist/icon/ds6/icon.css → dist/icon/background/ds6/background.css b/dist/icon/ds6/icon.css → dist/icon/background/ds6/background.css