From 67e332cd88133d2b3dde4c0463f9ee31686dea73 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Mon, 10 Jan 2022 21:18:45 -0800 Subject: [PATCH] Remove less --- packages/mindplot/package.json | 2 -- .../css/{compatibility.less => compatibility.css} | 1 - .../map-render/css/{editor.less => editor.css} | 6 +++--- .../map-render/css/{embedded.less => embedded.css} | 2 +- .../map-render/css/{header.less => header.css} | 6 ++---- .../map-render/css/{toolbar.less => toolbar.css} | 11 +---------- .../map-render/css/{viewmode.less => viewmode.css} | 6 +++++- .../mindplot/test/playground/map-render/js/editor.js | 2 +- .../test/playground/map-render/js/embedded.js | 2 +- .../test/playground/map-render/js/viewmode.js | 2 +- packages/mindplot/webpack.playground.js | 3 +-- 11 files changed, 16 insertions(+), 27 deletions(-) rename packages/mindplot/test/playground/map-render/css/{compatibility.less => compatibility.css} (96%) rename packages/mindplot/test/playground/map-render/css/{editor.less => editor.css} (97%) rename packages/mindplot/test/playground/map-render/css/{embedded.less => embedded.css} (98%) rename packages/mindplot/test/playground/map-render/css/{header.less => header.css} (96%) rename packages/mindplot/test/playground/map-render/css/{toolbar.less => toolbar.css} (84%) rename packages/mindplot/test/playground/map-render/css/{viewmode.less => viewmode.css} (87%) diff --git a/packages/mindplot/package.json b/packages/mindplot/package.json index 28b94e50..165af021 100644 --- a/packages/mindplot/package.json +++ b/packages/mindplot/package.json @@ -62,8 +62,6 @@ "html-webpack-plugin": "^5.3.2", "jest-diff": "^27.4.2", "jest-webpack": "^0.5.1", - "less": "^4.1.2", - "less-loader": "^10.2.0", "mocha": "^9.1.3", "nodemon": "^2.0.12", "start-server-and-test": "^1.14.0", diff --git a/packages/mindplot/test/playground/map-render/css/compatibility.less b/packages/mindplot/test/playground/map-render/css/compatibility.css similarity index 96% rename from packages/mindplot/test/playground/map-render/css/compatibility.less rename to packages/mindplot/test/playground/map-render/css/compatibility.css index 37bf4d52..e237690a 100644 --- a/packages/mindplot/test/playground/map-render/css/compatibility.less +++ b/packages/mindplot/test/playground/map-render/css/compatibility.css @@ -132,7 +132,6 @@ body * { } body { - // font: normal 80% "Helvetica Neue",Helvetica,Arial,sans-serif; background-color: #fff; } diff --git a/packages/mindplot/test/playground/map-render/css/editor.less b/packages/mindplot/test/playground/map-render/css/editor.css similarity index 97% rename from packages/mindplot/test/playground/map-render/css/editor.less rename to packages/mindplot/test/playground/map-render/css/editor.css index 83a0cda3..adc855bd 100644 --- a/packages/mindplot/test/playground/map-render/css/editor.less +++ b/packages/mindplot/test/playground/map-render/css/editor.css @@ -1,9 +1,9 @@ -@import "compatibility.less"; +@import "compatibility.css"; /********************************************************************************/ /* Header & Toolbar Styles */ /********************************************************************************/ -@import "header.less"; +@import "header.css"; @import "../bootstrap/css/bootstrap.min.css"; body { @@ -18,7 +18,7 @@ body { div#mindplot { position: relative; - top: @header-toolbar-height; + top: 50px; left: 0; width: 100%; height: 100%; diff --git a/packages/mindplot/test/playground/map-render/css/embedded.less b/packages/mindplot/test/playground/map-render/css/embedded.css similarity index 98% rename from packages/mindplot/test/playground/map-render/css/embedded.less rename to packages/mindplot/test/playground/map-render/css/embedded.css index 7a1f0bae..0be22f83 100644 --- a/packages/mindplot/test/playground/map-render/css/embedded.less +++ b/packages/mindplot/test/playground/map-render/css/embedded.css @@ -1,4 +1,4 @@ -@import "editor.less"; +@import "editor.css"; /* Overwrite some styles */ body { diff --git a/packages/mindplot/test/playground/map-render/css/header.less b/packages/mindplot/test/playground/map-render/css/header.css similarity index 96% rename from packages/mindplot/test/playground/map-render/css/header.less rename to packages/mindplot/test/playground/map-render/css/header.css index 53188968..692b914b 100644 --- a/packages/mindplot/test/playground/map-render/css/header.less +++ b/packages/mindplot/test/playground/map-render/css/header.css @@ -1,4 +1,4 @@ -@header-toolbar-height : 50px; +@import "toolbar.css"; div#header { width: 100%; @@ -77,6 +77,4 @@ div#toolbarRight { .actionButton:hover { transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; -} - -@import "toolbar.less"; +} \ No newline at end of file diff --git a/packages/mindplot/test/playground/map-render/css/toolbar.less b/packages/mindplot/test/playground/map-render/css/toolbar.css similarity index 84% rename from packages/mindplot/test/playground/map-render/css/toolbar.less rename to packages/mindplot/test/playground/map-render/css/toolbar.css index 12e2d5ee..d956625e 100644 --- a/packages/mindplot/test/playground/map-render/css/toolbar.less +++ b/packages/mindplot/test/playground/map-render/css/toolbar.css @@ -3,13 +3,12 @@ div#toolbar { height: 50px; box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.1); background-color: #fff; - // TODO: make toolbar responsive min-width: 900px; overflow: hidden; } div#toolbar .buttonContainer { - height: @header-toolbar-height; + height: 50px; padding-top: 8px; padding-right: 10px; padding-left: 10px; @@ -54,17 +53,14 @@ div#toolbar .buttonOn:hover { div#toolbar .buttonOn:hover { cursor: pointer; opacity: 1; - // background: url(../images/btn-bg-hover.png) no-repeat center top; } div#toolbar .buttonOn { opacity: 0.8; - // background: url(../images/btn-bg-normal.png) no-repeat center top; } div#toolbar .buttonOff { opacity: 0.4; - // background: url(../images/btn-bg-normal.png) no-repeat center top; } div#exportAnchor { @@ -92,24 +88,19 @@ div#toolbar .buttonExtOn:hover { div#toolbar .buttonExtOn:hover { opacity: 1; - // background: url(../images/btne-bg-hover.png) no-repeat center top; - } div#toolbar .buttonExtActive { opacity: 1; - // background: url(../images/btne-bg-selected.png) no-repeat center top; } div#toolbar .buttonExtOn { opacity: 0.8; cursor: pointer - // background: url(../images/btne-bg-normal.png) no-repeat center top; } div#toolbar .buttonExtOff { opacity: 0.4; - // background: url(../images/btne-bg-normal.png) no-repeat center top; } div#exportAnchor { diff --git a/packages/mindplot/test/playground/map-render/css/viewmode.less b/packages/mindplot/test/playground/map-render/css/viewmode.css similarity index 87% rename from packages/mindplot/test/playground/map-render/css/viewmode.less rename to packages/mindplot/test/playground/map-render/css/viewmode.css index 3e1905a5..795082bc 100644 --- a/packages/mindplot/test/playground/map-render/css/viewmode.less +++ b/packages/mindplot/test/playground/map-render/css/viewmode.css @@ -1,4 +1,4 @@ -@import "editor.less"; +@import "editor.css"; /* Overwrite some styles */ body { @@ -27,4 +27,8 @@ div#footer-logo { #floating-panel { bottom: 80px; +} + +div#mindplot { + top:0; } \ No newline at end of file diff --git a/packages/mindplot/test/playground/map-render/js/editor.js b/packages/mindplot/test/playground/map-render/js/editor.js index 93a38615..6e563d63 100644 --- a/packages/mindplot/test/playground/map-render/js/editor.js +++ b/packages/mindplot/test/playground/map-render/js/editor.js @@ -1,4 +1,4 @@ -import '../css/editor.less'; +import '../css/editor.css'; import { buildDesigner } from '../../../../src/components/DesignerBuilder'; import { PersistenceManager, LocalStorageManager } from '../../../../src'; import LoadingModal from '../../../../src/components/widget/LoadingModal'; diff --git a/packages/mindplot/test/playground/map-render/js/embedded.js b/packages/mindplot/test/playground/map-render/js/embedded.js index 8d32e68c..ef522fa9 100644 --- a/packages/mindplot/test/playground/map-render/js/embedded.js +++ b/packages/mindplot/test/playground/map-render/js/embedded.js @@ -1,4 +1,4 @@ -import '../css/embedded.less'; +import '../css/embedded.css'; import { buildDesigner } from '../../../../src/components/DesignerBuilder'; import { PersistenceManager, LocalStorageManager } from '../../../../src'; import DesignerOptionsBuilder from '../../../../src/components/DesignerOptionsBuilder'; diff --git a/packages/mindplot/test/playground/map-render/js/viewmode.js b/packages/mindplot/test/playground/map-render/js/viewmode.js index 57bdea35..802bf6a0 100644 --- a/packages/mindplot/test/playground/map-render/js/viewmode.js +++ b/packages/mindplot/test/playground/map-render/js/viewmode.js @@ -1,4 +1,4 @@ -import '../css/viewmode.less'; +import '../css/viewmode.css'; import { buildDesigner } from '../../../../src/components/DesignerBuilder'; import { PersistenceManager, LocalStorageManager } from '../../../../src'; import DesignerOptionsBuilder from '../../../../src/components/DesignerOptionsBuilder'; diff --git a/packages/mindplot/webpack.playground.js b/packages/mindplot/webpack.playground.js index d644c318..76961c35 100644 --- a/packages/mindplot/webpack.playground.js +++ b/packages/mindplot/webpack.playground.js @@ -21,12 +21,11 @@ const playgroundConfig = { module: { rules: [ { - test: /\.less$/i, + test: /\.css$/i, use: [ // compiles Less to CSS 'style-loader', 'css-loader?url=false', - 'less-loader', ], }, ],