Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-15 05:36:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14840 from danteruiz/tablet-root-color

Browse source 
Case 20973: Fix SendAsset.qml has wrong color
This commit is contained in:
John Conklin II 2019-02-04 14:27:19 -08:00 committed by GitHub
commit 46fc19e101
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
View file

@ -21,11 +21,10 @@ import "../../../../controls" as HifiControls
import "../" as HifiCommerceCommon
import "qrc:////qml//hifi//models" as HifiModels // Absolute path so the same code works everywhere.
Rectangle {
Item {
HifiConstants { id: hifi; }
id: root;
color: hifi.colors.baseGray
property int parentAppTitleBarHeight;
property int parentAppNavBarHeight;
property string currentActiveView: "sendAssetHome";

5
interface/resources/qml/hifi/tablet/TabletRoot.qml
View file

@ -3,10 +3,13 @@ import Hifi 1.0
import "../../dialogs"
import "../../controls"
import stylesUit 1.0
Item {
Rectangle {
HifiConstants { id: hifi; }
id: tabletRoot
objectName: "tabletRoot"
color: hifi.colors.baseGray
property string username: "Unknown user"
property string usernameShort: "Unknown user"
property var rootMenu;