From fd3daecba583c5cc4a1877d5d05c5fbdbf6e1971 Mon Sep 17 00:00:00 2001 From: Nicola <47360416+unsettledgames@users.noreply.github.com> Date: Mon, 27 Dec 2021 19:40:23 +0100 Subject: [PATCH] Restored square templates in splash page --- css/_splash-page.scss | 7 ++----- js/ToolManager.js | 2 ++ js/pixel-editor.js | 1 + js/tools/LassoSelectionTool.js | 2 +- svg/lasso.svg | 19 +++++++++++++++++++ views/tools-menu.hbs | 5 ++++- 6 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 svg/lasso.svg diff --git a/css/_splash-page.scss b/css/_splash-page.scss index 46939e3..fd03cdc 100644 --- a/css/_splash-page.scss +++ b/css/_splash-page.scss @@ -155,9 +155,7 @@ .sp-template { display: flex; align-items: center; - height: 5em; - min-width: 5em; - + text-transform: uppercase; width:16%; border-radius:5%; @@ -188,12 +186,11 @@ } } - /* .sp-template:before { content:''; float:left; padding-top:100%; - }*/ + } #sp-newpixel { -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ diff --git a/js/ToolManager.js b/js/ToolManager.js index b5eaa8b..65bcd5e 100644 --- a/js/ToolManager.js +++ b/js/ToolManager.js @@ -16,6 +16,8 @@ const ToolManager = (() => { {type:'cursor', style:'crosshair'}, switchTool, tools["brush"]); tools["rectselect"] = new RectangularSelectionTool("rectselect", {type: 'cursor', style:'crosshair'}, switchTool, tools["moveselection"]); + tools["lassoselect"] = new LassoSelectionTool("lassoselect", + {type: 'cursor', style:'crosshair'}, switchTool, tools["moveselection"]); currTool = tools["brush"]; currTool.onSelect(); diff --git a/js/pixel-editor.js b/js/pixel-editor.js index 29a8087..4e7606b 100644 --- a/js/pixel-editor.js +++ b/js/pixel-editor.js @@ -42,6 +42,7 @@ //=include tools/PanTool.js //=include tools/ZoomTool.js //=include tools/RectangularSelectionTool.js +//=include tools/LassoSelectionTool.js //=include tools/MoveSelectionTool.js /** MODULES AND MENUS **/ diff --git a/js/tools/LassoSelectionTool.js b/js/tools/LassoSelectionTool.js index adc16aa..9d926db 100644 --- a/js/tools/LassoSelectionTool.js +++ b/js/tools/LassoSelectionTool.js @@ -1,6 +1,6 @@ class LassoSelectionTool extends SelectionTool { constructor (name, options, switchFunc, moveTool) { - + super(name, options, switchFunc, moveTool); } onStart(mousePos) { diff --git a/svg/lasso.svg b/svg/lasso.svg new file mode 100644 index 0000000..1e653da --- /dev/null +++ b/svg/lasso.svg @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/views/tools-menu.hbs b/views/tools-menu.hbs index 3d25c66..1b87fa7 100644 --- a/views/tools-menu.hbs +++ b/views/tools-menu.hbs @@ -48,9 +48,12 @@
    • +
  • + +
    • +
    • -
  • \ No newline at end of file