repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 43f32367d41d28f4664c049f1649486293ca414e:
path_to: 
revision_to: 

commit 43f32367d41d28f4664c049f1649486293ca414e
Author: James Baicoianu 
Date:   Wed May 9 12:36:22 2018 -0700

    Improved 3D object inventory

diff --git a/media/assets/webui/apps/inventory/inventory.css b/media/assets/webui/apps/inventory/inventory.css

--- a/media/assets/webui/apps/inventory/inventory.css
+++ b/media/assets/webui/apps/inventory/inventory.css
@@ -1,8 +1,9 @@
 ui-grid.models {
-  width: 30em;
+  height: 30em;
+  grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
+  grid-template-rows: repeat(auto-fill, minmax(80px, 1fr));
 }
 ui-grid.models>ui-item {
-  width: calc(20% - 2px);
   height: auto;
   padding: 0;
   position: relative;
@@ -10,6 +11,7 @@ ui-grid.models>ui-item {
   border-radius: 10px;
   box-shadow: 0 0 5px rgba(0,0,0,.5);
   margin: 0;
+  display: flex;
 }
 ui-grid.models>ui-item h2 {
   font-size: .8em;
@@ -42,9 +44,9 @@ ui-grid.models>ui-item img {
   display: block;
 }
 ui-grid.models>ui-item a {
-  display: block;
   margin: 0;
   padding: 0;
+  flex: 1 1;
 }
 ui-grid.models>ui-item p {
   display: none;
diff --git a/media/assets/webui/apps/inventory/inventory.html b/media/assets/webui/apps/inventory/inventory.html

--- a/media/assets/webui/apps/inventory/inventory.html
+++ b/media/assets/webui/apps/inventory/inventory.html
@@ -12,18 +12,40 @@
     

     
-       
+       
+        
+          cube
+          sphere
+          cone
+          cylinder
+          pyramid
+          torus
+          capsule
+          pipe
+          plane
+
+          point light
+        
+      
+       
         
-          
+          
           
-          Next Page
+          Load More
         
       

-      
-        
-ding
+      
+        
+          
Vesta integration coming soon!
+          When it's ready, you'll be able to access assets you've stored on your Vesta account, and bring them with you anywhere you go.
+          Sign up for a vesta account today
         
       
+      
+        
Did you know?
+        
You can drag 3d models, images, videos, and sounds into Janus rooms from other websites, or even your local hard drive!
+        
Just select the files, drag them over, and drop them into the world.  Then use our in-world editing tools to place it where you want it to be.
+      
     

diff --git a/media/assets/webui/apps/inventory/inventory.json b/media/assets/webui/apps/inventory/inventory.json

--- a/media/assets/webui/apps/inventory/inventory.json
+++ b/media/assets/webui/apps/inventory/inventory.json
@@ -4,5 +4,8 @@
     "janus.ui.inventory.item.poly": "./inventory-item-poly.html"
   },
   "scripts":  ["./inventory.js"],
-  "css":      ["./inventory.css"]
+  "css":      ["./inventory.css"],
+  "components": [
+    "janus-ui-inventory"
+  ]
 }

-----END OF PAGE-----