diff --git a/Cargo.lock b/Cargo.lock index 5843d923..82f2eb93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,6 +126,7 @@ version = "0.1.0" dependencies = [ "graphite-editor", "graphite-graphene", + "js-sys", "log", "serde", "wasm-bindgen", diff --git a/editor/src/document/layer_panel.rs b/editor/src/document/layer_panel.rs index ad1e5693..b4300713 100644 --- a/editor/src/document/layer_panel.rs +++ b/editor/src/document/layer_panel.rs @@ -141,8 +141,8 @@ impl Serialize for RawBuffer { S: serde::Serializer, { let mut buffer = serializer.serialize_struct("Buffer", 2)?; - buffer.serialize_field("ptr", &(self.0.as_ptr() as usize))?; - buffer.serialize_field("len", &(self.0.len()))?; + buffer.serialize_field("pointer", &(self.0.as_ptr() as usize))?; + buffer.serialize_field("length", &(self.0.len()))?; buffer.end() } } diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index dbba170e..12285f52 100644 --- a/frontend/.eslintrc.js +++ b/frontend/.eslintrc.js @@ -65,6 +65,7 @@ module.exports = { "no-bitwise": "off", "no-shadow": "off", "no-use-before-define": "off", + "no-restricted-imports": ["error", { patterns: [".*", "!@/*"] }], // TypeScript plugin config "@typescript-eslint/indent": ["error", "tab", { SwitchCase: 1 }], diff --git a/frontend/public/index.html b/frontend/public/index.html index 070dff8f..2b1e8eb7 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -17,7 +17,8 @@ -
+ +
diff --git a/frontend/src/App.vue b/frontend/src/App.vue index fd8aa014..ffeafc50 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -71,6 +71,7 @@ body, background: var(--color-2-mildblack); user-select: none; overscroll-behavior: none; + outline: none; } html, @@ -220,23 +221,52 @@ img { diff --git a/frontend/src/TwoViewTest.vue b/frontend/src/TwoViewTest.vue new file mode 100644 index 00000000..9c3a0659 --- /dev/null +++ b/frontend/src/TwoViewTest.vue @@ -0,0 +1,20 @@ + + + diff --git a/frontend/src/components/panels/Document.vue b/frontend/src/components/panels/Document.vue index 68a4d17f..97444b89 100644 --- a/frontend/src/components/panels/Document.vue +++ b/frontend/src/components/panels/Document.vue @@ -18,7 +18,7 @@ - +

Grid

The contents of this popover menu are coming soon

@@ -26,7 +26,7 @@ - +

Overlays

The contents of this popover menu are coming soon

@@ -70,31 +70,31 @@
- - + + - + - + - - - - - - + + + + + + - - + + @@ -238,11 +238,8 @@