Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-09 07:22:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated text styles based on the latest zeplin specs

Browse source
This commit is contained in:
Alexander Ivash 2018-05-10 23:06:04 +03:00
parent 51c8248463
commit 5ebe26887d
8 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -514,7 +514,6 @@ Rectangle {
anchors.right: parent.right
anchors.rightMargin: 30
text: isInManageState ? "Back" : "Manage"
color: style.colors.blueHighlight
MouseArea {
anchors.fill: parent
onClicked: {
@ -540,7 +539,7 @@ Rectangle {
currentIndex: (selectedAvatarId !== '' && !pageOfAvatars.isUpdating) ? pageOfAvatars.findAvatar(selectedAvatarId) : -1
property int horizontalSpacing: 18
property int verticalSpacing: 36
property int verticalSpacing: 44
function selectAvatar(avatar) {
emitSendToScript({'method' : 'selectAvatar', 'name' : avatar.name})

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

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

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

@ -2,5 +2,9 @@ import "../../controls" as HifiControls
import "../../styles-uit"
RalewayRegular {
size: 18;
AvatarAppStyle {
id: style
}
color: style.colors.blueHighlight
size: 22;
}

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

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

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

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

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

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

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

@ -2,5 +2,9 @@ import "../../controls" as HifiControls
import "../../styles-uit"
RalewaySemiBold {
AvatarAppStyle {
id: style
}
color: style.colors.blueHightlight
size: 20;
}

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

@ -3,5 +3,5 @@ import "../../styles-uit"
RalewaySemiBold {
size: 14;
font.letterSpacing: 1.1;
font.letterSpacing: 1.1
}