Merge branch 'unstable' of https://github.com/iVis-at-Bilkent/newt in…

…to unstable
iVis-at-Bilkent · Jun 28, 2024 · e46bb7e · e46bb7e
2 parents 32f7218 + 8bc320b
commit e46bb7e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,6 @@
 
 node_modules/
 
-package-lock.js
+package-lock.json
 
-app/bundle.js
+app/bundle.js
diff --git a/app/css/chise.css b/app/css/chise.css
@@ -716,10 +716,14 @@ hr.inspector-divider {
     padding-left: 5px !important;
     padding-right: 5px !important;
     border-radius: 8px 8px 0 0 !important;
+    border: 1px solid #aaaaaa;
+    box-shadow: 1px -1px 2px #999999;
 }
 
 .chise-tab.active a {
     background: #eaeaea !important;
+    border: 1px solid #434343;
+    box-shadow: 1px -1px 2px 0 #303030 !important;
 }
 
 .chise-tab:hover a {
@@ -736,24 +740,6 @@ hr.inspector-divider {
     box-shadow: 1px 1px 1px #b9b9b9;
 }
 
-.chise-network-tab.active {
-    border: 1px solid #434343;
-    box-shadow: 1px 1px 2px #434343;
-}
-
-.map-tab-type {
-    position: absolute;
-    background-color: #555;
-    margin-top: -2px;
-    padding-left: 4px;
-    padding-right: 4px;
-    border: 0px solid #555;
-    border-radius: 5px;
-    right: 3px;
-    font-size: 9px;
-    color: white;
-}
-
 .chise-network-tab a {
     color: #555;
     padding-top: 10px !important;
@@ -771,8 +757,26 @@ hr.inspector-divider {
     border: 0px !important;
 }
 
+.chise-network-tab.active {
+    border: 1px solid #434343;
+    box-shadow: 1px 1px 2px #434343;
+}
+
 .chise-network-tab.active, .chise-network-tab.active a {
     background: white !important;
+
+}
+.map-tab-type {
+    position: absolute;
+    background-color: #555;
+    margin-top: -2px;
+    padding-left: 4px;
+    padding-right: 4px;
+    border: 0px solid #555;
+    border-radius: 5px;
+    right: 3px;
+    font-size: 9px;
+    color: white;
 }
 
 .close:hover,

diff --git a/app/js/backbone-views.js b/app/js/backbone-views.js
@@ -727,7 +727,7 @@ var MapTabGeneralPanel = GeneralPropertiesParentView.extend({
       var callback = function () {
         $("#map-type").val(chiseInstance.getMapType());
         var activeChiseId = appUtilities.networkIdsStack[appUtilities.networkIdsStack.length-1];
-        $('#' + appUtilities.getMapTypeDivId(activeChiseId)).text(appUtilities.getDisplayMapName(chiseInstance.getMapType()));
+        $('#' + appUtilities.getMapTypeDivId(activeChiseId)).text(appUtilities.getTabLabelName(chiseInstance.getMapType()));
       };
       // use active cy instance
       var cy = appUtilities.getActiveCy();