aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LeftPanel.qml2
-rw-r--r--components/CheckBox.qml7
-rw-r--r--components/LineEdit.qml6
-rw-r--r--components/LineEditMulti.qml8
-rw-r--r--components/NetworkStatusItem.qml2
-rw-r--r--components/RemoteNodeEdit.qml2
-rw-r--r--components/StandardDropdown.qml3
-rw-r--r--components/Style.qml3
-rw-r--r--pages/History.qml1
-rw-r--r--pages/Settings.qml4
-rw-r--r--pages/Transfer.qml2
11 files changed, 25 insertions, 15 deletions
diff --git a/LeftPanel.qml b/LeftPanel.qml
index 5da80c49..f8ec6e9f 100644
--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -578,7 +578,7 @@ Rectangle {
anchors.rightMargin: 0
anchors.bottom: networkStatus.top;
height: 10 * scaleRatio
- color: "black"
+ color: "transparent"
}
NetworkStatusItem {
diff --git a/components/CheckBox.qml b/components/CheckBox.qml
index 4de0212f..72716150 100644
--- a/components/CheckBox.qml
+++ b/components/CheckBox.qml
@@ -57,7 +57,12 @@ RowLayout {
radius: 3
y: 0
color: "transparent"
- border.color: checkBox.checked ? Qt.rgba(1, 1, 1, 0.35) : Qt.rgba(1, 1, 1, 0.25)
+ border.color:
+ if(checkBox.checked){
+ return MoneroComponents.Style.inputBorderColorActive;
+ } else {
+ return MoneroComponents.Style.inputBorderColorInActive;
+ }
}
Rectangle {
diff --git a/components/LineEdit.qml b/components/LineEdit.qml
index 50d40ae3..8a194c12 100644
--- a/components/LineEdit.qml
+++ b/components/LineEdit.qml
@@ -40,7 +40,7 @@ Item {
property bool placeholderFontBold: false
property int placeholderFontSize: 18 * scaleRatio
property string placeholderColor: MoneroComponents.Style.defaultFontColor
- property real placeholderOpacity: 0.25
+ property real placeholderOpacity: 0.35
property alias validator: input.validator
property alias readOnly : input.readOnly
@@ -52,9 +52,9 @@ Item {
property bool copyButton: false
property string borderColor: {
if(input.activeFocus){
- return Qt.rgba(255, 255, 255, 0.35);
+ return MoneroComponents.Style.inputBorderColorActive;
} else {
- return Qt.rgba(255, 255, 255, 0.25);
+ return MoneroComponents.Style.inputBorderColorInActive;
}
}
property bool borderDisabled: false
diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml
index 3468c9d5..8243a7ee 100644
--- a/components/LineEditMulti.qml
+++ b/components/LineEditMulti.qml
@@ -112,7 +112,7 @@ ColumnLayout {
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: 10 * scaleRatio
- opacity: 0.25
+ opacity: 0.35
color: MoneroComponents.Style.defaultFontColor
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 18 * scaleRatio
@@ -125,11 +125,11 @@ ColumnLayout {
border.width: 1
border.color: {
if(multiLine.error && multiLine.text !== ""){
- return Qt.rgba(255, 0, 0, 0.45);
+ return MoneroComponents.Style.inputBorderColorInvalid;
} else if(multiLine.activeFocus){
- return Qt.rgba(255, 255, 255, 0.35);
+ return MoneroComponents.Style.inputBorderColorActive;
} else {
- return Qt.rgba(255, 255, 255, 0.25);
+ return MoneroComponents.Style.inputBorderColorInActive;
}
}
radius: 4
diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml
index 17acc1c9..e9b1b3ae 100644
--- a/components/NetworkStatusItem.qml
+++ b/components/NetworkStatusItem.qml
@@ -34,7 +34,7 @@ import "../components" as MoneroComponents
Rectangle {
id: item
- color: "black"
+ color: "transparent"
property var connected: Wallet.ConnectionStatus_Disconnected
function getConnectionStatusString(status) {
diff --git a/components/RemoteNodeEdit.qml b/components/RemoteNodeEdit.qml
index 82b56899..ecc8b496 100644
--- a/components/RemoteNodeEdit.qml
+++ b/components/RemoteNodeEdit.qml
@@ -48,7 +48,7 @@ GridLayout {
property bool placeholderFontBold: false
property int placeholderFontSize: 18 * scaleRatio
property string placeholderColor: MoneroComponents.Style.defaultFontColor
- property real placeholderOpacity: 0.25
+ property real placeholderOpacity: 0.35
property string lineEditBorderColor: Qt.rgba(0, 0, 0, 0.15)
property string lineEditBackgroundColor: "white"
diff --git a/components/StandardDropdown.qml b/components/StandardDropdown.qml
index fce7cc45..7ff021ed 100644
--- a/components/StandardDropdown.qml
+++ b/components/StandardDropdown.qml
@@ -43,6 +43,7 @@ Item {
property int dropdownHeight: 42
property int fontHeaderSize: 16 * scaleRatio
property int fontItemSize: 14 * scaleRatio
+ property string colorBorder: MoneroComponents.Style.inputBorderColorInActive
property string colorHeaderBackground: "transparent"
property bool headerBorder: true
property bool headerFontBold: false
@@ -80,7 +81,7 @@ Item {
Rectangle {
color: dropdown.colorHeaderBackground
border.width: dropdown.headerBorder ? 1 : 0
- border.color: Qt.rgba(1, 1, 1, 0.25)
+ border.color: dropdown.colorBorder
radius: 4
anchors.fill: parent
}
diff --git a/components/Style.qml b/components/Style.qml
index 3b917f97..09bff5a7 100644
--- a/components/Style.qml
+++ b/components/Style.qml
@@ -17,6 +17,9 @@ QtObject {
property string inputBoxBackgroundError: "#FFDDDD"
property string inputBoxColor: "white"
property string legacy_placeholderFontColor: "#BABABA"
+ property string inputBorderColorActive: Qt.rgba(255, 255, 255, 0.38)
+ property string inputBorderColorInActive: Qt.rgba(255, 255, 255, 0.32)
+ property string inputBorderColorInvalid: Qt.rgba(255, 0, 0, 0.40)
property string buttonBackgroundColor: "#FA6800"
property string buttonBackgroundColorHover: "#E65E00"
diff --git a/pages/History.qml b/pages/History.qml
index f9855189..ae96ab7c 100644
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -248,6 +248,7 @@ Rectangle {
shadowPressedColor: "#B32D00"
releasedColor: "#404040"
pressedColor: "#202020"
+ colorBorder: "#404040"
colorHeaderBackground: "#404040"
onChanged: {
diff --git a/pages/Settings.qml b/pages/Settings.qml
index 0b27c898..cb336624 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -254,7 +254,7 @@ Rectangle {
lineEditBackgroundColor: "transparent"
lineEditFontColor: "white"
- lineEditBorderColor: Qt.rgba(255, 255, 255, 0.35)
+ lineEditBorderColor: Style.inputBorderColorActive
daemonAddrLabelText: qsTr("Address")
daemonPortLabelText: qsTr("Port")
@@ -540,7 +540,7 @@ Rectangle {
ListModel {
id: logLevel
- ListElement { name: "wow"; column1: "0"; }
+ ListElement { name: "none"; column1: "0"; }
ListElement { column1: "1"; }
ListElement { column1: "2"; }
ListElement { column1: "3"; }
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 68c95f71..97381f47 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -131,7 +131,7 @@ Rectangle {
Layout.fillWidth: true
radius: 2
- border.color: Qt.rgba(255, 255, 255, 0.25)
+ border.color: Style.inputBorderColorInActive
border.width: 1
color: "transparent"