Merge pull request #370 from navikt/css-fix

Duplikat css fiks
navikt · May 18, 2020 · 1f63b05 · 1f63b05
2 parents f1584bc + 5e38a15
commit 1f63b05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/komponenter/HeadElements.tsx b/src/komponenter/HeadElements.tsx
@@ -11,9 +11,7 @@ const fileFavicon32x32 = require('ikoner/favicon/favicon-32x32.png');
 const fileMaskIcon = require('ikoner/favicon/safari-pinned-tab.svg');
 
 export const HeadElements = () => {
-    const { APP_BASE_URL, XP_BASE_URL } = useSelector(
-        (state: AppState) => state.environment
-    );
+    const { XP_BASE_URL } = useSelector((state: AppState) => state.environment);
     return (
         <MetaTags>
             <link
@@ -43,7 +41,6 @@ export const HeadElements = () => {
                 color="#5bbad5"
                 href={`${XP_BASE_URL}${fileMaskIcon}`}
             />
-            <link href={`${APP_BASE_URL}/css/client.css`} rel="stylesheet" />
         </MetaTags>
     );
 };

diff --git a/src/server/template.tsx b/src/server/template.tsx
@@ -20,6 +20,7 @@ if (process.env.NODE_ENV !== 'production') {
 
 // Resources
 const fileEnv = `${process.env.APP_BASE_URL}/env`;
+const fileCss = `${process.env.APP_BASE_URL}/css/client.css`;
 const fileScript = `${process.env.APP_BASE_URL}/client.js`;
 
 const cache = new NodeCache({ stdTTL: 100, checkperiod: 120 });
@@ -106,6 +107,7 @@ export const template = (req: Request) => {
             <!-- Styling fetched by apps -->
             <div id="styles">
                 ${HtmlMetaTags}
+                <link href="${fileCss}" rel="stylesheet" />
             </div>
         </head>
         <body>