Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:43:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

get rid of TextStyle1..11 per request from Dante

Browse source
This commit is contained in:
Alexander Ivash 2018-06-22 01:08:05 +03:00
parent dbcc654af1
commit 68041dc93c
18 changed files with 84 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
interface/resources/qml/hifi/AvatarApp.qml
View file

@ -298,14 +298,18 @@ Rectangle {
anchors.top: header.bottom anchors.top: header.bottom
anchors.bottom: favoritesBlock.top anchors.bottom: favoritesBlock.top
TextStyle1 { // TextStyle1
RalewaySemiBold {
size: 24;
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 34 anchors.topMargin: 34
} }
TextStyle1 { // TextStyle1
RalewaySemiBold {
id: displayNameLabel id: displayNameLabel
size: 24;
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 25 anchors.topMargin: 25
@ -396,7 +400,9 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
TextStyle5 { // TextStyle5
FiraSansSemiBold {
size: 22;
Layout.fillWidth: true Layout.fillWidth: true
text: isAvatarInFavorites ? avatarName : "Add to Favorites" text: isAvatarInFavorites ? avatarName : "Add to Favorites"
elide: Qt.ElideRight elide: Qt.ElideRight
@ -430,8 +436,10 @@ Rectangle {
} }
} }
TextStyle3 { // TextStyle3
RalewayRegular {
id: avatarNameLabel id: avatarNameLabel
size: 22;
text: getAvatarModelName(); text: getAvatarModelName();
elide: Qt.ElideRight elide: Qt.ElideRight
@ -450,8 +458,10 @@ Rectangle {
color: hasMarketId ? style.colors.blueHighlight : 'black' color: hasMarketId ? style.colors.blueHighlight : 'black'
} }
TextStyle3 { // TextStyle3
RalewayRegular {
id: wearablesLabel id: wearablesLabel
size: 22;
anchors.left: avatarImage.right anchors.left: avatarImage.right
anchors.leftMargin: 30 anchors.leftMargin: 30
anchors.top: avatarNameLabel.bottom anchors.top: avatarNameLabel.bottom
@ -495,7 +505,9 @@ Rectangle {
} }
} }
TextStyle3 { // TextStyle3
RalewayRegular {
size: 22;
anchors.right: parent.right anchors.right: parent.right
anchors.verticalCenter: wearablesLabel.verticalCenter anchors.verticalCenter: wearablesLabel.verticalCenter
font.underline: true font.underline: true
@ -526,8 +538,10 @@ Rectangle {
color: style.colors.lightGrayBackground color: style.colors.lightGrayBackground
TextStyle1 { // TextStyle1
RalewaySemiBold {
id: favoritesLabel id: favoritesLabel
size: 24;
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 15 anchors.topMargin: 15
anchors.left: parent.left anchors.left: parent.left
@ -535,8 +549,11 @@ Rectangle {
text: "Favorites" text: "Favorites"
} }
TextStyle8 { // TextStyle8
RalewaySemiBold {
id: manageLabel id: manageLabel
color: style.colors.blueHighlight
size: 20;
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 20 anchors.topMargin: 20
anchors.right: parent.right anchors.right: parent.right
@ -752,8 +769,12 @@ Rectangle {
} }
} }
TextStyle7 { // TextStyle7
FiraSansRegular {
id: text id: text
size: 18;
lineHeightMode: Text.FixedHeight
lineHeight: 16.9;
width: view.thumbnailWidth width: view.thumbnailWidth
height: view.verticalSpacing height: view.verticalSpacing
elide: Qt.ElideRight elide: Qt.ElideRight

24
interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
View file

@ -161,12 +161,18 @@ Rectangle {
Row { Row {
spacing: 20 spacing: 20
TextStyle5 { // TextStyle5
FiraSansSemiBold {
id: positionLabel id: positionLabel
size: 22;
text: "Position" text: "Position"
} }
TextStyle7 { // TextStyle7
FiraSansRegular {
size: 18;
lineHeightMode: Text.FixedHeight
lineHeight: 16.9;
text: "m" text: "m"
anchors.verticalCenter: positionLabel.verticalCenter anchors.verticalCenter: positionLabel.verticalCenter
} }
@ -213,12 +219,18 @@ Rectangle {
Row { Row {
spacing: 20 spacing: 20
TextStyle5 { // TextStyle5
FiraSansSemiBold {
id: rotationLabel id: rotationLabel
size: 22;
text: "Rotation" text: "Rotation"
} }
TextStyle7 { // TextStyle7
FiraSansRegular {
size: 18;
lineHeightMode: Text.FixedHeight
lineHeight: 16.9;
text: "deg" text: "deg"
anchors.verticalCenter: rotationLabel.verticalCenter anchors.verticalCenter: rotationLabel.verticalCenter
} }
@ -262,7 +274,9 @@ Rectangle {
width: parent.width width: parent.width
spacing: 5 spacing: 5
TextStyle5 { // TextStyle5
FiraSansSemiBold {
size: 22;
text: "Scale" text: "Scale"
} }

4
interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml
View file

@ -30,8 +30,10 @@ ShadowRectangle {
text: "<" text: "<"
} }
TextStyle6 { // TextStyle6
RalewaySemiBold {
id: title id: title
size: 22;
anchors.left: avatarIcon.visible ? avatarIcon.right : avatarIcon.left anchors.left: avatarIcon.visible ? avatarIcon.right : avatarIcon.left
anchors.leftMargin: 4 anchors.leftMargin: 4
anchors.verticalCenter: avatarIcon.verticalCenter anchors.verticalCenter: avatarIcon.verticalCenter

4
interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml
View file

@ -36,7 +36,9 @@ ShadowRectangle {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: 2.76 anchors.bottomMargin: 2.76
TextStyle2 { // TextStyle2
RalewayBold {
size: 15;
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
text: wearablesCount text: wearablesCount
} }

4
interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml
View file

@ -67,8 +67,10 @@ Rectangle {
color: "white" color: "white"
TextStyle1 { // TextStyle1
RalewaySemiBold {
id: title id: title
size: 24;
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right

7
interface/resources/qml/hifi/avatarapp/MessageBox.qml
View file

@ -73,8 +73,10 @@ Rectangle {
color: "white" color: "white"
TextStyle1 { // TextStyle1
RalewaySemiBold {
id: title id: title
size: 24;
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
@ -106,7 +108,8 @@ Rectangle {
anchors.right: parent.right; anchors.right: parent.right;
} }
TextStyle3 { // TextStyle3
RalewayRegular {
id: body id: body
AvatarAppStyle { AvatarAppStyle {

28
interface/resources/qml/hifi/avatarapp/Settings.qml
View file

@ -80,7 +80,9 @@ Rectangle {
spacing: 17 spacing: 17
TextStyle9 { // TextStyle9
RalewaySemiBold {
size: 17;
text: "Avatar Scale" text: "Avatar Scale"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -118,7 +120,9 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Layout.fillWidth: true Layout.fillWidth: true
TextStyle9 { // TextStyle9
RalewaySemiBold {
size: 17;
anchors.left: scaleSlider.left anchors.left: scaleSlider.left
anchors.leftMargin: 5 anchors.leftMargin: 5
anchors.top: scaleSlider.bottom anchors.top: scaleSlider.bottom
@ -126,7 +130,9 @@ Rectangle {
text: String(scaleSlider.from / 10) + 'x' text: String(scaleSlider.from / 10) + 'x'
} }
TextStyle9 { // TextStyle9
RalewaySemiBold {
size: 17;
anchors.right: scaleSlider.right anchors.right: scaleSlider.right
anchors.rightMargin: 5 anchors.rightMargin: 5
anchors.top: scaleSlider.bottom anchors.top: scaleSlider.bottom
@ -186,7 +192,9 @@ Rectangle {
columns: 3 columns: 3
TextStyle9 { // TextStyle9
RalewaySemiBold {
size: 17;
Layout.row: 0 Layout.row: 0
Layout.column: 0 Layout.column: 0
@ -230,7 +238,9 @@ Rectangle {
boxSize: 20 boxSize: 20
} }
TextStyle9 { // TextStyle9
RalewaySemiBold {
size: 17;
Layout.row: 1 Layout.row: 1
Layout.column: 0 Layout.column: 0
@ -288,7 +298,9 @@ Rectangle {
spacing: 4 spacing: 4
TextStyle9 { // TextStyle9
RalewaySemiBold {
size: 17;
text: "Avatar Animation JSON" text: "Avatar Animation JSON"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
@ -312,7 +324,9 @@ Rectangle {
spacing: 4 spacing: 4
TextStyle9 { // TextStyle9
RalewaySemiBold {
size: 17;
text: "Avatar collision sound URL (optional)" text: "Avatar collision sound URL (optional)"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft

6
interface/resources/qml/hifi/avatarapp/TextStyle1.qml
View file

@ -1,6 +0,0 @@
import "../../controls" as HifiControls
import "../../styles-uit"
RalewaySemiBold {
size: 24;
}

6
interface/resources/qml/hifi/avatarapp/TextStyle10.qml
View file

@ -1,6 +0,0 @@
import "../../controls" as HifiControls
import "../../styles-uit"
RalewayBold {
size: 12;
}

11
interface/resources/qml/hifi/avatarapp/TextStyle11.qml
View file

@ -1,11 +0,0 @@
import "../../controls" as HifiControls
import "../../styles-uit"
RalewayRegular {
AvatarAppStyle {
id: style
}
color: style.colors.redHighlight
size: 15;
}

6
interface/resources/qml/hifi/avatarapp/TextStyle2.qml
View file

@ -1,6 +0,0 @@
import "../../controls" as HifiControls
import "../../styles-uit"
RalewayBold {
size: 15;
}

6
interface/resources/qml/hifi/avatarapp/TextStyle3.qml
View file

@ -1,6 +0,0 @@
import "../../controls" as HifiControls
import "../../styles-uit"
RalewayRegular {
size: 22;
}

6
interface/resources/qml/hifi/avatarapp/TextStyle4.qml
View file

@ -1,6 +0,0 @@
import "../../controls" as HifiControls
import "../../styles-uit"
FiraSansRegular {
size: 15;
}

6
interface/resources/qml/hifi/avatarapp/TextStyle5.qml
View file

@ -1,6 +0,0 @@
import "../../controls" as HifiControls
import "../../styles-uit"
FiraSansSemiBold {
size: 22;
}

6
interface/resources/qml/hifi/avatarapp/TextStyle6.qml
View file

@ -1,6 +0,0 @@
import "../../controls" as HifiControls
import "../../styles-uit"
RalewaySemiBold {
size: 22;
}

9
interface/resources/qml/hifi/avatarapp/TextStyle7.qml
View file

@ -1,9 +0,0 @@
import "../../controls" as HifiControls
import "../../styles-uit"
import QtQuick 2.7
FiraSansRegular {
size: 18;
lineHeightMode: Text.FixedHeight
lineHeight: 16.9;
}

10
interface/resources/qml/hifi/avatarapp/TextStyle8.qml
View file

@ -1,10 +0,0 @@
import "../../controls" as HifiControls
import "../../styles-uit"
RalewaySemiBold {
AvatarAppStyle {
id: style
}
color: style.colors.blueHighlight
size: 20;
}

6
interface/resources/qml/hifi/avatarapp/TextStyle9.qml
View file

@ -1,6 +0,0 @@
import "../../controls" as HifiControls
import "../../styles-uit"
RalewaySemiBold {
size: 17;
}