[sdc] rebase update

Change-Id: I8f1fc7150975122dd9f3f4e653b9983064b399a6
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 33 insertions, 45 deletions

diff --git a/catalog-ui/src/assets/styles/fonts.less b/catalog-ui/src/assets/styles/fonts.less
index 752f41f86a..fad2838a03 100644
--- a/catalog-ui/src/assets/styles/fonts.less
+++ b/catalog-ui/src/assets/styles/fonts.less
@@ -1,72 +1,60 @@
-//Omnes_ATT W02 Italic
+// OpenSans Bold
 @font-face {
-  font-family: omnes-italic;
-  src: url('fonts/OmnesATT/Omnes_ATTW02Italic.eot');
-  src: url('fonts/OmnesATT/Omnes_ATTW02Italic.eot?#iefix') format('embedded-opentype'),
-  url('fonts/OmnesATT/Omnes_ATTW02Italic.ttf');
+    font-family: OpenSans-Bold;
+    src: url("fonts/OpenSans/OpenSans-Bold.ttf") format('truetype');
 }
 
-//Omnes_ATT W02 Light
+// OpenSans Bold Italic
 @font-face {
-  font-family: omnes-light;
-  src: url('fonts/OmnesATT/Omnes_ATTW02Light.eot');
-  src: url('fonts/OmnesATT/Omnes_ATTW02Light.eot?#iefix') format('embedded-opentype'),
-  url('fonts/OmnesATT/Omnes_ATTW02Light.ttf');
+    font-family: OpenSans-BoldItlaic;
+    src: url("fonts/OpenSans/OpenSans-BoldItalic.ttf") format('truetype');
 }
 
-//Omnes_ATT W02 Light Italic
+// OpenSans Extra Bold
 @font-face {
-  font-family: omnes-light-italic;
-  src: url('fonts/OmnesATT/Omnes_ATTW02LightItalic.eot');
-  src: url('fonts/OmnesATT/Omnes_ATTW02LightItalic.eot?#iefix') format('embedded-opentype'),
-  url('fonts/OmnesATT/Omnes_ATTW02LightItalic.ttf');
+    font-family: OpenSans-ExtraBold;
+    src: url("fonts/OpenSans/OpenSans-ExtraBold.ttf") format('truetype');
 }
 
-//Omnes_ATT W02 Medium
+// OpenSans Extra Bold Italic
 @font-face {
-  font-family: omnes-medium;
-  src: url('fonts/OmnesATT/Omnes_ATTW02Medium.eot');
-  src: url('fonts/OmnesATT/Omnes_ATTW02Medium.eot?#iefix') format('embedded-opentype'),
-  url('fonts/OmnesATT/Omnes_ATTW02Medium.ttf');
+    font-family: OpenSans-ExtraBoldItalic;
+    src: url("fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf") format('truetype');
 }
 
-//Omnes_ATT W02 Medium Italic
+// OpenSans Italic
 @font-face {
-  font-family: omnes-medium-italic;
-  src: url('fonts/OmnesATT/Omnes_ATTW02MediumItalic.eot');
-  src: url('fonts/OmnesATT/Omnes_ATTW02MediumItalic.eot?#iefix') format('embedded-opentype'),
-  url('fonts/OmnesATT/Omnes_ATTW02MediumItalic.ttf');
+    font-family: OpenSans-Italic;
+    src: url("fonts/OpenSans/OpenSans-Italic.ttf") format('truetype');
 }
 
-//Omnes_ATT W02 Regular
+// OpenSans Light
 @font-face {
-  font-family: omnes-regular;
-  src: url('fonts/OmnesATT/Omnes_ATTW02.eot');
-  src: url('fonts/OmnesATT/Omnes_ATTW02.eot?#iefix') format('embedded-opentype'),
-  url('fonts/OmnesATT/Omnes_ATTW02.ttf');
+    font-family: OpenSans-Light;
+    src: url("fonts/OpenSans/OpenSans-Light.ttf") format('truetype');
 }
 
-//Omnes_ATT W02 Bold
+// OpenSans Light Italic
 @font-face {
-  font-family: omnes-bold;
-  src: url('fonts/OmnesATT/Omnes_ATTW02Bold.eot');
-  src: url('fonts/OmnesATT/Omnes_ATTW02Bold.eot?#iefix') format('embedded-opentype'),
-  url('fonts/OmnesATT/Omnes_ATTW02Bold.ttf');
+    font-family: OpenSans-LightItalic;
+    src: url("fonts/OpenSans/OpenSans-LightItalic.ttf") format('truetype');
 }
 
-//Omnes_ATT W02 Bold Italic
+// OpenSans Regular
 @font-face {
-  font-family: omnes-bold-italic;
-  src: url('fonts/OmnesATT/OmnesATTW02BoldItalic.eot');
-  src: url('fonts/OmnesATT/OmnesATTW02BoldItalic.eot?#iefix') format('embedded-opentype'),
-  url('fonts/OmnesATT/OmnesATTW02BoldItalic.ttf');
+    font-family: OpenSans-Regular;
+    src: url("fonts/OpenSans/OpenSans-Regular.ttf") format('truetype');
 }
 
+// OpenSans Semi Bold
+@font-face {
+    font-family: OpenSans-Semibold;
+    src: url("fonts/OpenSans/OpenSans-Semibold.ttf") format('truetype');
+}
 
-//ClearviewATT Book
+// OpenSans Semi Bold Italic
 @font-face {
-  font-family: clearview-book;
-  src: url('fonts/ClearviewATT/ClearviewATT-Bk.eot');
-  src: url('fonts/ClearviewATT/ClearviewATT-Bk.eot?#iefix') format('embedded-opentype'),
-  url('fonts/ClearviewATT/ClearviewATT-Bk.ttf');
+    font-family: OpenSans-SemiboldItalic;
+    src: url("fonts/OpenSans/OpenSans-SemiboldItalic.ttf") format('truetype');
 }
+