Merge branch 'bim/ifc-models-module' into bim-dev

frontend/npm-shrinkwrap.json

@@ -2686,16 +2686,23 @@
       }
     },
     "@xeokit/xeokit-sdk": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.5.7.tgz",
-      "integrity": "sha512-3UM/9PEYcbhu9F0h/bg0Dc4a+hBqiF3tb370GmTssp6cWgUbkuZCijly6OuVVs6/O68l6S/886NTMV0OKpa4SQ=="
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.5.8.tgz",
+      "integrity": "sha512-+9HDtsGlBZ+6T9678C3bHxFpPXdoUpdEewgeopX5K2BfpfBby9B9JGvzsJ1w9OjKMtEzvbKC6x81G5xBr6Pw3w=="
     },
     "@xeokit/xeokit-viewer": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.3.6.tgz",
-      "integrity": "sha512-O7zTH+kjb84q95wmptxLBXStlVM/SLIVdHxpgs4veYpg2hTM1F7489Pi6x1fSH4HTz6aVi8cBXvEVI2Hm2JQAQ==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.3.7.tgz",
+      "integrity": "sha512-l9QCjkWVJEw66TUl0DXxgsT9OTyCQ3mcUnud1G7q9s7615yxI+LLKpStZre6Vbi3EfXVaPh6DL6Lo8/Ve82BVg==",
       "requires": {
-        "@xeokit/xeokit-sdk": "^0.5.7"
+        "@xeokit/xeokit-sdk": "^0.5.8"
+      },
+      "dependencies": {
+        "@xeokit/xeokit-sdk": {
+          "version": "0.5.8",
+          "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.5.8.tgz",
+          "integrity": "sha512-+9HDtsGlBZ+6T9678C3bHxFpPXdoUpdEewgeopX5K2BfpfBby9B9JGvzsJ1w9OjKMtEzvbKC6x81G5xBr6Pw3w=="
+        }
       }
     },
     "@xtuc/ieee754": {

frontend/package.json

@@ -63,8 +63,8 @@
     "@types/webpack-env": "^1.14.0",
     "@uirouter/angular": "^4.0.0",
     "@uirouter/core": "^5.0.23",
-    "@xeokit/xeokit-sdk": "^0.5.7",
-    "@xeokit/xeokit-viewer": "^1.3.6",
+    "@xeokit/xeokit-sdk": "^0.5.8",
+    "@xeokit/xeokit-viewer": "^1.3.7",
     "URIjs": "^1.14.1",
     "amdefine": "^1.0.0",
     "angular-dragula": "^1.2.8",

modules/ifc_models/app/assets/stylesheets/ifc_viewer/tabs.sass

@@ -107,4 +107,9 @@
     @include text-shortener
 
   a
+    @include text-shortener
+
+  li
+    line-height: $main-menu-item-height
+    font-size: $main-menu-font-size
     @include text-shortener

modules/ifc_models/app/assets/stylesheets/ifc_viewer/toolbar.sass

@@ -3,6 +3,7 @@
   position: absolute
   width: 100%
   padding: 6px
+  pointer-events: none
 
   // Use our own icon font instead of including Xeokit's FontAwesome
   button[class^="fa-"],

modules/ifc_models/bin/setup_dev.sh

@@ -59,7 +59,7 @@ popd
 
 echo "-- Downloading and building xeokit-metadata --"
 
-wget --quiet https://github.com/bimspot/xeokit-metadata/releases/download/0.0.4/xeokit-metadata-linux-x64.tar.gz
+wget --quiet https://github.com/bimspot/xeokit-metadata/releases/download/0.0.5/xeokit-metadata-linux-x64.tar.gz
 tar -zxvf xeokit-metadata-linux-x64.tar.gz
 chmod +x xeokit-metadata-linux-x64/xeokit-metadata
 cp -r xeokit-metadata-linux-x64/ /usr/lib/xeokit-metadata