Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update entrypoint layout #553

Merged
merged 1 commit into from
Feb 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "homeassistant-frontend"]
path = homeassistant-frontend
url = https://github.com/home-assistant/frontend.git
branch = dev
branch = master
2 changes: 1 addition & 1 deletion homeassistant-frontend
15 changes: 10 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,13 @@
"@rollup/plugin-replace": "^2.3.2",
"@types/chromecast-caf-receiver": "5.0.12",
"@types/chromecast-caf-sender": "^1.0.3",
"@types/glob": "^7",
"@types/js-yaml": "^4",
"@types/leaflet": "^1",
"@types/leaflet-draw": "^1",
"@types/marked": "^2",
"@types/mocha": "^8",
"@types/qrcode": "^1.4.2",
"@types/sortablejs": "^1",
"@types/webspeechapi": "^0.0.29",
"@typescript-eslint/eslint-plugin": "^4.32.0",
Expand All @@ -65,6 +67,7 @@
"eslint-plugin-wc": "^1.3.2",
"fancy-log": "^1.3.3",
"fs-extra": "^7.0.1",
"glob": "^7.2.0",
"gulp": "^4.0.2",
"gulp-foreach": "^0.1.0",
"gulp-json-transform": "^0.4.6",
Expand Down Expand Up @@ -142,6 +145,7 @@
"@material/mwc-checkbox": "0.25.3",
"@material/mwc-circular-progress": "0.25.3",
"@material/mwc-dialog": "0.25.3",
"@material/mwc-drawer": "^0.25.3",
"@material/mwc-fab": "0.25.3",
"@material/mwc-formfield": "0.25.3",
"@material/mwc-icon-button": "0.25.3",
Expand All @@ -156,6 +160,7 @@
"@material/mwc-tab": "0.25.3",
"@material/mwc-tab-bar": "0.25.3",
"@material/mwc-textfield": "0.25.3",
"@material/mwc-top-app-bar-fixed": "^0.25.3",
"@material/top-app-bar": "14.0.0-canary.261f2db59.0",
"@mdi/js": "6.5.95",
"@mdi/svg": "6.5.95",
Expand Down Expand Up @@ -198,7 +203,7 @@
"js-yaml": "^4.1.0",
"leaflet": "^1.7.1",
"leaflet-draw": "^1.0.4",
"lit": "^2.0.2",
"lit": "^2.1.2",
"lit-vaadin-helpers": "^0.2.1",
"marked": "^3.0.2",
"memoize-one": "^5.2.1",
Expand Down Expand Up @@ -232,10 +237,10 @@
"resolutions": {
"@polymer/polymer": "3.4.1",
"@webcomponents/webcomponentsjs": "^2.2.10",
"lit": "^2.0.2",
"lit-html": "2.0.1",
"lit-element": "3.0.1",
"@lit/reactive-element": "1.0.1"
"lit": "^2.1.2",
"lit-html": "2.1.2",
"lit-element": "3.1.2",
"@lit/reactive-element": "1.2.1"
},
"resolutionsOverride": {
"@polymer/polymer": "3.4.1"
Expand Down
5 changes: 4 additions & 1 deletion script/gulp/rollup.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ const DevelopPlugins = [
exclude: [require.resolve("@mdi/js/mdi.js")],
}),
ignore({
files: [require.resolve("@polymer/font-roboto/roboto.js")],
files: [
require.resolve("@polymer/font-roboto/roboto.js"),
path.resolve("./homeassistant-frontend/src/components/ha-icon.ts"),
],
}),
entrypointHashmanifest({ manifestName: "./hacs_frontend/manifest.json" }),
];
Expand Down
8 changes: 8 additions & 0 deletions script/gulp/translations.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ gulp.task("generate-translations", async function (task) {
log(`Generating transtions for '${lang}'`);
});

await fs.mkdirs("./homeassistant-frontend/build/translations");

await fs.writeFile(
"./homeassistant-frontend/build/translations/translationMetadata.json",
"{}",
"utf-8"
);

await fs.writeFile(
"./src/localize/generated.ts",
"export const languages = " + JSON.stringify(languages, null, 2),
Expand Down
4 changes: 4 additions & 0 deletions src/hacs-router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ class HacsRouter extends HassRouterPage {
this._wideSidebar = matches;
})
);

this.style.setProperty("--app-header-background-color", "var(--sidebar-background-color)");
this.style.setProperty("--app-header-text-color", "var(--sidebar-text-color)");
this.style.setProperty("--app-header-border-bottom", "1px solid var(--divider-color)");
}

public disconnectedCallback() {
Expand Down
1 change: 1 addition & 0 deletions src/localize/languages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"repository": "Repository",
"theme": "Theme",
"update": "Update",
"updates": "Updates",
"yes": "Yes"
},
"confirm": {
Expand Down
Loading