Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 05:37:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changes to tablet formating

Browse source 
Changes to QML and .js formating to match style of mockup.
This commit is contained in:
Chris Collins 2017-01-25 07:41:04 -08:00
parent d605ad0253
commit df9bfa6eff
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/tablet/TabletMenu.qml
View file

@ -62,14 +62,14 @@ FocusScope {
id: iconColorOverlay id: iconColorOverlay
anchors.fill: menuRootIcon anchors.fill: menuRootIcon
source: menuRootIcon source: menuRootIcon
color: "#ffffff" color: "#34a2c7"
} }
RalewayBold { RalewayBold {
id: breadcrumbText id: breadcrumbText
text: "Menu" text: "Menu"
size: 18 size: 26
color: "#ffffff" color: "#34a2c7"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: menuRootIcon.right anchors.left: menuRootIcon.right
anchors.leftMargin: 15 anchors.leftMargin: 15
@ -77,7 +77,7 @@ FocusScope {
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
onEntered: breadcrumbText.color = "#1fc6a6"; onEntered: breadcrumbText.color = "#1fc6a6";
onExited: breadcrumbText.color = "#ffffff"; onExited: breadcrumbText.color = "#34a2c7";
// navigate back to parent level menu if there is one // navigate back to parent level menu if there is one
onClicked: onClicked:
if (breadcrumbText.text !== "Menu") { if (breadcrumbText.text !== "Menu") {

4
interface/resources/qml/hifi/tablet/TabletMenuItem.qml
View file

@ -50,7 +50,7 @@ Item {
RalewaySemiBold { RalewaySemiBold {
id: label id: label
size: hifi.fontSizes.rootMenu size: 20
font.capitalization: isSubMenu ? Font.MixedCase : Font.AllUppercase font.capitalization: isSubMenu ? Font.MixedCase : Font.AllUppercase
anchors.left: check.right anchors.left: check.right
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -103,7 +103,7 @@ Item {
HiFiGlyphs { HiFiGlyphs {
text: hifi.glyphs.disclosureExpand text: hifi.glyphs.disclosureExpand
color: source.enabled ? hifi.colors.baseGrayShadow : hifi.colors.baseGrayShadow25 color: source.enabled ? hifi.colors.baseGrayShadow : hifi.colors.baseGrayShadow25
size: 2 * hifi.fontSizes.rootMenuDisclosure size: 70
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight

2
scripts/system/menu.js
View file

@ -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 tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
var button = tablet.addButton({ var button = tablet.addButton({
icon: "icons/tablet-icons/menu-i.svg", icon: "icons/tablet-icons/menu-i.svg",
text: "Menu" text: "MENU"
}); });