[Settings] Fix HTML settings build (#10307)

microsoft · Mar 18, 2021 · 7c28459 · 7c28459
1 parent fa5ce63
commit 7c28459
Show file tree

Hide file tree

Showing 12 changed files with 939 additions and 65 deletions.
diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
@@ -754,6 +754,9 @@
       <Component Id="settings_js_bundle" Guid="9EF539C1-2F50-421E-B074-C58ED3A9785C" Win64="yes">
         <File Source="$(var.RepoDir)\src\settings\settings-html\dist\bundle.js" KeyPath="yes" />
       </Component>
+      <Component Id="settings_css" Guid="9B8EBF56-A7A7-4D83-B53C-75A692E2F95A" Win64="yes">
+        <File Source="$(var.RepoDir)\src\settings\settings-html\dist\layout.css" KeyPath="yes" />
+      </Component>
     </DirectoryRef>
 
     <DirectoryRef Id="DesktopFolder">
@@ -814,6 +817,7 @@
       <ComponentRef Id="settings_html" />
       <ComponentRef Id="settings_dark_html" />
       <ComponentRef Id="settings_js_bundle" />
+      <ComponentRef Id="settings_css" />
     </ComponentGroup>
     <ComponentGroup Id="ToolComponents" Directory="ToolsFolder">
       <ComponentRef Id="BugReportTool_exe" />

diff --git a/src/settings-web/index-dark.html b/src/settings-web/index-dark.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel="stylesheet" href="dist/layout.css" />
     <script>
       window.output_from_webview = function(arg) {
         if (typeof (window.external) !== 'undefined' && ('notify' in window.external)) {

diff --git a/src/settings-web/index.html b/src/settings-web/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel="stylesheet" href="dist/layout.css" />
     <script>
       window.output_from_webview = function(arg) {
         if (typeof (window.external) !== 'undefined' && ('notify' in window.external)) {