aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-03-19 23:52:06 +0200
committerRiccardo Spagni <ric@spagni.net>2017-03-19 23:52:06 +0200
commitdeb75afb7e037d3fe79a982d6bf5aff6eee4349e (patch)
tree2bb7eb1ea508416ebb8aba70691e18299e23bb2e
parent62089df6e74cc60950525a40ed9cb6a62a971db7 (diff)
parenta9e975f2cd6cbb523f093387454a8d67affde3aa (diff)
downloadmonzero-gui-deb75afb7e037d3fe79a982d6bf5aff6eee4349e.tar.gz
monzero-gui-deb75afb7e037d3fe79a982d6bf5aff6eee4349e.tar.xz
monzero-gui-deb75afb7e037d3fe79a982d6bf5aff6eee4349e.zip
Merge pull request #574
a9e975f Mail.qml (xmr-eric) 1d74fa6 Titlebar.qml (xmr-eric) d920b20 SearchInput.qml (xmr-eric) ec5c73e Checkbox.qml (xmr-eric) f3dfd18 DatePicker.qml (xmr-eric) 3ecffbc AddressbookTable.qml (xmr-eric) b75fee7 TipItem.qml (xmr-eric) 94ca32a MiddlePanel.qml (xmr-eric) 2839bcc BasicPanel.qml (xmr-eric) 91e01d5 HistoryTable.qml (xmr-eric) 760f345 DashboardTable.qml (xmr-eric) 1915759 HistoryTable.qml (xmr-eric) 172243c BasicPanel.qml (xmr-eric)
-rw-r--r--BasicPanel.qml3
-rw-r--r--MiddlePanel.qml4
-rw-r--r--components/AddressBookTable.qml3
-rw-r--r--components/CheckBox.qml1
-rw-r--r--components/DashboardTable.qml4
-rw-r--r--components/DatePicker.qml3
-rw-r--r--components/HistoryTable.qml9
-rw-r--r--components/SearchInput.qml2
-rw-r--r--components/TipItem.qml1
-rw-r--r--components/TitleBar.qml1
-rw-r--r--main.qml1
11 files changed, 0 insertions, 32 deletions
diff --git a/BasicPanel.qml b/BasicPanel.qml
index 3d2d45d1..3f1ac074 100644
--- a/BasicPanel.qml
+++ b/BasicPanel.qml
@@ -90,7 +90,6 @@ Rectangle {
height: 20
font.family: "Arial"
font.pixelSize: 12
- font.letterSpacing: -1
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom
@@ -104,7 +103,6 @@ Rectangle {
height: 20
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom
@@ -142,7 +140,6 @@ Rectangle {
height: 20
font.family: "Arial"
font.pixelSize: 14
- font.letterSpacing: -1
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom
diff --git a/MiddlePanel.qml b/MiddlePanel.qml
index 2190c2a8..9951a1d6 100644
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -206,7 +206,6 @@ Rectangle {
height: 20
font.family: "Arial"
font.pixelSize: 12
- font.letterSpacing: -1
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom
@@ -220,7 +219,6 @@ Rectangle {
height: 20
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom
@@ -245,7 +243,6 @@ Rectangle {
height: 20
font.family: "Arial"
font.pixelSize: 12
- font.letterSpacing: -1
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom
@@ -259,7 +256,6 @@ Rectangle {
height: 20
font.family: "Arial"
font.pixelSize: 14
- font.letterSpacing: -1
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom
diff --git a/components/AddressBookTable.qml b/components/AddressBookTable.qml
index 77b9dfe2..b8de57a9 100644
--- a/components/AddressBookTable.qml
+++ b/components/AddressBookTable.qml
@@ -87,7 +87,6 @@ ListView {
anchors.rightMargin: 40
font.family: "Arial"
font.pixelSize: 16
- font.letterSpacing: -1
color: "#545454"
text: address
}
@@ -101,7 +100,6 @@ ListView {
width: 139
font.family: "Arial"
font.pixelSize: 12
- font.letterSpacing: -1
color: "#535353"
text: qsTr("Payment ID:") + translationManager.emptyString
}
@@ -117,7 +115,6 @@ ListView {
font.family: "Arial"
font.pixelSize: 13
- font.letterSpacing: -1
color: "#545454"
text: paymentId
}
diff --git a/components/CheckBox.qml b/components/CheckBox.qml
index b9bfe3ec..ffe585c3 100644
--- a/components/CheckBox.qml
+++ b/components/CheckBox.qml
@@ -76,7 +76,6 @@ Item {
anchors.leftMargin: 25 + 12
font.family: "Arial"
font.pixelSize: checkBox.fontSize
- font.letterSpacing: -1
color: "#525252"
}
diff --git a/components/DashboardTable.qml b/components/DashboardTable.qml
index 1dc0d3b4..ad0b57b6 100644
--- a/components/DashboardTable.qml
+++ b/components/DashboardTable.qml
@@ -145,7 +145,6 @@ ListView {
Text {
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: "#000000"
text: date
}
@@ -153,7 +152,6 @@ ListView {
Text {
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: "#000000"
text: time
}
@@ -175,7 +173,6 @@ ListView {
Text {
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: "#000000"
text: balance
}
@@ -208,7 +205,6 @@ ListView {
anchors.bottom: parent.bottom
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: out ? "#FF4F41" : "#36B05B"
text: amount
}
diff --git a/components/DatePicker.qml b/components/DatePicker.qml
index ac67f8ed..6485fa14 100644
--- a/components/DatePicker.qml
+++ b/components/DatePicker.qml
@@ -285,7 +285,6 @@ Item {
anchors.centerIn: parent
font.family: "Arial"
font.pixelSize: 12
- font.letterSpacing: -1
font.bold: dayArea.pressed
text: styleData.date.getDate()
color: {
@@ -322,7 +321,6 @@ Item {
elide: Text.ElideRight
font.family: "Arial"
font.pixelSize: 9
- font.letterSpacing: -1
color: "#535353"
text: {
var locale = Qt.locale()
@@ -339,7 +337,6 @@ Item {
anchors.centerIn: parent
font.family: "Arial"
font.pixelSize: 12
- font.letterSpacing: -1
color: "#4A4646"
text: styleData.title
}
diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml
index 711bc289..f4115435 100644
--- a/components/HistoryTable.qml
+++ b/components/HistoryTable.qml
@@ -199,7 +199,6 @@ ListView {
anchors.bottom: parent.bottom
font.family: "Arial"
font.pixelSize: 12
- font.letterSpacing: -1
color: "#535353"
text: paymentId !== "" ? qsTr("Payment ID:") + translationManager.emptyString : ""
}
@@ -213,7 +212,6 @@ ListView {
//elide: Text.ElideRight
font.family: "Arial"
font.pixelSize:13
- font.letterSpacing: -1
color: "#545454"
text: paymentId
@@ -228,7 +226,6 @@ ListView {
//elide: Text.ElideRight
font.family: "Arial"
font.pixelSize:13
- font.letterSpacing: -1
color: "#545454"
text: "(" + lookupPaymentID(paymentId) + ")"
visible: text !== "()"
@@ -250,7 +247,6 @@ ListView {
width: 86
font.family: "Arial"
font.pixelSize: 12
- font.letterSpacing: -1
color: "#535353"
text: qsTr("BlockHeight:") + translationManager.emptyString
}
@@ -312,7 +308,6 @@ ListView {
Text {
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: "#000000"
text: date
}
@@ -320,7 +315,6 @@ ListView {
Text {
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: "#000000"
text: time
}
@@ -345,7 +339,6 @@ ListView {
Text {
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: "#000000"
text: balance
}
@@ -380,7 +373,6 @@ ListView {
anchors.bottom: parent.bottom
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: isOut ? "#FF4F41" : "#36B05B"
text: displayAmount
}
@@ -406,7 +398,6 @@ ListView {
anchors.bottom: parent.bottom
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: "#FF4F41"
text: fee
}
diff --git a/components/SearchInput.qml b/components/SearchInput.qml
index 35be896f..cc1a875b 100644
--- a/components/SearchInput.qml
+++ b/components/SearchInput.qml
@@ -100,7 +100,6 @@ Item {
font.family: "Arial"
font.pixelSize: 12
font.bold: true
- font.letterSpacing: -1
color: "#4A4747"
text: "NAME"
}
@@ -195,7 +194,6 @@ Item {
anchors.rightMargin: 12
font.family: "Arial"
font.bold: true
- font.letterSpacing: -1
font.pixelSize: 12
color: delegateArea.pressed || parent.isCurrent ? "#FFFFFF" : "#4A4646"
text: name
diff --git a/components/TipItem.qml b/components/TipItem.qml
index f309b172..b0e09cb7 100644
--- a/components/TipItem.qml
+++ b/components/TipItem.qml
@@ -65,7 +65,6 @@ Window {
lineHeight: 0.7
font.family: "Arial"
font.pixelSize: 12
- font.letterSpacing: -1
color: "#FFFFFF"
}
}
diff --git a/components/TitleBar.qml b/components/TitleBar.qml
index bcbc0e64..4a8bbb7c 100644
--- a/components/TitleBar.qml
+++ b/components/TitleBar.qml
@@ -47,7 +47,6 @@ Rectangle {
anchors.centerIn: parent
font.family: "Arial"
font.pixelSize: 15
- font.letterSpacing: -1
color: "#FFFFFF"
text: titleBar.title
visible: customDecorations
diff --git a/main.qml b/main.qml
index 6432803f..ea11a8a8 100644
--- a/main.qml
+++ b/main.qml
@@ -1253,7 +1253,6 @@ ApplicationWindow {
lineHeight: 0.7
font.family: "Arial"
font.pixelSize: 12
- font.letterSpacing: -1
color: "#FFFFFF"
}
}