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/_pages | |
| 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/_pages')
| -rw-r--r-- | frontend/src/app/_pages/experiment/experiment.component.html | 4 | ||||
| -rw-r--r-- | frontend/src/app/_pages/test/test.component.html | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index c988a50a..6200270c 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -25,7 +25,9 @@ <app-folder (okPressed)="goToPage(1)"></app-folder> </div> <div #steps id="step_2" class="step-content"> - <div class="text-offwhite" style="height: 100px;width: 100px;background-color: red;top:50%;left: 50%;position: absolute;">Insert odabir kolona</div> + <div class="mx-3" style="overflow-x: auto;"> + <app-column-table></app-column-table> + </div> </div> <div #steps id="step_3" class="step-content"> diff --git a/frontend/src/app/_pages/test/test.component.html b/frontend/src/app/_pages/test/test.component.html index 625739f8..ec6ef0d6 100644 --- a/frontend/src/app/_pages/test/test.component.html +++ b/frontend/src/app/_pages/test/test.component.html @@ -1,3 +1,4 @@ <app-pie-chart></app-pie-chart> <app-doughnut-chart></app-doughnut-chart> -<app-barchart></app-barchart>
\ No newline at end of file +<app-barchart></app-barchart> +<app-box-plot></app-box-plot>
\ No newline at end of file |