fix: use normal Inter for normal text and StatusInter for addresses

This commit is contained in:
Jonathan Rainville 2020-07-01 11:12:46 -04:00 committed by Iuri Matias
parent a63da4889b
commit d90c9ba882
31 changed files with 22 additions and 4 deletions

View File

@ -61,6 +61,7 @@ Rectangle {
StyledText {
id: pubkeyText
text: pubkey
font.family: Theme.fontHexRegular.name
width: 208
elide: Text.ElideMiddle
anchors.top: profileName.bottom

View File

@ -40,6 +40,7 @@ Rectangle {
StyledText {
id: addressText
width: 108
font.family: Theme.fontHexRegular.name
text: address
elide: Text.ElideMiddle
anchors.bottom: accountImage.bottom

View File

@ -85,6 +85,7 @@ ModalPopup {
id: addressText
label: qsTr("Wallet address")
text: currentAccount.address
fontFamily: Theme.fontHexRegular.name
anchors.top: typeText.bottom
anchors.topMargin: marginBetweenInputs
}

View File

@ -104,6 +104,7 @@ Item {
StyledText {
id: addressValue
font.family: Theme.fontHexRegular.name
text: to
width: 100
elide: Text.ElideMiddle

View File

@ -128,6 +128,7 @@ Item {
}
StyledText {
id: walletAddress
font.family: Theme.fontHexRegular.name
text: address
anchors.right: parent.right
anchors.rightMargin: parent.width/2

View File

@ -54,6 +54,7 @@ Item {
StyledText {
id: walletAddress
text: currentAccount.address
font.family: Theme.fontHexRegular.name
elide: Text.ElideMiddle
anchors.right: title.right
anchors.rightMargin: 0

View File

@ -84,6 +84,7 @@ Item {
StyledText {
id: textSelectAccountAddress
text: selectedAccountAddress
font.family: Theme.fontHexRegular.name
anchors.right: parent.right
anchors.left: parent.left
anchors.leftMargin: 2

View File

@ -88,6 +88,7 @@ ModalPopup {
StyledText {
id: valueHash
text: blockHash
font.family: Theme.fontHexRegular.name
width: 160
elide: Text.ElideMiddle
font.pixelSize: 14
@ -115,6 +116,7 @@ ModalPopup {
StyledText {
id: valueFrom
text: fromAddress
font.family: Theme.fontHexRegular.name
width: 160
elide: Text.ElideMiddle
font.pixelSize: 14

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
ui/fonts/Inter/Inter-V.otf Normal file

Binary file not shown.

View File

@ -3,10 +3,15 @@ pragma Singleton
import QtQuick 2.13
QtObject {
property QtObject fontMedium: FontLoader { id: _fontMedium; source: "../fonts/InterStatus/InterStatus-Medium.otf"; }
property QtObject fontBold: FontLoader { id: _fontBold; source: "../fonts/InterStatus/InterStatus-Bold.otf"; }
property QtObject fontLight: FontLoader { id: _fontLight; source: "../fonts/InterStatus/InterStatus-Light.otf"; }
property QtObject fontRegular: FontLoader { id: _fontRegular; source: "../fonts/InterStatus/InterStatus-Regular.otf"; }
property QtObject fontMedium: FontLoader { id: _fontMedium; source: "../fonts/Inter/Inter-Medium.otf"; }
property QtObject fontBold: FontLoader { id: _fontBold; source: "../fonts/Inter/Inter-Bold.otf"; }
property QtObject fontLight: FontLoader { id: _fontLight; source: "../fonts/Inter/Inter-Light.otf"; }
property QtObject fontRegular: FontLoader { id: _fontRegular; source: "../fonts/Inter/Inter-Regular.otf"; }
property QtObject fontHexMedium: FontLoader { id: _fontHexMedium; source: "../fonts/InterStatus/InterStatus-Medium.otf"; }
property QtObject fontHexBold: FontLoader { id: _fontHexBold; source: "../fonts/InterStatus/InterStatus-Bold.otf"; }
property QtObject fontHexLight: FontLoader { id: _fontHexLight; source: "../fonts/InterStatus/InterStatus-Light.otf"; }
property QtObject fontHexRegular: FontLoader { id: _fontHexRegular; source: "../fonts/InterStatus/InterStatus-Regular.otf"; }
readonly property color white: "#FFFFFF"

View File

@ -125,6 +125,7 @@ Item {
width: 90
color: Theme.darkGrey
text: loginModel.currentAccount.address
font.family: Theme.fontHexRegular.name
elide: Text.ElideMiddle
font.pixelSize: 15
anchors.top: usernameText.bottom

View File

@ -45,6 +45,7 @@ Rectangle {
id: addressText
width: 108
text: address
font.family: Theme.fontHexRegular.name
elide: Text.ElideMiddle
anchors.bottom: accountImage.bottom
anchors.bottomMargin: 0

View File

@ -6,6 +6,7 @@ import "../imports"
Item {
property string text: "My Text"
property string label: "My Label"
property string fontFamily: Theme.fontRegular.name
readonly property int labelMargin: 7
id: inputBox
@ -28,6 +29,7 @@ Item {
StyledTextEdit {
id: textItem
text: inputBox.text
font.family: fontFamily
selectByMouse: true
readOnly: true
font.weight: Font.Medium