chore: fix app for ARM64 architecture (#2442)

* chore: fix app for ARM64 architecture * fix: correct css selectors * fix: adjust css nesting * chore: fix auto-formatting * fix: adjust css selector nesting
dhis2 · Feb 16, 2023 · e3842eb · e3842eb
1 parent a14584e
commit e3842eb
Show file tree

Hide file tree

Showing 4 changed files with 337 additions and 448 deletions.
diff --git a/package.json b/package.json
@@ -64,8 +64,8 @@
     "loglevel": "^1.4.0",
     "moment": "^2.16.0",
     "node-fetch": "^1.6.3",
-    "node-pre-gyp": "^0.6.30",
-    "node-sass": "^4.13.1",
+    "node-pre-gyp": "^0.17.0",
+    "node-sass": "npm:sass@^1.58.0",
     "precommit-hook": "^3.0.0",
     "prettier": "^1.13.7",
     "recompose": "^0.23.1",

diff --git a/scss/EditModel/EditDataEntryForm.scss b/scss/EditModel/EditDataEntryForm.scss
@@ -1,4 +1,3 @@
-
 .paletteContainer {
   position: fixed;
   right: 16px;
@@ -115,24 +114,21 @@
   }
 }
 
-.item {
-  &.active {
-    a {
-      cursor: pointer;
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-  &.inactive {
-    a {
-      color: inherit;
-      opacity: 0.5;
-      cursor: default;
+.item.active,
+.expand {
+  a {
+    cursor: pointer;
+
+    &:hover {
+      text-decoration: underline;
     }
   }
 }
 
-.expand {
-  @extend .item.active;
+.item.inactive {
+  a {
+    color: inherit;
+    opacity: 0.5;
+    cursor: default;
+  }
 }
diff --git a/scss/EditModel/EditDataEntryFormProgramStage.scss b/scss/EditModel/EditDataEntryFormProgramStage.scss
@@ -109,25 +109,22 @@
     }
   }
 
-  .item {
-    &.active {
-      a {
-        cursor: pointer;
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-    }
-    &.inactive {
-      a {
-        color: inherit;
-        opacity: 0.5;
-        cursor: default;
+  .item.active,
+  .expand {
+    a {
+      cursor: pointer;
+
+      &:hover {
+        text-decoration: underline;
       }
     }
   }
 
-  .expand {
-    @extend .item.active;
+  .item.inactive {
+    a {
+      color: inherit;
+      opacity: 0.5;
+      cursor: default;
+    }
   }
 }