From 192bbae6e5f49983fcce8795418f7baabfb2f1df Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri, 26 Feb 2016 14:49:34 -0800
Subject: [PATCH] [Frontend] Fix paths, includes

#702
Per https://github.com/nasa/openmctweb/pull/702;
Removed include of _logo-and-bg.scss into _about.scss;
---
 index.html                                           | 4 ++--
 platform/commonUI/general/res/sass/_about.scss       | 5 +----
 platform/commonUI/general/res/sass/_logo-and-bg.scss | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index 6307a5f0dd..e5145d5c5e 100644
--- a/index.html
+++ b/index.html
@@ -33,8 +33,8 @@
             mct.run();
         });
     </script>
-    <link rel="stylesheet" href="/platform/commonUI/general/res/css/startup-base.css">
-    <link rel="stylesheet" href="/platform/commonUI/general/res/css/openmct.css">
+    <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
+    <link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css">
 	<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
 	<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
 	<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
diff --git a/platform/commonUI/general/res/sass/_about.scss b/platform/commonUI/general/res/sass/_about.scss
index 1e9abe70cf..5c94a63181 100644
--- a/platform/commonUI/general/res/sass/_about.scss
+++ b/platform/commonUI/general/res/sass/_about.scss
@@ -20,9 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 // General About dialog styling
-
-@import "logo-and-bg";
-
+// Depends on styles loaded via /platform/commonUI/general/res/sass/startup-base.scss
 .l-about {
 	&.abs {
 		overflow: auto;
@@ -67,4 +65,3 @@
 		}
 	}
 }
-
diff --git a/platform/commonUI/general/res/sass/_logo-and-bg.scss b/platform/commonUI/general/res/sass/_logo-and-bg.scss
index fbe13f7cb4..b67060b8fb 100644
--- a/platform/commonUI/general/res/sass/_logo-and-bg.scss
+++ b/platform/commonUI/general/res/sass/_logo-and-bg.scss
@@ -40,10 +40,10 @@
     }
 
     &:before {
-        // NASA logo
+        // NASA logo, dude
         $w: 5%;
         $m: 10px;
-        background-image: url('/platform/commonUI/general/res/images/logo-nasa.svg');
+        background-image: url('../images/logo-nasa.svg');
         top: $m;
         right: auto;
         bottom: auto;