From df9bfa6eff7a3c5ec2a8d4347718698487aa5c4f Mon Sep 17 00:00:00 2001 From: Chris Collins Date: Wed, 25 Jan 2017 07:41:04 -0800 Subject: [PATCH] Changes to tablet formating Changes to QML and .js formating to match style of mockup. --- interface/resources/qml/hifi/tablet/TabletMenu.qml | 8 ++++---- interface/resources/qml/hifi/tablet/TabletMenuItem.qml | 4 ++-- scripts/system/menu.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/interface/resources/qml/hifi/tablet/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml index a80ca12d5f..a9ca1b884c 100644 --- a/interface/resources/qml/hifi/tablet/TabletMenu.qml +++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml @@ -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") { diff --git a/interface/resources/qml/hifi/tablet/TabletMenuItem.qml b/interface/resources/qml/hifi/tablet/TabletMenuItem.qml index ae6a56e9df..c9223650f8 100644 --- a/interface/resources/qml/hifi/tablet/TabletMenuItem.qml +++ b/interface/resources/qml/hifi/tablet/TabletMenuItem.qml @@ -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 diff --git a/scripts/system/menu.js b/scripts/system/menu.js index 0481bc8296..1b67a7995c 100644 --- a/scripts/system/menu.js +++ b/scripts/system/menu.js @@ -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" });