From 7cc1a4a023e706769886506e55a393d4ce43feac Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Tue, 2 Jan 2024 15:22:16 +0530 Subject: [PATCH] removed all except id and name in config_file --- src/resources/config-template.json | 43 +++++------------------------- src/stylus/style.styl | 14 +++++++--- 2 files changed, 17 insertions(+), 40 deletions(-) diff --git a/src/resources/config-template.json b/src/resources/config-template.json index 4fb6480..de69806 100644 --- a/src/resources/config-template.json +++ b/src/resources/config-template.json @@ -590,58 +590,29 @@ "default":[ { "id" : 1, - "name" : "", - "color":"#d9d9d9", - "gcode":"" + "name": "Macros 1" }, { "id" : 2, - "name" : "", - "color":"#d9d9d9", - "gcode":"" + "name": "Macros 2" }, { "id" : 3, - "name" : "", - "color":"#d9d9d9", - "gcode":"" + "name": "Macros 3" }, { "id" : 4, - "name" : "", - "color":"#d9d9d9", - "gcode":"" + "name": "Macros 4" }, { "id" : 5, - "name" : "", - "color":"#d9d9d9", - "gcode":"" + "name": "Macros 5" }, { "id" : 6, - "name" : "", - "color":"#d9d9d9", - "gcode":"" + "name": "Macros 6" } - ], - "template": { - "id": { - "type": "int" - }, - "name": { - "type": "text", - "default": "" - }, - "color": { - "type": "text", - "default":"" - }, - "gcode": { - "type": "text", - "default":"" - } - } + ] }, "admin": { diff --git a/src/stylus/style.styl b/src/stylus/style.styl index a7dd34f..ecd1037 100644 --- a/src/stylus/style.styl +++ b/src/stylus/style.styl @@ -621,14 +621,20 @@ span.unit margin 10px margin-left 50px - + .macros + width 90% + + .tabs + margin-top 5px + .submit-macros height 50px width 140px font-weight normal background-color #e6e6e6 color #fff - border 0 + border 0 + .path-viewer @@ -1059,8 +1065,8 @@ tt.save width 95% .macros-form - padding-left 50px - padding-top 50px + padding 30px + input.input-name width 300px