Move default font color to Style.qml

This commit is contained in:
Sander Ferdinand
2017-12-07 17:33:46 +01:00
committed by moneromooo-monero
parent 22792df5cd
commit 868fbe2f2d
7 changed files with 17 additions and 24 deletions

View File

@@ -29,7 +29,6 @@
import QtQuick.Controls 2.2
import QtQuick 2.10
import "." 1.0
import "../components"
TextField {
@@ -38,7 +37,7 @@ TextField {
font.bold: true
horizontalAlignment: TextInput.AlignLeft
selectByMouse: true
color: "white"
color: Style.defaultFontColor
background: Rectangle {
color: "transparent"

View File

@@ -41,7 +41,7 @@ TextArea {
font.bold: true
horizontalAlignment: TextInput.AlignLeft
selectByMouse: true
color: "white"
color: Style.defaultFontColor
wrapMode: Text.WrapAnywhere
onTextChanged: {
if(addressValidation){

View File

@@ -29,6 +29,8 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import "." 1.0
Item {
id: item
property alias text: label.text
@@ -49,10 +51,10 @@ Item {
anchors.bottom: parent.bottom
anchors.bottomMargin: 2 * scaleRatio
anchors.left: parent.left
font.family: "Arial"
font.family: Style.fontRegular.name
font.pixelSize: fontSize
font.bold: fontBold
color: "white"
color: Style.defaultFontColor
onLinkActivated: item.linkActivated()
}

View File

@@ -95,7 +95,7 @@ Item {
font.pixelSize: labelFontSize
font.bold: labelFontBold
textFormat: Text.RichText
color: "white"
color: Style.defaultFontColor
onLinkActivated: item.labelLinkActivated()
MouseArea {

View File

@@ -8,6 +8,7 @@ QtObject {
property QtObject fontLight: FontLoader { id: _fontLight; source: "qrc:/fonts/SFUIDisplay-Light.otf"; }
property QtObject fontRegular: FontLoader { id: _fontRegular; source: "qrc:/fonts/SFUIDisplay-Regular.otf"; }
property string defaultFontColor: "white"
property string inputBoxBackground: "black"
property string inputBoxBackgroundError: "#FFDDDD"
property string inputBoxColor: "white"
@@ -15,4 +16,6 @@ QtObject {
property string buttonBackgroundColorDisabled: "#3B3B3B"
property string buttonTextColor: "white"
property string buttonTextColorDisabled: "black"
property string dividerColor: "white"
property real dividerOpacity: 0.25
}

View File

@@ -1,6 +1,10 @@
import QtQuick 2.0
import "." 1.0
TextEdit {
color: Style.defaultFontColor
font.family: Style.fontRegular.name
wrapMode: Text.Wrap
readOnly: true
selectByMouse: true