Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign

# Conflicts:
#	frontend/src/app/_elements/form-model/form-model.component.html

2 files changed, 39 insertions, 26 deletions

diff --git a/frontend/src/app/_elements/form-model/form-model.component.css b/frontend/src/app/_elements/form-model/form-model.component.css
index 9b55a814..11b6ef5e 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.css
+++ b/frontend/src/app/_elements/form-model/form-model.component.css
@@ -87,9 +87,18 @@ hr {
 }
 
 mat-slider {
-    width: 40%;
+    width: 50%;
 }
 
 .slider {
-    background-color: var(--ns-bg-dark-100);
+    background-color: transparent;
 }
+
+.center-center {
+    text-align: center;
+    margin-right: 10px;
+    padding-right: 10px;
+    padding-bottom: 15px;
+    font-size: 20px !important;
+    font-weight: 600;
+}
\ No newline at end of file
diff --git a/frontend/src/app/_elements/form-model/form-model.component.html b/frontend/src/app/_elements/form-model/form-model.component.html
index fa57ad46..0410fa65 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.html
+++ b/frontend/src/app/_elements/form-model/form-model.component.html
@@ -86,29 +86,35 @@
 
         </div>
     </div>
-    <div>
-        <div class="ns-row" style="margin-top: 10px;">
-            <div class="ns-col slider rounded" style="border:1px solid var(--ns-primary);margin-left: 10px;">
 
-                <div class="text-center pt-3 pb-0 mb-0"><b>{{testSetDistribution}}%</b> : <b>{{100-testSetDistribution}}%</b></div>
-                <div class="text-center pt-0 mt-0">Trening
-                    <mat-slider min="10" max="90" step="10" [(ngModel)]="testSetDistribution" (input)="updateTestSet($event)"></mat-slider>
-                    Test</div>
+    <!-- GRAF -->
 
-            </div>
-            <div class="ns-col slider rounded text-offwhite justify-content-center align-items-center" style="border:1px solid var(--ns-primary);margin-left: 10px;">
-                <mat-checkbox class="pt-4" color="accent">Nasumični redosled podataka</mat-checkbox>
-            </div>
+    <div class="m-2">
+        <div class="row">
+            <div class="col-sm-3 rounded" style="border:1px solid var(--ns-primary);margin-top: 10px;">
+                <div class="row slider rounded mb-3" style="margin-left: 10px;">
+
+                    <div class="text-center pt-3 pb-0 mb-0"><b>{{testSetDistribution}}%</b> : <b>{{100-testSetDistribution}}%</b></div>
+                    <div class="text-center pt-0 mt-0">Trening
+                        <mat-slider min="10" max="90" step="10" [(ngModel)]="testSetDistribution" (input)="updateTestSet($event)"></mat-slider>
+                        Test</div>
+
+                </div>
+                <div class="row slider rounded text-offwhite justify-content-center align-items-center" style="margin-left: 10px;">
+                    <mat-checkbox class="pt-4 mb-3" color="accent">Nasumični redosled podataka</mat-checkbox>
+                </div>
 
 
+            </div>
+
+            <div class="col-sm-9">
+                <app-graph [model]="newModel"></app-graph>
+            </div>
         </div>
     </div>
 
-    <!--kraj unosa parametara-->
-    <hr>
-    <div class="m-2">
-        <app-graph [model]="newModel"></app-graph>
-    </div>
+    <!-- SVI LAYERI -->
+
     <div class="ns-row">
 
         <div class="ns-col" id="layers-control">
@@ -163,23 +169,21 @@
                 </mat-select>
             </mat-form-field>
         </div>
-
-
     </div>
 
-    <!--kraj selectall**********************************************************************************-->
-    <div id="layers">
+    <!-- LAYERI -->
 
+    <div id="layers">
         <div class="layer" *ngFor="let item of newModel.layers; let i=index">
 
 
             <mat-form-field appearance="fill" class="mat-fix">
                 <mat-label>Aktivacija</mat-label>
                 <button matPrefix class="btn-clear center-center text-offwhite">        
-                <div>
-                    #{{i+1}}
-                </div>
-            </button>
+                    <div>
+                        #{{i+1}}
+                    </div>
+                </button>
                 <mat-select [(ngModel)]="newModel.layers[i].activationFunction">
                     <mat-option *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)" [value]="option">
                         {{ optionName }}