diff options
| author | Sonja Galovic <galovicsonja@gmail.com> | 2022-04-26 21:15:24 +0200 |
|---|---|---|
| committer | Sonja Galovic <galovicsonja@gmail.com> | 2022-04-26 21:15:24 +0200 |
| commit | 2c22d31667a4a5be24224651a570b1086d2ded7b (patch) | |
| tree | 4e30cc22d12d97816ac17a540a00df89fcb58b57 /frontend/src/app/_elements/folder/folder.component.html | |
| parent | 31e3b846eda94de86e249956d96c54aaa92eb0c6 (diff) | |
| parent | 5857e1c71eda1ee6455d55ef9f8d1c10f75a8457 (diff) | |
Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign
# Conflicts:
# frontend/src/app/_elements/column-table/column-table.component.css
# frontend/src/app/_elements/column-table/column-table.component.ts
Diffstat (limited to 'frontend/src/app/_elements/folder/folder.component.html')
| -rw-r--r-- | frontend/src/app/_elements/folder/folder.component.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html index c3da30fc..95e99911 100644 --- a/frontend/src/app/_elements/folder/folder.component.html +++ b/frontend/src/app/_elements/folder/folder.component.html @@ -43,7 +43,8 @@ </a> </div> </div> - {{fileToDisplay ? fileToDisplay.name : 'No file selected.'}} {{selectedFileIndex}} {{hoveringOverFileIndex}} + <!-- {{fileToDisplay ? fileToDisplay.name : 'No file selected.'}} {{selectedFileIndex}} {{hoveringOverFileIndex}}--> + <app-form-dataset></app-form-dataset> </div> <div id="footer" [ngSwitch]="newFileSelected"> <button mat-button (click)="saveNewFile()" class="bottom-button text-offwhite rounded-bottom" *ngSwitchCase="true"> |