From 8c29592db82fe31420bcd87463fc5ea9a523bd37 Mon Sep 17 00:00:00 2001 From: Keavon Chambers Date: Sun, 23 Jan 2022 20:23:35 -0800 Subject: [PATCH] Clean up web code's use of display CSS properties, using / where intended --- frontend/src/App.vue | 67 ++++++----- frontend/src/components/layout/LayoutCol.vue | 2 +- frontend/src/components/layout/LayoutRow.vue | 2 +- frontend/src/components/panels/Document.vue | 24 ++-- frontend/src/components/panels/Minimap.vue | 11 -- frontend/src/components/panels/Properties.vue | 8 +- .../components/widgets/buttons/IconButton.vue | 2 +- .../widgets/buttons/PopoverButton.vue | 8 +- .../components/widgets/buttons/TextButton.vue | 1 - .../widgets/floating-menus/ColorPicker.vue | 69 +++++++---- .../widgets/floating-menus/DialogModal.vue | 37 +++--- .../widgets/floating-menus/FloatingMenu.vue | 10 +- .../widgets/floating-menus/MenuList.vue | 11 +- .../widgets/inputs/CheckboxInput.vue | 20 ++-- .../widgets/inputs/DropdownInput.vue | 12 +- .../components/widgets/inputs/NumberInput.vue | 20 +--- .../widgets/inputs/OptionalInput.vue | 9 +- .../components/widgets/inputs/RadioInput.vue | 13 +- .../widgets/inputs/ShelfItemInput.vue | 10 +- .../widgets/inputs/SwatchPairInput.vue | 18 +-- .../components/widgets/labels/IconLabel.vue | 12 +- .../widgets/labels/UserInputLabel.vue | 18 ++- .../widgets/options/ToolOptions.vue | 7 +- .../scrollbars/PersistentScrollbar.vue | 1 - frontend/src/components/window/MainWindow.vue | 32 +---- .../window/status-bar/StatusBar.vue | 59 ++++++---- .../components/window/title-bar/TitleBar.vue | 52 ++++---- .../window/title-bar/WindowButtonsMac.vue | 19 ++- .../window/title-bar/WindowButtonsWeb.vue | 8 +- .../window/title-bar/WindowButtonsWindows.vue | 26 ++-- .../window/title-bar/WindowTitle.vue | 9 +- frontend/src/components/workspace/Panel.vue | 12 +- .../src/components/workspace/Workspace.vue | 111 +++++++++--------- frontend/src/lifetime/input.ts | 10 +- 34 files changed, 385 insertions(+), 345 deletions(-) delete mode 100644 frontend/src/components/panels/Minimap.vue diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 07264428..22b3735d 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -2,7 +2,7 @@
-
+

Your browser currently doesn't support Graphite

Unfortunately, some features won't work properly. Please upgrade to a modern browser such as Firefox, Chrome, Edge, or Safari version 15 or later.

@@ -13,7 +13,7 @@ -

+
@@ -186,39 +186,43 @@ img { left: 0; bottom: 0; right: 0; + display: flex; align-items: center; justify-content: center; - display: flex; -} -.unsupported-modal { - background: var(--color-3-darkgray); - border-radius: 4px; - box-shadow: 2px 2px 5px 0 rgba(var(--color-0-black-rgb), 50%); - padding: 0 16px 16px 16px; - border: 1px solid var(--color-4-dimgray); - max-width: 500px; + .unsupported-modal { + background: var(--color-3-darkgray); + border-radius: 4px; + box-shadow: 2px 2px 5px 0 rgba(var(--color-0-black-rgb), 50%); + padding: 0 16px 16px 16px; + border: 1px solid var(--color-4-dimgray); + max-width: 500px; - & a { - color: var(--color-accent-hover); - } -} + p { + margin-top: 0; + } -.unsupported-modal-button { - flex: 1; - background: var(--color-1-nearblack); - border: 0 none; - padding: 12px; - border-radius: 2px; + a { + color: var(--color-accent-hover); + } - &:hover { - background: var(--color-6-lowergray); - color: var(--color-f-white); - } + .unsupported-modal-button { + flex: 1; + background: var(--color-1-nearblack); + border: 0 none; + padding: 12px; + border-radius: 2px; - &:active { - background: var(--color-accent-hover); - color: var(--color-f-white); + &:hover { + background: var(--color-6-lowergray); + color: var(--color-f-white); + } + + &:active { + background: var(--color-accent-hover); + color: var(--color-f-white); + } + } } } @@ -234,6 +238,7 @@ import { createDocumentsState, DocumentsState } from "@/state/documents"; import { createFullscreenState, FullscreenState } from "@/state/fullscreen"; import { createEditorState, EditorState } from "@/state/wasm-loader"; +import LayoutCol from "@/components/layout/LayoutCol.vue"; import LayoutRow from "@/components/layout/LayoutRow.vue"; import MainWindow from "@/components/window/MainWindow.vue"; @@ -291,6 +296,10 @@ export default defineComponent({ const { editor } = this; editor.instance.free(); }, - components: { MainWindow, LayoutRow }, + components: { + MainWindow, + LayoutRow, + LayoutCol, + }, }); diff --git a/frontend/src/components/layout/LayoutCol.vue b/frontend/src/components/layout/LayoutCol.vue index e081678a..2c6b9f32 100644 --- a/frontend/src/components/layout/LayoutCol.vue +++ b/frontend/src/components/layout/LayoutCol.vue @@ -1,5 +1,5 @@ diff --git a/frontend/src/components/layout/LayoutRow.vue b/frontend/src/components/layout/LayoutRow.vue index 9776733b..70dc6c7b 100644 --- a/frontend/src/components/layout/LayoutRow.vue +++ b/frontend/src/components/layout/LayoutRow.vue @@ -1,5 +1,5 @@ diff --git a/frontend/src/components/panels/Document.vue b/frontend/src/components/panels/Document.vue index d585edd7..bba1ff01 100644 --- a/frontend/src/components/panels/Document.vue +++ b/frontend/src/components/panels/Document.vue @@ -1,15 +1,17 @@