Upstream
/
bitwarden-desktop
mirror of https://github.com/bitwarden/desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:bitwarden/desktop

This commit is contained in:
Kyle Spearrin 2018-01-30 21:21:36 -05:00
parent 257eddf126 1b88e7c64d
commit c9f7a781a8
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/services/services.module.ts
View File

@ -98,8 +98,13 @@ environmentService.setUrlsFromStorage().then(() => {
return syncService.fullSync(true);
});
function initFactory(i18n: I18nService): Function {
return () => i18n.init();
function initFactory(i18n: I18nService, platformUtilsService: DesktopPlatformUtilsService): Function {
return async () => {
await i18n.init();
const htmlEl = window.document.documentElement;
htmlEl.classList.add('os_' + platformUtilsService.getDeviceString());
htmlEl.classList.add('locale_' + i18n.translationLocale);
};
}
@NgModule({
@ -121,7 +126,10 @@ function initFactory(i18n: I18nService): Function {
{
provide: APP_INITIALIZER,
useFactory: initFactory,
deps: [I18nServiceAbstraction],
deps: [
I18nServiceAbstraction,
PlatformUtilsServiceAbstraction,
],
multi: true,
},
],

2
src/index.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html class="__OS__">
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

4
src/scss/base.scss
View File

@ -16,10 +16,6 @@ html, body {
line-height: 1.42857143;
}
body {
border-top: 1px solid $border-color-dark;
}
h1, h2, h3, h4, h5, h6 {
font-family: $font-family-sans-serif;
color: $text-color;

7
src/scss/environment.scss Normal file
View File

@ -0,0 +1,7 @@
@import "variables.scss";
html.os_windows {
body {
border-top: 1px solid $border-color-dark;
}
}

1
src/scss/styles.scss
View File

@ -8,3 +8,4 @@
@import "misc.scss";
@import "modal.scss";
@import "plugins.scss";
@import "environment.scss";