Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into featue/Axes

Browse Source
This commit is contained in:
Samuele Locatelli
2020-09-24 08:47:49 +02:00
parent 617bb783d2 26f225fabc
commit bc7116cf5d
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/src/modules/base-components/cards/card-folder-path.vue
+1 -1
View File
@@ -59,7 +59,7 @@
width: 30px;
text-align: CENTER;
padding: 8px;
border: 0.5px solid #ddd;
/* border: 0.5px solid #ddd; */
border-radius: 3px;
margin: 0 2px;
box-sizing: border-box;
Thermo.Active/wwwroot/src/modules/base-components/modal-load-program.vue
-14
View File
@@ -37,20 +37,6 @@
:disabled="!isCnReady()"
@click="navigateTo('\\\\','\\\\', false, 1,0)"
></card-folder-path>-->
<card-folder-path
name="testfolder"
:iconType="'FOLDER'"
:selected="'\\\\' == currentDrive"
:disabled="!isCnReady()"
@click="navigateTo('\\\\','\\\\', false, 1,0)"
></card-folder-path>
<card-folder-path
name="testfile"
:iconType="'FILE'"
:selected="'\\\\' == currentDrive"
:disabled="!isCnReady()"
@click="navigateTo('\\\\','\\\\', false, 1,0)"
></card-folder-path>
<!-- <hr /> -->
<!--
<card-folder-path