aboutsummaryrefslogtreecommitdiff
path: root/frontend/src/app
diff options
context:
space:
mode:
authorOgnjen Cirkovic <ciraboxkg@gmail.com>2022-05-25 02:04:59 +0200
committerOgnjen Cirkovic <ciraboxkg@gmail.com>2022-05-25 02:04:59 +0200
commitcc7a29e73371b4b8546a43e3f9115507557a5259 (patch)
tree33a11bdc1b16b8e547b04f7cf338e72088aad81f /frontend/src/app
parent31f13dc110c636faf6899ce8e58888bb86894a0d (diff)
Dugmici za delete i download spusteni ispod forme. Dodat background-color da bi se lakse uocili. Napravljena class-a file-bootom-buttons-helper da ih pozicionira.
Diffstat (limited to 'frontend/src/app')
-rw-r--r--frontend/src/app/_elements/folder/folder.component.css11
-rw-r--r--frontend/src/app/_elements/folder/folder.component.html27
2 files changed, 24 insertions, 14 deletions
diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css
index 682fc645..810ad05d 100644
--- a/frontend/src/app/_elements/folder/folder.component.css
+++ b/frontend/src/app/_elements/folder/folder.component.css
@@ -184,9 +184,13 @@
}
.file-bottom-buttons {
- position: absolute;
- bottom: 5px;
- right: 4%;
+ position: relative;
+ position: relative;
+ top:-36px
+
+}
+.file-bottom-buttons-helper{
+ position: relative;
display: flex;
flex-direction: row-reverse;
}
@@ -196,6 +200,7 @@
color: var(--offwhite);
border-radius: 4px;
border: 1px solid var(--ns-primary);
+ background-color: var(--ns-bg-dark-50);
margin: 5px;
padding: 5px;
cursor: pointer;
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index 52f19753..afb6085d 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -58,17 +58,6 @@
<!--{{fileToDisplay ? fileToDisplay.name : 'No file selected.'}} {{selectedFileIndex}} {{hoveringOverFileIndex}}-->
<div class="folder-inside bg-blur">
<div class="file-content" [ngClass]="{'form-hidden' : listView}">
- <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
- <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)">
- <mat-icon matTooltip="Obriši" matTooltipPosition="right">delete</mat-icon>
- </button>
- <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(this.selectedFile,$event)" style="display: inline-block;">
- <mat-icon matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon>
- </button>
- <!-- <button class="btn-clear file-button">
- <mat-icon>zoom_out_map</mat-icon>
- </button> -->
- </div>
<app-form-model [ngClass]="{'form-hidden': type != FolderType.Model}" [forExperiment]="forExperiment" [hideProblemType]="(forExperiment ? true : false)" [forProblemType]="(forExperiment ? forExperiment.type : ProblemType.Regression)" (editEvent)="onFileChange()"></app-form-model>
<app-form-dataset [ngClass]="{'form-hidden': type != FolderType.Dataset}" [forExperiment]="forExperiment" (editEvent)="onFileChange()"></app-form-dataset>
</div>
@@ -160,4 +149,20 @@
</button>
</ng-container>
</div>
+ <div [ngSwitch]="newFileSelected" *ngIf="!listView">
+ <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
+ <div class="file-bottom-buttons-helper">
+ <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)">
+ <mat-icon matTooltip="Obriši" matTooltipPosition="right">delete</mat-icon>
+ </button>
+ <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(this.selectedFile,$event)" style="display: inline-block;">
+ <mat-icon matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon>
+ </button>
+ </div>
+ <!-- <button class="btn-clear file-button">
+ <mat-icon>zoom_out_map</mat-icon>
+ </button> -->
+ </div>
+ </div>
+
</div> \ No newline at end of file