diff --git a/interface/resources/qml/hifi/AvatarApp.qml b/interface/resources/qml/hifi/AvatarApp.qml index 2cc6189e11..0a2dcb951b 100644 --- a/interface/resources/qml/hifi/AvatarApp.qml +++ b/interface/resources/qml/hifi/AvatarApp.qml @@ -298,14 +298,18 @@ Rectangle { anchors.top: header.bottom anchors.bottom: favoritesBlock.top - TextStyle1 { + // TextStyle1 + RalewaySemiBold { + size: 24; anchors.left: parent.left anchors.top: parent.top anchors.topMargin: 34 } - TextStyle1 { + // TextStyle1 + RalewaySemiBold { id: displayNameLabel + size: 24; anchors.left: parent.left anchors.top: parent.top anchors.topMargin: 25 @@ -396,7 +400,9 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter } - TextStyle5 { + // TextStyle5 + FiraSansSemiBold { + size: 22; Layout.fillWidth: true text: isAvatarInFavorites ? avatarName : "Add to Favorites" elide: Qt.ElideRight @@ -430,8 +436,10 @@ Rectangle { } } - TextStyle3 { + // TextStyle3 + RalewayRegular { id: avatarNameLabel + size: 22; text: getAvatarModelName(); elide: Qt.ElideRight @@ -450,8 +458,10 @@ Rectangle { color: hasMarketId ? style.colors.blueHighlight : 'black' } - TextStyle3 { + // TextStyle3 + RalewayRegular { id: wearablesLabel + size: 22; anchors.left: avatarImage.right anchors.leftMargin: 30 anchors.top: avatarNameLabel.bottom @@ -495,7 +505,9 @@ Rectangle { } } - TextStyle3 { + // TextStyle3 + RalewayRegular { + size: 22; anchors.right: parent.right anchors.verticalCenter: wearablesLabel.verticalCenter font.underline: true @@ -526,8 +538,10 @@ Rectangle { color: style.colors.lightGrayBackground - TextStyle1 { + // TextStyle1 + RalewaySemiBold { id: favoritesLabel + size: 24; anchors.top: parent.top anchors.topMargin: 15 anchors.left: parent.left @@ -535,8 +549,11 @@ Rectangle { text: "Favorites" } - TextStyle8 { + // TextStyle8 + RalewaySemiBold { id: manageLabel + color: style.colors.blueHighlight + size: 20; anchors.top: parent.top anchors.topMargin: 20 anchors.right: parent.right @@ -752,8 +769,12 @@ Rectangle { } } - TextStyle7 { + // TextStyle7 + FiraSansRegular { id: text + size: 18; + lineHeightMode: Text.FixedHeight + lineHeight: 16.9; width: view.thumbnailWidth height: view.verticalSpacing elide: Qt.ElideRight diff --git a/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml b/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml index b487f201dc..a501185853 100644 --- a/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml +++ b/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml @@ -161,12 +161,18 @@ Rectangle { Row { spacing: 20 - TextStyle5 { + // TextStyle5 + FiraSansSemiBold { id: positionLabel + size: 22; text: "Position" } - TextStyle7 { + // TextStyle7 + FiraSansRegular { + size: 18; + lineHeightMode: Text.FixedHeight + lineHeight: 16.9; text: "m" anchors.verticalCenter: positionLabel.verticalCenter } @@ -213,12 +219,18 @@ Rectangle { Row { spacing: 20 - TextStyle5 { + // TextStyle5 + FiraSansSemiBold { id: rotationLabel + size: 22; text: "Rotation" } - TextStyle7 { + // TextStyle7 + FiraSansRegular { + size: 18; + lineHeightMode: Text.FixedHeight + lineHeight: 16.9; text: "deg" anchors.verticalCenter: rotationLabel.verticalCenter } @@ -262,7 +274,9 @@ Rectangle { width: parent.width spacing: 5 - TextStyle5 { + // TextStyle5 + FiraSansSemiBold { + size: 22; text: "Scale" } diff --git a/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml b/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml index 3ad4489b39..9d9db010fb 100644 --- a/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml +++ b/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml @@ -30,8 +30,10 @@ ShadowRectangle { text: "<" } - TextStyle6 { + // TextStyle6 + RalewaySemiBold { id: title + size: 22; anchors.left: avatarIcon.visible ? avatarIcon.right : avatarIcon.left anchors.leftMargin: 4 anchors.verticalCenter: avatarIcon.verticalCenter diff --git a/interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml b/interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml index 43cecbf3df..cb73e9fe71 100644 --- a/interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml +++ b/interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml @@ -36,7 +36,9 @@ ShadowRectangle { anchors.bottom: parent.bottom anchors.bottomMargin: 2.76 - TextStyle2 { + // TextStyle2 + RalewayBold { + size: 15; anchors.horizontalCenter: parent.horizontalCenter text: wearablesCount } diff --git a/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml b/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml index 9a6994576d..ab995e79e8 100644 --- a/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml +++ b/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml @@ -67,8 +67,10 @@ Rectangle { color: "white" - TextStyle1 { + // TextStyle1 + RalewaySemiBold { id: title + size: 24; anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right diff --git a/interface/resources/qml/hifi/avatarapp/MessageBox.qml b/interface/resources/qml/hifi/avatarapp/MessageBox.qml index f2a01bccfe..f2df0b5199 100644 --- a/interface/resources/qml/hifi/avatarapp/MessageBox.qml +++ b/interface/resources/qml/hifi/avatarapp/MessageBox.qml @@ -73,8 +73,10 @@ Rectangle { color: "white" - TextStyle1 { + // TextStyle1 + RalewaySemiBold { id: title + size: 24; anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right @@ -106,7 +108,8 @@ Rectangle { anchors.right: parent.right; } - TextStyle3 { + // TextStyle3 + RalewayRegular { id: body AvatarAppStyle { diff --git a/interface/resources/qml/hifi/avatarapp/Settings.qml b/interface/resources/qml/hifi/avatarapp/Settings.qml index 79ffd26f9b..f996bdfd03 100644 --- a/interface/resources/qml/hifi/avatarapp/Settings.qml +++ b/interface/resources/qml/hifi/avatarapp/Settings.qml @@ -80,7 +80,9 @@ Rectangle { spacing: 17 - TextStyle9 { + // TextStyle9 + RalewaySemiBold { + size: 17; text: "Avatar Scale" verticalAlignment: Text.AlignVCenter anchors.verticalCenter: parent.verticalCenter @@ -118,7 +120,9 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter Layout.fillWidth: true - TextStyle9 { + // TextStyle9 + RalewaySemiBold { + size: 17; anchors.left: scaleSlider.left anchors.leftMargin: 5 anchors.top: scaleSlider.bottom @@ -126,7 +130,9 @@ Rectangle { text: String(scaleSlider.from / 10) + 'x' } - TextStyle9 { + // TextStyle9 + RalewaySemiBold { + size: 17; anchors.right: scaleSlider.right anchors.rightMargin: 5 anchors.top: scaleSlider.bottom @@ -186,7 +192,9 @@ Rectangle { columns: 3 - TextStyle9 { + // TextStyle9 + RalewaySemiBold { + size: 17; Layout.row: 0 Layout.column: 0 @@ -230,7 +238,9 @@ Rectangle { boxSize: 20 } - TextStyle9 { + // TextStyle9 + RalewaySemiBold { + size: 17; Layout.row: 1 Layout.column: 0 @@ -288,7 +298,9 @@ Rectangle { spacing: 4 - TextStyle9 { + // TextStyle9 + RalewaySemiBold { + size: 17; text: "Avatar Animation JSON" verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft @@ -312,7 +324,9 @@ Rectangle { spacing: 4 - TextStyle9 { + // TextStyle9 + RalewaySemiBold { + size: 17; text: "Avatar collision sound URL (optional)" verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft diff --git a/interface/resources/qml/hifi/avatarapp/TextStyle1.qml b/interface/resources/qml/hifi/avatarapp/TextStyle1.qml deleted file mode 100644 index 58778de440..0000000000 --- a/interface/resources/qml/hifi/avatarapp/TextStyle1.qml +++ /dev/null @@ -1,6 +0,0 @@ -import "../../controls" as HifiControls -import "../../styles-uit" - -RalewaySemiBold { - size: 24; -} diff --git a/interface/resources/qml/hifi/avatarapp/TextStyle10.qml b/interface/resources/qml/hifi/avatarapp/TextStyle10.qml deleted file mode 100644 index 171309a3d0..0000000000 --- a/interface/resources/qml/hifi/avatarapp/TextStyle10.qml +++ /dev/null @@ -1,6 +0,0 @@ -import "../../controls" as HifiControls -import "../../styles-uit" - -RalewayBold { - size: 12; -} diff --git a/interface/resources/qml/hifi/avatarapp/TextStyle11.qml b/interface/resources/qml/hifi/avatarapp/TextStyle11.qml deleted file mode 100644 index 7a4ecc7645..0000000000 --- a/interface/resources/qml/hifi/avatarapp/TextStyle11.qml +++ /dev/null @@ -1,11 +0,0 @@ -import "../../controls" as HifiControls -import "../../styles-uit" - -RalewayRegular { - AvatarAppStyle { - id: style - } - - color: style.colors.redHighlight - size: 15; -} diff --git a/interface/resources/qml/hifi/avatarapp/TextStyle2.qml b/interface/resources/qml/hifi/avatarapp/TextStyle2.qml deleted file mode 100644 index ae02189ad9..0000000000 --- a/interface/resources/qml/hifi/avatarapp/TextStyle2.qml +++ /dev/null @@ -1,6 +0,0 @@ -import "../../controls" as HifiControls -import "../../styles-uit" - -RalewayBold { - size: 15; -} diff --git a/interface/resources/qml/hifi/avatarapp/TextStyle3.qml b/interface/resources/qml/hifi/avatarapp/TextStyle3.qml deleted file mode 100644 index 1c4e4d309e..0000000000 --- a/interface/resources/qml/hifi/avatarapp/TextStyle3.qml +++ /dev/null @@ -1,6 +0,0 @@ -import "../../controls" as HifiControls -import "../../styles-uit" - -RalewayRegular { - size: 22; -} diff --git a/interface/resources/qml/hifi/avatarapp/TextStyle4.qml b/interface/resources/qml/hifi/avatarapp/TextStyle4.qml deleted file mode 100644 index 18be5468ef..0000000000 --- a/interface/resources/qml/hifi/avatarapp/TextStyle4.qml +++ /dev/null @@ -1,6 +0,0 @@ -import "../../controls" as HifiControls -import "../../styles-uit" - -FiraSansRegular { - size: 15; -} diff --git a/interface/resources/qml/hifi/avatarapp/TextStyle5.qml b/interface/resources/qml/hifi/avatarapp/TextStyle5.qml deleted file mode 100644 index ff1200d4f9..0000000000 --- a/interface/resources/qml/hifi/avatarapp/TextStyle5.qml +++ /dev/null @@ -1,6 +0,0 @@ -import "../../controls" as HifiControls -import "../../styles-uit" - -FiraSansSemiBold { - size: 22; -} diff --git a/interface/resources/qml/hifi/avatarapp/TextStyle6.qml b/interface/resources/qml/hifi/avatarapp/TextStyle6.qml deleted file mode 100644 index ac7c321e87..0000000000 --- a/interface/resources/qml/hifi/avatarapp/TextStyle6.qml +++ /dev/null @@ -1,6 +0,0 @@ -import "../../controls" as HifiControls -import "../../styles-uit" - -RalewaySemiBold { - size: 22; -} diff --git a/interface/resources/qml/hifi/avatarapp/TextStyle7.qml b/interface/resources/qml/hifi/avatarapp/TextStyle7.qml deleted file mode 100644 index 8ae101dfb9..0000000000 --- a/interface/resources/qml/hifi/avatarapp/TextStyle7.qml +++ /dev/null @@ -1,9 +0,0 @@ -import "../../controls" as HifiControls -import "../../styles-uit" -import QtQuick 2.7 - -FiraSansRegular { - size: 18; - lineHeightMode: Text.FixedHeight - lineHeight: 16.9; -} diff --git a/interface/resources/qml/hifi/avatarapp/TextStyle8.qml b/interface/resources/qml/hifi/avatarapp/TextStyle8.qml deleted file mode 100644 index 9f71451f59..0000000000 --- a/interface/resources/qml/hifi/avatarapp/TextStyle8.qml +++ /dev/null @@ -1,10 +0,0 @@ -import "../../controls" as HifiControls -import "../../styles-uit" - -RalewaySemiBold { - AvatarAppStyle { - id: style - } - color: style.colors.blueHighlight - size: 20; -} diff --git a/interface/resources/qml/hifi/avatarapp/TextStyle9.qml b/interface/resources/qml/hifi/avatarapp/TextStyle9.qml deleted file mode 100644 index 283e7ae1ae..0000000000 --- a/interface/resources/qml/hifi/avatarapp/TextStyle9.qml +++ /dev/null @@ -1,6 +0,0 @@ -import "../../controls" as HifiControls -import "../../styles-uit" - -RalewaySemiBold { - size: 17; -}