mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-04-12 17:42:39 +02:00
Changes to tablet formating
Changes to QML and .js formating to match style of mockup.
This commit is contained in:
parent
d605ad0253
commit
df9bfa6eff
3 changed files with 7 additions and 7 deletions
|
@ -62,14 +62,14 @@ FocusScope {
|
|||
id: iconColorOverlay
|
||||
anchors.fill: menuRootIcon
|
||||
source: menuRootIcon
|
||||
color: "#ffffff"
|
||||
color: "#34a2c7"
|
||||
}
|
||||
|
||||
RalewayBold {
|
||||
id: breadcrumbText
|
||||
text: "Menu"
|
||||
size: 18
|
||||
color: "#ffffff"
|
||||
size: 26
|
||||
color: "#34a2c7"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: menuRootIcon.right
|
||||
anchors.leftMargin: 15
|
||||
|
@ -77,7 +77,7 @@ FocusScope {
|
|||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
onEntered: breadcrumbText.color = "#1fc6a6";
|
||||
onExited: breadcrumbText.color = "#ffffff";
|
||||
onExited: breadcrumbText.color = "#34a2c7";
|
||||
// navigate back to parent level menu if there is one
|
||||
onClicked:
|
||||
if (breadcrumbText.text !== "Menu") {
|
||||
|
|
|
@ -50,7 +50,7 @@ Item {
|
|||
|
||||
RalewaySemiBold {
|
||||
id: label
|
||||
size: hifi.fontSizes.rootMenu
|
||||
size: 20
|
||||
font.capitalization: isSubMenu ? Font.MixedCase : Font.AllUppercase
|
||||
anchors.left: check.right
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
@ -103,7 +103,7 @@ Item {
|
|||
HiFiGlyphs {
|
||||
text: hifi.glyphs.disclosureExpand
|
||||
color: source.enabled ? hifi.colors.baseGrayShadow : hifi.colors.baseGrayShadow25
|
||||
size: 2 * hifi.fontSizes.rootMenuDisclosure
|
||||
size: 70
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.right: parent.right
|
||||
horizontalAlignment: Text.AlignRight
|
||||
|
|
|
@ -14,7 +14,7 @@ var HOME_BUTTON_TEXTURE = "http://hifi-content.s3.amazonaws.com/alan/dev/tablet-
|
|||
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
|
||||
var button = tablet.addButton({
|
||||
icon: "icons/tablet-icons/menu-i.svg",
|
||||
text: "Menu"
|
||||
text: "MENU"
|
||||
});
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue