[Frontend] Fix paths, includes

#702
Per https://github.com/nasa/openmctweb/pull/702;
Removed include of _logo-and-bg.scss into _about.scss;
This commit is contained in:
Charles Hacskaylo 2016-02-26 14:49:34 -08:00
parent bc3eb4ab8d
commit 192bbae6e5
3 changed files with 5 additions and 8 deletions

View File

@ -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">

View File

@ -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 @@
}
}
}

View File

@ -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;