Finish implementing EntityUpload except for warnings (#961)

As part of this, I converted Modal to the Composition API.
getodk · Apr 19, 2024 · 095baec · 095baec
1 parent 0da5498
commit 095baec
Show file tree

Hide file tree

Showing 42 changed files with 2,123 additions and 463 deletions.
diff --git a/icomoon.json b/icomoon.json
@@ -1699,14 +1699,14 @@
       "attrs": [],
       "properties": {
         "name": "info-circle",
-        "id": 89,
+        "id": 61,
         "order": 5,
         "prevSize": 28,
         "code": 61530
       },
-      "setIdx": 1,
-      "setId": 3,
-      "iconIdx": 89
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 61
     },
     {
       "icon": {
@@ -1726,14 +1726,14 @@
       "attrs": [],
       "properties": {
         "name": "exclamation-circle",
-        "id": 101,
+        "id": 62,
         "order": 4,
         "prevSize": 28,
         "code": 61546
       },
-      "setIdx": 1,
-      "setId": 3,
-      "iconIdx": 101
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 62
     },
     {
       "icon": {
@@ -1753,14 +1753,14 @@
       "attrs": [],
       "properties": {
         "name": "random",
-        "id": 110,
+        "id": 63,
         "order": 2,
         "prevSize": 28,
         "code": 61556
       },
-      "setIdx": 1,
-      "setId": 3,
-      "iconIdx": 110
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 63
     },
     {
       "icon": {
@@ -1780,14 +1780,95 @@
       "attrs": [],
       "properties": {
         "name": "external-link-square",
-        "id": 298,
+        "id": 64,
         "order": 6,
         "prevSize": 28,
         "code": 61772
       },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 64
+    },
+    {
+      "icon": {
+        "paths": [
+          "M358.286 786.286c0 4.571-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8.571 5.714 13.143s-2.286 9.714-5.714 13.143l-224.571 224.571 224.571 224.571c3.429 3.429 5.714 8.571 5.714 13.143zM577.714 786.286c0 4.571-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8.571 5.714 13.143s-2.286 9.714-5.714 13.143l-224.571 224.571 224.571 224.571c3.429 3.429 5.714 8.571 5.714 13.143z"
+        ],
+        "width": 603.4285714285714,
+        "attrs": [],
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "tags": [
+          "angle-double-left"
+        ],
+        "defaultCode": 61696,
+        "grid": 14
+      },
+      "attrs": [],
+      "properties": {
+        "name": "angle-double-left",
+        "id": 229,
+        "order": 3,
+        "prevSize": 28,
+        "code": 61696
+      },
+      "setIdx": 1,
+      "setId": 3,
+      "iconIdx": 229
+    },
+    {
+      "icon": {
+        "paths": [
+          "M340 548.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l224.571-224.571-224.571-224.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143zM559.429 548.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l224.571-224.571-224.571-224.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143z"
+        ],
+        "width": 566.8571428571428,
+        "attrs": [],
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "tags": [
+          "angle-double-right"
+        ],
+        "defaultCode": 61697,
+        "grid": 14
+      },
+      "attrs": [],
+      "properties": {
+        "name": "angle-double-right",
+        "id": 230,
+        "order": 4,
+        "prevSize": 28,
+        "code": 61697
+      },
+      "setIdx": 1,
+      "setId": 3,
+      "iconIdx": 230
+    },
+    {
+      "icon": {
+        "paths": [
+          "M358.286 310.857c0 4.571-2.286 9.714-5.714 13.143l-224.571 224.571 224.571 224.571c3.429 3.429 5.714 8.571 5.714 13.143s-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8 5.714 13.143z"
+        ],
+        "width": 384,
+        "attrs": [],
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "tags": [
+          "angle-left"
+        ],
+        "defaultCode": 61700,
+        "grid": 14
+      },
+      "attrs": [],
+      "properties": {
+        "name": "angle-left",
+        "id": 233,
+        "order": 2,
+        "prevSize": 28,
+        "code": 61700
+      },
       "setIdx": 1,
       "setId": 3,
-      "iconIdx": 298
+      "iconIdx": 233
     }
   ],
   "height": 1024,

diff --git a/public/fonts/icomoon.svg b/public/fonts/icomoon.svg
diff --git a/public/fonts/icomoon.ttf b/public/fonts/icomoon.ttf
diff --git a/public/fonts/icomoon.woff b/public/fonts/icomoon.woff
diff --git a/src/assets/css/bootstrap.css b/src/assets/css/bootstrap.css
diff --git a/src/assets/css/icomoon.css b/src/assets/css/icomoon.css
@@ -1,9 +1,9 @@
 @font-face {
   font-family: 'icomoon';
   src:
-    url('/fonts/icomoon.ttf?chm9v') format('truetype'),
-    url('/fonts/icomoon.woff?chm9v') format('woff'),
-    url('/fonts/icomoon.svg?chm9v#icomoon') format('svg');
+    url('/fonts/icomoon.ttf?z7okxk') format('truetype'),
+    url('/fonts/icomoon.woff?z7okxk') format('woff'),
+    url('/fonts/icomoon.svg?z7okxk#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -251,4 +251,13 @@
 }
 .icon-external-link-square:before {
   content: "\f14c";
-}
+}
+.icon-angle-double-left:before {
+  content: "\f100";
+}
+.icon-angle-double-right:before {
+  content: "\f101";
+}
+.icon-angle-left:before {
+  content: "\f104";
+}
diff --git a/src/assets/scss/_mixins.scss b/src/assets/scss/_mixins.scss
@@ -28,6 +28,11 @@
   li { margin-bottom: 5px; }
 }
 
+@mixin form-control-background {
+  background-color: #eee;
+  .panel-body &, .modal-body & { background-color: #f7f7f7; }
+}
+
 @mixin clearfix {
   &::before, &::after {
     content: " ";

diff --git a/src/assets/scss/_variables.scss b/src/assets/scss/_variables.scss
@@ -51,8 +51,6 @@ $color-action-background-disabled: #999;
 $color-action-overlay: #0096c1;
 $color-input: #555;
 $color-input-inactive: #777;
-$color-input-background: #eee;
-$color-panel-input-background: #f7f7f7;
 $font-size-btn: 12px;
 $hpadding-btn: 10px;
 $padding-bottom-btn: 5px;
@@ -81,6 +79,7 @@ $padding-top-table-data: 8px;
 
 // Panels
 $box-shadow-panel-main: 0 0 24px rgba(0, 0, 0, 0.25), 0 35px 115px rgba(0, 0, 0, 0.28);
+$padding-panel-body: 15px;
 
 // Navs
 $hpadding-nav-tab: 8px;