diff options
| author | Sander Ferdinand <sa.ferdinand@gmail.com> | 2018-01-12 01:45:27 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-03-29 23:04:02 +0100 |
| commit | 6677a185f8ec869a5b8bd8adce349b80a3c9ddd4 (patch) | |
| tree | d3bf0040ca20ada80a2a83535063e01ea13a29ea | |
| parent | a9b6a70d1594f18b77187b5423e88086129429f9 (diff) | |
| download | monzero-gui-6677a185f8ec869a5b8bd8adce349b80a3c9ddd4.tar.gz monzero-gui-6677a185f8ec869a5b8bd8adce349b80a3c9ddd4.tar.xz monzero-gui-6677a185f8ec869a5b8bd8adce349b80a3c9ddd4.zip | |
Some font adjustments
| -rw-r--r-- | components/DatePicker.qml | 5 | ||||
| -rw-r--r-- | components/LineEdit.qml | 8 | ||||
| -rw-r--r-- | components/LineEditMulti.qml | 12 | ||||
| -rw-r--r-- | pages/History.qml | 2 | ||||
| -rw-r--r-- | pages/Transfer.qml | 2 |
5 files changed, 17 insertions, 12 deletions
diff --git a/components/DatePicker.qml b/components/DatePicker.qml index 6fb3605d..c08f97ad 100644 --- a/components/DatePicker.qml +++ b/components/DatePicker.qml @@ -71,10 +71,11 @@ Item { Text { id: inputLabel anchors.top: parent.top + anchors.topMargin: 2 anchors.left: parent.left font.family: Style.fontRegular.name - font.pixelSize: 16 - font.bold: false + font.pixelSize: 14 + font.bold: true textFormat: Text.RichText color: Style.defaultFontColor diff --git a/components/LineEdit.qml b/components/LineEdit.qml index 243cc767..7f46506f 100644 --- a/components/LineEdit.qml +++ b/components/LineEdit.qml @@ -34,7 +34,7 @@ Item { property alias text: input.text property alias placeholderText: placeholderLabel.text property bool placeholderCenter: false - property int placeholderFontSize: 18 + property int placeholderFontSize: 18 * scaleRatio property alias validator: input.validator property alias readOnly : input.readOnly property alias cursorPosition: input.cursorPosition @@ -53,12 +53,12 @@ Item { property alias labelTextFormat: inputLabel.textFormat property string backgroundColor: "transparent" property string tipText: "" - property int labelFontSize: 16 * scaleRatio - property bool labelFontBold: false + property int labelFontSize: 14 * scaleRatio + property bool labelFontBold: true property alias labelWrapMode: inputLabel.wrapMode property alias labelHorizontalAlignment: inputLabel.horizontalAlignment property bool showingHeader: inputLabel.text !== "" || copyButton - property int inputHeight: 42 + property int inputHeight: 42 * scaleRatio signal labelLinkActivated(); // input label, rich text <a> signal signal editingFinished(); signal accepted(); diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml index abed2696..5cc76e2d 100644 --- a/components/LineEditMulti.qml +++ b/components/LineEditMulti.qml @@ -39,7 +39,7 @@ ColumnLayout { property alias readOnly: multiLine.readOnly property alias addressValidation: multiLine.addressValidation property alias labelButtonText: labelButton.text - property bool labelFontBold: false + property bool labelFontBold: true property bool labelButtonVisible: false property bool copyButton: false signal labelButtonClicked(); @@ -50,14 +50,14 @@ ColumnLayout { id: inputLabelRect color: "transparent" Layout.fillWidth: true - height: inputLabel.height + 10 + height: (inputLabel.height + 10) * scaleRatio Text { id: inputLabel anchors.top: parent.top anchors.left: parent.left font.family: Style.fontRegular.name - font.pixelSize: 16 * scaleRatio + font.pixelSize: 14 * scaleRatio font.bold: labelFontBold textFormat: Text.RichText color: Style.defaultFontColor @@ -92,15 +92,15 @@ ColumnLayout { addressValidation: true anchors.top: inputLabelRect.bottom Layout.fillWidth: true - topPadding: 10 - bottomPadding: 10 + topPadding: 10 * scaleRatio + bottomPadding: 10 * scaleRatio Text { id: placeholderLabel visible: multiLine.text ? false : true anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: 10 + anchors.leftMargin: 10 * scaleRatio opacity: 0.25 color: Style.defaultFontColor font.family: Style.fontRegular.name diff --git a/pages/History.qml b/pages/History.qml index 2e44b940..6a0206f8 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -218,6 +218,8 @@ Rectangle { id: transactionPriority Layout.minimumWidth: 120 * scaleRatio text: qsTr("Sort") + translationManager.emptyString + fontSize: 14 + fontBold: true } ListModel { diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 6e45b62a..96bd0dc1 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -161,6 +161,8 @@ Rectangle { Label { id: transactionPriority text: qsTr("Transaction priority") + translationManager.emptyString + fontBold: true + fontSize: 14 } // Note: workaround for translations in listElements // ListElement: cannot use script for property value, so |