From 6d589ec2683142fd42242e12523606000fd56a32 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Tue, 2 Jan 2024 21:46:12 +0530 Subject: [PATCH] UI changes --- src/js/control-view.js | 1 - src/pug/templates/macros.pug | 18 ++++++------------ src/stylus/style.styl | 3 ++- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/js/control-view.js b/src/js/control-view.js index 9ec186e..ab701f6 100644 --- a/src/js/control-view.js +++ b/src/js/control-view.js @@ -510,7 +510,6 @@ module.exports = { } try{ this.load(); - console.log("Loaded file"); this.start_pause(); }catch(error){ console.warn("Error running program: ",error); diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug index 56255f8..80facd2 100644 --- a/src/pug/templates/macros.pug +++ b/src/pug/templates/macros.pug @@ -39,8 +39,7 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - button.submit-macros(title="Save Macros",@click="saveMacros(0)", - style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros + button.submit-macros(title="Save Macros",@click="saveMacros(0)") Save Macros section#content2.tab-content .macros-form @@ -61,8 +60,7 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - button.submit-macros(title="Save Macros",@click="saveMacros(1)", - style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros + button.submit-macros(title="Save Macros",@click="saveMacros(1)") Save Macros section#content3.tab-content .macros-form @@ -83,8 +81,7 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - button.submit-macros(title="Save Macros",@click="saveMacros(2)", - style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros + button.submit-macros(title="Save Macros",@click="saveMacros(2)") Save Macros section#content4.tab-content .macros-form @@ -105,8 +102,7 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - button.submit-macros(title="Save Macros",@click="saveMacros(3)", - style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros + button.submit-macros(title="Save Macros",@click="saveMacros(3)") Save Macros section#content5.tab-content .macros-form @@ -127,8 +123,7 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - button.submit-macros(title="Save Macros",@click="saveMacros(4)", - style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros + button.submit-macros(title="Save Macros",@click="saveMacros(4)") Save Macros section#content6.tab-content .macros-form @@ -149,8 +144,7 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - button.submit-macros(title="Save Macros",@click="saveMacros(5)", - style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros + button.submit-macros(title="Save Macros",@click="saveMacros(5)") Save Macros //- button.pure-button(title="Print config.", @click="printConfig", //- style="height:50px;width:120px;font-weight:normal;padding-top:5px") print Config diff --git a/src/stylus/style.styl b/src/stylus/style.styl index 8ba13bc..35c3208 100644 --- a/src/stylus/style.styl +++ b/src/stylus/style.styl @@ -637,8 +637,9 @@ span.unit .submit-macros height 50px width 140px + margin-top 30px font-weight normal - background-color #e6e6e6 + background-color #add1ad color #fff border 0