mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 21:36:47 +02:00
merge with james repo
This commit is contained in:
commit
aceddb0cf8
5 changed files with 54 additions and 56 deletions
|
@ -90,8 +90,7 @@ Rectangle {
|
|||
width: 150
|
||||
text: "See all markets"
|
||||
//onClicked: webview.url = "file:///E:/GitHub/hifi/scripts/system/html/marketplaces.html"
|
||||
//hello again
|
||||
onClicked: webview.url = "../../../scripts/system/html/marketplaces.html"
|
||||
onClicked: webview.url = "../../scripts/system/html/marketplaces.html"
|
||||
}
|
||||
|
||||
Controls.Label {
|
||||
|
|
BIN
scripts/system/html/img/clara-tile.png
Normal file
BIN
scripts/system/html/img/clara-tile.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.9 KiB |
BIN
scripts/system/html/img/hifi-marketplace-tile.png
Normal file
BIN
scripts/system/html/img/hifi-marketplace-tile.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 6.7 KiB |
|
@ -34,8 +34,7 @@
|
|||
<div class="marketplace-tile-second-column">
|
||||
<p class="marketplace-tile-description">This is the default High Fidelity marketplace. Viewing and downloading content from here is fully supported in Interface.</p>
|
||||
<div class="exploreButton-holder">
|
||||
<input class="blue exploreButton" type="button" value="Explore" id="exploreHifiMarketplace"></input>
|
||||
</div>
|
||||
<input class="blue exploreButton" type="button" value="Explore" id="exploreHifiMarketplace"></input></div>
|
||||
</div>
|
||||
<hr class="tile-divider">
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue