mirror of
https://github.com/status-im/status-desktop.git
synced 2025-03-03 07:50:49 +00:00
fix: use normal Inter for normal text and StatusInter for addresses
This commit is contained in:
parent
a63da4889b
commit
d90c9ba882
@ -61,6 +61,7 @@ Rectangle {
|
|||||||
StyledText {
|
StyledText {
|
||||||
id: pubkeyText
|
id: pubkeyText
|
||||||
text: pubkey
|
text: pubkey
|
||||||
|
font.family: Theme.fontHexRegular.name
|
||||||
width: 208
|
width: 208
|
||||||
elide: Text.ElideMiddle
|
elide: Text.ElideMiddle
|
||||||
anchors.top: profileName.bottom
|
anchors.top: profileName.bottom
|
||||||
|
@ -40,6 +40,7 @@ Rectangle {
|
|||||||
StyledText {
|
StyledText {
|
||||||
id: addressText
|
id: addressText
|
||||||
width: 108
|
width: 108
|
||||||
|
font.family: Theme.fontHexRegular.name
|
||||||
text: address
|
text: address
|
||||||
elide: Text.ElideMiddle
|
elide: Text.ElideMiddle
|
||||||
anchors.bottom: accountImage.bottom
|
anchors.bottom: accountImage.bottom
|
||||||
|
@ -85,6 +85,7 @@ ModalPopup {
|
|||||||
id: addressText
|
id: addressText
|
||||||
label: qsTr("Wallet address")
|
label: qsTr("Wallet address")
|
||||||
text: currentAccount.address
|
text: currentAccount.address
|
||||||
|
fontFamily: Theme.fontHexRegular.name
|
||||||
anchors.top: typeText.bottom
|
anchors.top: typeText.bottom
|
||||||
anchors.topMargin: marginBetweenInputs
|
anchors.topMargin: marginBetweenInputs
|
||||||
}
|
}
|
||||||
|
@ -104,6 +104,7 @@ Item {
|
|||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
id: addressValue
|
id: addressValue
|
||||||
|
font.family: Theme.fontHexRegular.name
|
||||||
text: to
|
text: to
|
||||||
width: 100
|
width: 100
|
||||||
elide: Text.ElideMiddle
|
elide: Text.ElideMiddle
|
||||||
|
@ -128,6 +128,7 @@ Item {
|
|||||||
}
|
}
|
||||||
StyledText {
|
StyledText {
|
||||||
id: walletAddress
|
id: walletAddress
|
||||||
|
font.family: Theme.fontHexRegular.name
|
||||||
text: address
|
text: address
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.rightMargin: parent.width/2
|
anchors.rightMargin: parent.width/2
|
||||||
|
@ -54,6 +54,7 @@ Item {
|
|||||||
StyledText {
|
StyledText {
|
||||||
id: walletAddress
|
id: walletAddress
|
||||||
text: currentAccount.address
|
text: currentAccount.address
|
||||||
|
font.family: Theme.fontHexRegular.name
|
||||||
elide: Text.ElideMiddle
|
elide: Text.ElideMiddle
|
||||||
anchors.right: title.right
|
anchors.right: title.right
|
||||||
anchors.rightMargin: 0
|
anchors.rightMargin: 0
|
||||||
|
@ -84,6 +84,7 @@ Item {
|
|||||||
StyledText {
|
StyledText {
|
||||||
id: textSelectAccountAddress
|
id: textSelectAccountAddress
|
||||||
text: selectedAccountAddress
|
text: selectedAccountAddress
|
||||||
|
font.family: Theme.fontHexRegular.name
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.leftMargin: 2
|
anchors.leftMargin: 2
|
||||||
|
@ -88,6 +88,7 @@ ModalPopup {
|
|||||||
StyledText {
|
StyledText {
|
||||||
id: valueHash
|
id: valueHash
|
||||||
text: blockHash
|
text: blockHash
|
||||||
|
font.family: Theme.fontHexRegular.name
|
||||||
width: 160
|
width: 160
|
||||||
elide: Text.ElideMiddle
|
elide: Text.ElideMiddle
|
||||||
font.pixelSize: 14
|
font.pixelSize: 14
|
||||||
@ -115,6 +116,7 @@ ModalPopup {
|
|||||||
StyledText {
|
StyledText {
|
||||||
id: valueFrom
|
id: valueFrom
|
||||||
text: fromAddress
|
text: fromAddress
|
||||||
|
font.family: Theme.fontHexRegular.name
|
||||||
width: 160
|
width: 160
|
||||||
elide: Text.ElideMiddle
|
elide: Text.ElideMiddle
|
||||||
font.pixelSize: 14
|
font.pixelSize: 14
|
||||||
|
BIN
ui/fonts/Inter/Inter-Black.otf
Normal file
BIN
ui/fonts/Inter/Inter-Black.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-BlackItalic.otf
Normal file
BIN
ui/fonts/Inter/Inter-BlackItalic.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-Bold.otf
Normal file
BIN
ui/fonts/Inter/Inter-Bold.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-BoldItalic.otf
Normal file
BIN
ui/fonts/Inter/Inter-BoldItalic.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-ExtraBold.otf
Normal file
BIN
ui/fonts/Inter/Inter-ExtraBold.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-ExtraBoldItalic.otf
Normal file
BIN
ui/fonts/Inter/Inter-ExtraBoldItalic.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-ExtraLight.otf
Normal file
BIN
ui/fonts/Inter/Inter-ExtraLight.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-ExtraLightItalic.otf
Normal file
BIN
ui/fonts/Inter/Inter-ExtraLightItalic.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-Italic.otf
Normal file
BIN
ui/fonts/Inter/Inter-Italic.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-Light.otf
Normal file
BIN
ui/fonts/Inter/Inter-Light.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-LightItalic.otf
Normal file
BIN
ui/fonts/Inter/Inter-LightItalic.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-Medium.otf
Normal file
BIN
ui/fonts/Inter/Inter-Medium.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-MediumItalic.otf
Normal file
BIN
ui/fonts/Inter/Inter-MediumItalic.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-Regular.otf
Normal file
BIN
ui/fonts/Inter/Inter-Regular.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-SemiBold.otf
Normal file
BIN
ui/fonts/Inter/Inter-SemiBold.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-SemiBoldItalic.otf
Normal file
BIN
ui/fonts/Inter/Inter-SemiBoldItalic.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-Thin.otf
Normal file
BIN
ui/fonts/Inter/Inter-Thin.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-ThinItalic.otf
Normal file
BIN
ui/fonts/Inter/Inter-ThinItalic.otf
Normal file
Binary file not shown.
BIN
ui/fonts/Inter/Inter-V.otf
Normal file
BIN
ui/fonts/Inter/Inter-V.otf
Normal file
Binary file not shown.
@ -3,10 +3,15 @@ pragma Singleton
|
|||||||
import QtQuick 2.13
|
import QtQuick 2.13
|
||||||
|
|
||||||
QtObject {
|
QtObject {
|
||||||
property QtObject fontMedium: FontLoader { id: _fontMedium; source: "../fonts/InterStatus/InterStatus-Medium.otf"; }
|
property QtObject fontMedium: FontLoader { id: _fontMedium; source: "../fonts/Inter/Inter-Medium.otf"; }
|
||||||
property QtObject fontBold: FontLoader { id: _fontBold; source: "../fonts/InterStatus/InterStatus-Bold.otf"; }
|
property QtObject fontBold: FontLoader { id: _fontBold; source: "../fonts/Inter/Inter-Bold.otf"; }
|
||||||
property QtObject fontLight: FontLoader { id: _fontLight; source: "../fonts/InterStatus/InterStatus-Light.otf"; }
|
property QtObject fontLight: FontLoader { id: _fontLight; source: "../fonts/Inter/Inter-Light.otf"; }
|
||||||
property QtObject fontRegular: FontLoader { id: _fontRegular; source: "../fonts/InterStatus/InterStatus-Regular.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"
|
readonly property color white: "#FFFFFF"
|
||||||
|
@ -125,6 +125,7 @@ Item {
|
|||||||
width: 90
|
width: 90
|
||||||
color: Theme.darkGrey
|
color: Theme.darkGrey
|
||||||
text: loginModel.currentAccount.address
|
text: loginModel.currentAccount.address
|
||||||
|
font.family: Theme.fontHexRegular.name
|
||||||
elide: Text.ElideMiddle
|
elide: Text.ElideMiddle
|
||||||
font.pixelSize: 15
|
font.pixelSize: 15
|
||||||
anchors.top: usernameText.bottom
|
anchors.top: usernameText.bottom
|
||||||
|
@ -45,6 +45,7 @@ Rectangle {
|
|||||||
id: addressText
|
id: addressText
|
||||||
width: 108
|
width: 108
|
||||||
text: address
|
text: address
|
||||||
|
font.family: Theme.fontHexRegular.name
|
||||||
elide: Text.ElideMiddle
|
elide: Text.ElideMiddle
|
||||||
anchors.bottom: accountImage.bottom
|
anchors.bottom: accountImage.bottom
|
||||||
anchors.bottomMargin: 0
|
anchors.bottomMargin: 0
|
||||||
|
@ -6,6 +6,7 @@ import "../imports"
|
|||||||
Item {
|
Item {
|
||||||
property string text: "My Text"
|
property string text: "My Text"
|
||||||
property string label: "My Label"
|
property string label: "My Label"
|
||||||
|
property string fontFamily: Theme.fontRegular.name
|
||||||
readonly property int labelMargin: 7
|
readonly property int labelMargin: 7
|
||||||
|
|
||||||
id: inputBox
|
id: inputBox
|
||||||
@ -28,6 +29,7 @@ Item {
|
|||||||
StyledTextEdit {
|
StyledTextEdit {
|
||||||
id: textItem
|
id: textItem
|
||||||
text: inputBox.text
|
text: inputBox.text
|
||||||
|
font.family: fontFamily
|
||||||
selectByMouse: true
|
selectByMouse: true
|
||||||
readOnly: true
|
readOnly: true
|
||||||
font.weight: Font.Medium
|
font.weight: Font.Medium
|
||||||
|
Loading…
x
Reference in New Issue
Block a user