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

# Conflicts:
#	backend/api/api/appsettings.json

1 files changed, 0 insertions, 42 deletions

diff --git a/frontend/src/app/_pages/add-model/add-model.component.css b/frontend/src/app/_pages/add-model/add-model.component.css
deleted file mode 100644
index 7f05af0f..00000000
--- a/frontend/src/app/_pages/add-model/add-model.component.css
+++ /dev/null
@@ -1,42 +0,0 @@
-#header {
-    background-color: #003459;
-    padding-top: 30px;
-    padding-bottom: 20px;
-}
-#header h1 {
-    font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
-    text-align: center;
-    color: white;
-}
-
-#container {
-    border-radius: 8px;
-}
-
-#wrapper {
-    color: #003459;
-}
-
-.btnType1 {
-    background-color: #003459;
-    color: white;
-}
-.btnType2 {
-    background-color: white;
-    color: #003459;
-    border-color: #003459;
-}
-.selectedDatasetClass {
-    /*border-color: 2px solid #003459;*/
-    background-color: lightblue;
-}
-ul li:hover {
-    background-color: lightblue;
-}
-
-#divInputs {
-    margin-left: 20px;
-}
-#divOutputs {
-    margin-left: 20px;
-}