From e99f210c9dcf61a21e445e2a331384b6066f2c98 Mon Sep 17 00:00:00 2001 From: undergroundwires Date: Wed, 1 Jan 2020 12:31:41 +0100 Subject: [PATCH 01/21] typo fixes + whitespace refactorings --- src/App.vue | 13 ++-- src/application/ApplicationParser.ts | 28 +++++--- src/application/State/ApplicationState.ts | 10 +-- .../Renderer/AdminRightsFunctionRenderer.ts | 14 ++-- .../State/Code/Renderer/AsciiArtRenderer.ts | 20 +++--- .../State/Code/Renderer/FunctionRenderer.ts | 6 +- src/application/State/Filter/UserFilter.ts | 4 +- src/application/State/IApplicationState.ts | 1 - src/application/application.yaml.d.ts | 5 ++ src/domain/Application.ts | 65 ++++++++++++------- src/domain/Category.ts | 4 +- src/global.d.ts | 21 ++++-- src/infrastructure/Entity/BaseEntity.ts | 5 +- .../Repository/InMemoryRepository.ts | 1 + src/infrastructure/SaveFileDialog.ts | 2 +- src/infrastructure/Threading/AsyncLazy.ts | 2 +- src/main.ts | 4 +- .../Bootstrapping/Modules/IconBootstrapper.ts | 11 +++- src/presentation/styles/tooltip.scss | 2 + src/presentation/styles/tree.scss | 1 + src/shims-tsx.d.ts | 20 +++--- src/shims-vue.d.ts | 4 +- 22 files changed, 148 insertions(+), 95 deletions(-) diff --git a/src/App.vue b/src/App.vue index 7562abeb..de20411e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,19 +1,18 @@ diff --git a/src/presentation/styles/fonts.scss b/src/presentation/styles/fonts.scss index b46c0ed3..981902cc 100644 --- a/src/presentation/styles/fonts.scss +++ b/src/presentation/styles/fonts.scss @@ -23,4 +23,5 @@ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } - $default-font: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace; \ No newline at end of file + $default-font: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace; + $artistic-font: 'Yesteryear', cursive; \ No newline at end of file From 60e6348dc8d53f1e81ebdb2ec0e1962aac1e9842 Mon Sep 17 00:00:00 2001 From: undergroundwires Date: Mon, 6 Jan 2020 20:41:37 +0100 Subject: [PATCH 18/21] using font variables --- src/App.vue | 2 +- src/presentation/IconButton.vue | 3 ++- src/presentation/Scripts/Cards/CardList.vue | 2 +- src/presentation/Scripts/Selector/TheSelector.vue | 2 +- src/presentation/Scripts/TheGrouper.vue | 2 +- src/presentation/TheHeader.vue | 3 ++- src/presentation/TheSearchBar.vue | 2 +- src/presentation/styles/fonts.scss | 5 +++-- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/App.vue b/src/App.vue index da744f5b..a6e65f11 100644 --- a/src/App.vue +++ b/src/App.vue @@ -55,7 +55,7 @@ export default class App extends Vue { body { background: $light-gray; - font-family: 'Slabo 27px', serif; + font-family: $fancy-font; color: $slate; } diff --git a/src/presentation/IconButton.vue b/src/presentation/IconButton.vue index adb3b8b0..6e95e4ac 100644 --- a/src/presentation/IconButton.vue +++ b/src/presentation/IconButton.vue @@ -29,6 +29,7 @@ export default class IconButton extends StatefulVue { \ No newline at end of file diff --git a/src/presentation/Scripts/Selector/TheSelector.vue b/src/presentation/Scripts/Selector/TheSelector.vue index e7d13b7a..9aa3b521 100644 --- a/src/presentation/Scripts/Selector/TheSelector.vue +++ b/src/presentation/Scripts/Selector/TheSelector.vue @@ -100,7 +100,7 @@ export default class TheSelector extends StatefulVue { display: flex; margin-right:5px; } - font:16px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace; + font-family: $normal-font; } diff --git a/src/presentation/Scripts/TheGrouper.vue b/src/presentation/Scripts/TheGrouper.vue index 0f0fb9b5..5cb84837 100644 --- a/src/presentation/Scripts/TheGrouper.vue +++ b/src/presentation/Scripts/TheGrouper.vue @@ -31,7 +31,7 @@ export default class TheGrouper extends StatefulVue { .container { // text-align:left; - font:16px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace; + font:$normal-font; } .enabled { diff --git a/src/presentation/TheHeader.vue b/src/presentation/TheHeader.vue index 0535e5e3..4741bab3 100644 --- a/src/presentation/TheHeader.vue +++ b/src/presentation/TheHeader.vue @@ -28,6 +28,7 @@ export default class TheHeader extends StatefulVue {