diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug index 00c0220..7e2431c 100644 --- a/src/pug/templates/control-view.pug +++ b/src/pug/templates/control-view.pug @@ -210,8 +210,6 @@ 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") p there is no active macros diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug index fbf6554..ef2f41a 100644 --- a/src/pug/templates/macros.pug +++ b/src/pug/templates/macros.pug @@ -15,8 +15,8 @@ script#macros-template(type="text/x-template") :disabled="!is_ready",style="height:40px;width:130px;font-weight:normal;border-radius:5px") Upload br button.submit-macros(title="Save Macros",@click="saveMacros", - style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad") Save Macros + style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;padding-top:5px") Save Macros button.pure-button(title="Print config.", @click="printConfig", - style="height:50px;width:120px;font-weight:normal") print Config + style="height:50px;width:120px;font-weight:normal;padding-top:5px") print Config gcode-viewer diff --git a/src/stylus/style.styl b/src/stylus/style.styl index a6fef1b..68dab5e 100644 --- a/src/stylus/style.styl +++ b/src/stylus/style.styl @@ -1057,9 +1057,6 @@ tt.save #macros padding 30px - div - display inline-block - .macros-form padding-left 50px padding-top 50px @@ -1068,9 +1065,12 @@ tt.save width 300px height 40px border-radius 8px + border-top-right-radius 8px + border-bottom-right-radius 8px border-width 1px border-color #434242 padding-left 10px + margin-left 2px .input-container display flex @@ -1085,10 +1085,11 @@ tt.save input.input-color - height 40px - width 40px + height 45px + width 45px border 1px solid #fdfdfd - border-radius 1px + border-top-left-radius 8px + border-bottom-left-radius 8px button border-radius 8px