diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug index 654d9b6..255692f 100644 --- a/src/pug/templates/control-view.pug +++ b/src/pug/templates/control-view.pug @@ -14,6 +14,7 @@ script#control-view-template(type="text/x-template") h3(slot="header") GCode Not Set div(slot="body") p Configure the GCode for the selected macro to use it + p Configure the GCode for the selected macro to use it div(slot="footer") button.pure-button(@click="showNoGcodeMessage=false") OK diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug index 51e66d0..14d0e45 100644 --- a/src/pug/templates/macros.pug +++ b/src/pug/templates/macros.pug @@ -77,6 +77,7 @@ script#macros-template(type="text/x-template") p u Note: | Select a Macro to edit its settings. + | Select a Macro to edit its settings. .tabs div(style="display:flex;align-items:center;margin-left:30px") @@ -87,6 +88,7 @@ script#macros-template(type="text/x-template") option( selected='' value='0') Select a Macro option(v-for="(index,file) in macros_list", :value="index+1") {{file}} .macros-form + p.title Macro Name p.title Macro Name .input-container input.input-color(type="color",id="macros-color",value="#ffffff",@change="editedColor") @@ -95,6 +97,7 @@ script#macros-template(type="text/x-template") input.input-alert(type="checkbox",id="macros-alert" v-model="isChecked",@change="editedAlert") label Would you like an alert when running this macro? p.title Macro G-Code + p.title Macro G-Code .flex-row-container select(id="gcode-select",title="Select previously uploaded GCode programs.",selected v-model="fileName",@change="load", :disabled="!is_ready", diff --git a/src/stylus/style.styl b/src/stylus/style.styl index c83ccca..2435738 100644 --- a/src/stylus/style.styl +++ b/src/stylus/style.styl @@ -667,6 +667,7 @@ span.unit .new-gcode height 13rem width 23rem + resize none border-radius 10px padding 20px resize none