Merge pull request #5 from jwplayer/wip.DES-663.icon-namespacing

Modified Icon Namespacing
jwplayer · Nov 7, 2018 · 137c409 · 137c409
2 parents 97feff7 + daf86ea
commit 137c409
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 35 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/styles/hook.css b/styles/hook.css
@@ -14,51 +14,28 @@
 /* Color Scale - A */
 /* Color Scale - B */
 /* Color Scale - C */
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Open Sans Light'), local('OpenSans-Light'), url(https://fonts.gstatic.com/s/opensans/v15/mem5YaGs126MiZpBA-UN_r8OUuhs.ttf) format('truetype');
-}
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Open Sans Regular'), local('OpenSans-Regular'), url(https://fonts.gstatic.com/s/opensans/v15/mem8YaGs126MiZpBA-UFVZ0e.ttf) format('truetype');
-}
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 600;
-  src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(https://fonts.gstatic.com/s/opensans/v15/mem5YaGs126MiZpBA-UNirkOUuhs.ttf) format('truetype');
-}
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 700;
-  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(https://fonts.gstatic.com/s/opensans/v15/mem5YaGs126MiZpBA-UN7rgOUuhs.ttf) format('truetype');
-}
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700');
 /* Typefaces */
 /* Sizes */
 /* Weights */
-.jw-icon {
+.ds-icon {
   width: 16px;
   height: 16px;
   vertical-align: middle;
 }
-.jw-icon.jw-icon-xs {
+.ds-icon.ds-icon-xs {
   width: 8px;
   height: 8px;
 }
-.jw-icon.jw-icon-sm {
+.ds-icon.ds-icon-sm {
   width: 16px;
   height: 16px;
 }
-.jw-icon.jw-icon-med {
+.ds-icon.ds-icon-med {
   width: 24px;
   height: 24px;
 }
-.jw-icon.jw-icon-lg {
+.ds-icon.ds-icon-lg {
   width: 32px;
   height: 32px;
 }

diff --git a/styles/hook.min.css b/styles/hook.min.css
diff --git a/styles/icons.less b/styles/icons.less
@@ -1,20 +1,20 @@
-.jw-icon {
+.ds-icon {
   width: 16px;
   height: 16px;
   vertical-align: middle;
-  &.jw-icon-xs {
+  &.ds-icon-xs {
     width: 8px;
     height: 8px;
   }
-  &.jw-icon-sm {
+  &.ds-icon-sm {
     width: 16px;
     height: 16px;
   }
-  &.jw-icon-med {
+  &.ds-icon-med {
     width: 24px;
     height: 24px;
   }
-  &.jw-icon-lg {
+  &.ds-icon-lg {
     width: 32px;
     height: 32px;
   }