test
This commit is contained in:
@@ -203,7 +203,7 @@ module.exports = {
|
||||
return Math.min(1, p);
|
||||
},
|
||||
isMacrosPresent: function(){
|
||||
return (this.config.macros!=undefined)
|
||||
return this.config.macros != undefined;
|
||||
// if(this.config.macros!=undefined){
|
||||
// console.log("isMacrosPresent",this.config.macros!=undefined);
|
||||
// console.log(this.config.macros.length!=0);
|
||||
|
||||
@@ -3,6 +3,7 @@ script#macros-template(type="text/x-template")
|
||||
h1 Macros Configuration
|
||||
.macros-form
|
||||
p.title Enter Macros Name
|
||||
.input-container
|
||||
input.input-color(type="color",id="macros-color",value="#ffffff")
|
||||
input.input-name(type="text",id="macros-name")
|
||||
p.title Select/Upload G-Code
|
||||
@@ -16,6 +17,6 @@ script#macros-template(type="text/x-template")
|
||||
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
|
||||
button.pure-button(title="Print config.", @click="printConfig",
|
||||
style="height:50px;width:100px;font-weight:normal") print Config
|
||||
style="height:50px;width:120px;font-weight:normal") print Config
|
||||
|
||||
gcode-viewer
|
||||
|
||||
@@ -612,9 +612,9 @@ span.unit
|
||||
vertical-align middle
|
||||
|
||||
.macros-div
|
||||
height 500px
|
||||
width 500px
|
||||
margin 100px
|
||||
height 50px
|
||||
width 100px
|
||||
margin 10px
|
||||
|
||||
.submit-macros
|
||||
height 50px
|
||||
@@ -1067,6 +1067,11 @@ tt.save
|
||||
border-color #434242
|
||||
padding-left 10px
|
||||
|
||||
.input-container
|
||||
height 40px
|
||||
align-items center
|
||||
|
||||
|
||||
p.title
|
||||
font-size 20px
|
||||
padding-top 20px
|
||||
@@ -1077,12 +1082,12 @@ tt.save
|
||||
height 40px
|
||||
width 40px
|
||||
border 1px solid #fdfdfd
|
||||
border-radius 2px
|
||||
border-radius 1px
|
||||
|
||||
button
|
||||
border-radius 8px
|
||||
border-width 1px
|
||||
border-color #434242
|
||||
border 0
|
||||
|
||||
.input-field
|
||||
margin-top 10px
|
||||
|
||||
Reference in New Issue
Block a user