From d3aad53e0eaf56d87e281e25df050b9f27613b62 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Mon, 29 Aug 2016 17:43:32 -0700 Subject: [PATCH] cleanup --- scripts/system/html/css/marketplaces.css | 27 ++++++++---- scripts/system/html/js/marketplaces.js | 2 +- scripts/system/html/marketplaces.html | 53 +++++++++++++----------- 3 files changed, 49 insertions(+), 33 deletions(-) diff --git a/scripts/system/html/css/marketplaces.css b/scripts/system/html/css/marketplaces.css index 9bfdd8cb81..e516715c03 100644 --- a/scripts/system/html/css/marketplaces.css +++ b/scripts/system/html/css/marketplaces.css @@ -10,6 +10,7 @@ body { padding: 0 0 0 0; } .marketplaces-container { + display: inline-block; color: black; width: 94%; margin-left: 3%; @@ -23,16 +24,18 @@ body { margin-bottom: 60px; } .marketplace-tile { + float:left; width: 100%; } .marketplace-tile-first-column { text-align: center; float: left; - width: 34%; + width: 33%; } .marketplace-tile-second-column { float: left; - width: 66%; + margin-left:4%; + width: 62%; } .exploreButton { width: 200px !important; @@ -41,8 +44,8 @@ body { margin-bottom: 30px; } .tile-divider { - width: 90%; - margin-left: 5%; + width: 100%; + margin-left: 0%; display: block; height: 1px; border: 0; @@ -53,11 +56,13 @@ body { } .marketplace-tile-description { margin-top: 15px; - margin-bottom: 50px; + margin-bottom: 30px; } .marketplace-tile-image { + margin-top:15px; max-width: 256px; height: 128px; + margin-bottom:60px; -webkit-box-shadow: -1px 4px 16px 0px rgba(0, 0, 0, 0.48); -moz-box-shadow: -1px 4px 16px 0px rgba(0, 0, 0, 0.48); box-shadow: -1px 4px 16px 0px rgba(0, 0, 0, 0.48); @@ -77,7 +82,15 @@ body { float: left; width: 100%; } - .exploreButton { - margin-left: 25%; + .exploreButton-holder { + width:100%; + text-align:center; } + .tile-divider { + width: 100%; + margin-left: 0%; +} +.marketplace-tile-image{ + margin-bottom:15px; +} } \ No newline at end of file diff --git a/scripts/system/html/js/marketplaces.js b/scripts/system/html/js/marketplaces.js index 32235cd95f..a1b3847b3c 100644 --- a/scripts/system/html/js/marketplaces.js +++ b/scripts/system/html/js/marketplaces.js @@ -4,7 +4,7 @@ bindExploreButtons(); function bindExploreButtons() { $('#exploreClaraMarketplace').on('click', function() { - window.location = "http://www.clara.io" + window.location = "https://clara.io/library?public=true" }) $('#exploreHifiMarketplace').on('click', function() { window.location = "http://www.highfidelity.com/marketplace" diff --git a/scripts/system/html/marketplaces.html b/scripts/system/html/marketplaces.html index 346baff194..40c2be9407 100644 --- a/scripts/system/html/marketplaces.html +++ b/scripts/system/html/marketplaces.html @@ -20,7 +20,7 @@

- Marketplaces + Marketplaces

@@ -29,34 +29,37 @@

- +

This is the default High Fidelity marketplace. Viewing and downloading content from here is fully supported in Interface.

- +
+
+
+
+
+
+
+ +
+
+

Clara.io has thousands of models available for importing into High Fidelity. Follow these steps for the best experience:

+
    +
  1. Create an account here or log in as an existing user.
    2. +
  2. Choose a model from the list and click Download -> Autodesk FBX.
    3. +
  3. After the file processes, click download.
    4. +
  4. Add the model to your asset server, then find it from the list and choose Add To World.
    5. +
+
+ +
+
+
-
-
-
-
- -
-
-

Clara.io has thousands of models available for importing into High Fidelity. Follow these steps for the best experience:

-
    -
  1. Create an account here or log in as an existing user.
    2. -
  2. Choose a model from the list and click Download -> Autodesk FBX.
    3. -
  3. After the file processes, click download.
    4. -
  4. Add the model to your asset server, then find it from the list and choose Add To World.
    5. -
- -
-
+ + + - - - - - + \ No newline at end of file