diff --git a/src/js/app.js b/src/js/app.js index 844f4bc..961ae2c 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -114,7 +114,7 @@ module.exports = new Vue({ full_version: "", ip: "<>", wifiName: "not connected", - macros:[{id:0,name:"Macrostest",color:'#434242',gcode:"test.ngc"}] + macros:[] }, state: { messages: [], diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug index 63eb16d..00c0220 100644 --- a/src/pug/templates/control-view.pug +++ b/src/pug/templates/control-view.pug @@ -209,6 +209,7 @@ script#control-view-template(type="text/x-template") .macros-div .macros-buttons(v-if="this.config.macros!=undefined") + p there is a active macro .submit-macros(v-if="isMacrosPresent()") a(href="#macros") Edit Macros .macros-buttons(v-if="this.config.macros==undefined") diff --git a/src/stylus/style.styl b/src/stylus/style.styl index 45bf081..a6fef1b 100644 --- a/src/stylus/style.styl +++ b/src/stylus/style.styl @@ -613,9 +613,11 @@ span.unit .macros-div height 50px - width 120px + width 85% margin 10px - + margin-left 50px + + .submit-macros height 50px width 140px @@ -1071,9 +1073,9 @@ tt.save padding-left 10px .input-container - height 40px + display flex + height 50px align-items center - vertical-align baseline p.title