diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html index 96df08d62..6af4bc21d 100644 --- a/src/app/dashboard/dashboard.component.html +++ b/src/app/dashboard/dashboard.component.html @@ -1,8 +1,13 @@ +
+
+ + Tech UI +
+
-

Tech UI

diff --git a/src/app/dashboard/dashboard.component.scss b/src/app/dashboard/dashboard.component.scss index 0b6973a09..84c7e85b0 100644 --- a/src/app/dashboard/dashboard.component.scss +++ b/src/app/dashboard/dashboard.component.scss @@ -1,3 +1,7 @@ +.header { + margin: 20px 3vw 20px 3vw; +} .grid-container { - margin: 20px; + margin: 10px calc(10px + 3.3vw); + min-width: 600px; } \ No newline at end of file diff --git a/src/app/device.ts b/src/app/device.ts index aeb70cbe2..42a889a30 100644 --- a/src/app/device.ts +++ b/src/app/device.ts @@ -50,13 +50,13 @@ namespace Device { export function stateTypeToColor(s: StateType): string { switch (s) { case StateType.Insync: - return colors.get("green"); + return colors.get("blue"); case StateType.UnusedInsync: return colors.get("grey"); case StateType.Unknown: return colors.get("grey"); case StateType.Syncing: - return colors.get("blue"); + return colors.get("green"); case StateType.Paused: return colors.get("grey"); case StateType.UnusedPaused: diff --git a/src/app/folder.ts b/src/app/folder.ts index 3015c0fd2..fb8169e64 100644 --- a/src/app/folder.ts +++ b/src/app/folder.ts @@ -82,7 +82,7 @@ namespace Folder { case StateType.Scanning: return colors.get("grey"); case StateType.Idle: - return colors.get("green"); + return colors.get("blue"); case StateType.LocalAdditions: return colors.get("grey"); case StateType.WaitingToScan: @@ -90,7 +90,7 @@ namespace Folder { case StateType.PreparingToSync: return colors.get("grey"); case StateType.Syncing: - return colors.get("blue"); + return colors.get("green"); case StateType.OutOfSync: return colors.get("grey"); case StateType.FailedItems: diff --git a/src/app/lists/status-list/status-list.component.html b/src/app/lists/status-list/status-list.component.html index 35a3a0d8e..8fd9d2fa6 100644 --- a/src/app/lists/status-list/status-list.component.html +++ b/src/app/lists/status-list/status-list.component.html @@ -1,6 +1,6 @@
-
Status
+
{{title | uppercase}}
diff --git a/src/app/lists/status-list/status-list.component.ts b/src/app/lists/status-list/status-list.component.ts index de2f2dfba..b0ad877c8 100644 --- a/src/app/lists/status-list/status-list.component.ts +++ b/src/app/lists/status-list/status-list.component.ts @@ -12,6 +12,7 @@ export class StatusListComponent implements OnInit { currentListType: ListType = ListType.Folders; listType = ListType; // used in html elevation: string = cardElevation; + title: string = 'Status'; constructor() { } diff --git a/src/assets/logo-horizontal.svg b/src/assets/logo-horizontal.svg new file mode 100644 index 000000000..de8850f53 Binary files /dev/null and b/src/assets/logo-horizontal.svg differ