Skip to content
Snippets Groups Projects
Commit 55eb0be0 authored by Alexander's avatar Alexander
Browse files

[*] fix remarks by andrey daragan

- add factor pt
- change some elements color in accroding to design-guide
- add borders to headers
- small fixes
parent a68f2a40
No related branches found
No related tags found
1 merge request!49Features 2608
Pipeline #1369 passed with stage
in 20 minutes and 10 seconds
...@@ -14,7 +14,7 @@ RadioButton { ...@@ -14,7 +14,7 @@ RadioButton {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: "#3E3853" color: "#3E3853"
font.pointSize: 14 font.pointSize: 14 * pt
font.wordSpacing: 0 font.wordSpacing: 0
font.family: "Roboto" font.family: "Roboto"
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
......
...@@ -5,6 +5,8 @@ DapUiQmlScreenDialogAddWalletForm { ...@@ -5,6 +5,8 @@ DapUiQmlScreenDialogAddWalletForm {
id: dialogAddWallet id: dialogAddWallet
focus: true focus: true
sourceCustomArrow: popup.visible ? "qrc:/res/icons/ic_arrow_drop_up.png" : "qrc:/res/icons/icon_arrow_down.png"
Connections { Connections {
target: nextButton target: nextButton
onClicked: { onClicked: {
......
...@@ -5,12 +5,15 @@ import "../" ...@@ -5,12 +5,15 @@ import "../"
DapUiQmlScreen { DapUiQmlScreen {
property alias nextButton: nextButton property alias nextButton: nextButton
property alias sourceCustomArrow: comboBoxChooseSignatureType.sourceArrow
property bool isWordsRecoveryMethodChecked: selectionWords.checked property bool isWordsRecoveryMethodChecked: selectionWords.checked
property bool isQRCodeRecoveryMethodChecked: selectionQRcode.checked property bool isQRCodeRecoveryMethodChecked: selectionQRcode.checked
property bool isExportToFileRecoveryMethodChecked: selectionExportToFile.checked property bool isExportToFileRecoveryMethodChecked: selectionExportToFile.checked
id: addWalletMenu id: addWalletMenu
color: "#EDEFF2" color: "#F8F7FA"
border.width: 1 * pt
border.color: "#E3E2E6"
Rectangle { Rectangle {
id: nameWalletTextArea id: nameWalletTextArea
...@@ -25,9 +28,9 @@ DapUiQmlScreen { ...@@ -25,9 +28,9 @@ DapUiQmlScreen {
color: "#ffffff" color: "#ffffff"
text: qsTr("Name of wallet") text: qsTr("Name of wallet")
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 16 anchors.leftMargin: 16 * pt
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font.pointSize: 12 font.pixelSize: 12 * pt
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
font.family: "Roboto" font.family: "Roboto"
font.styleName: "Normal" font.styleName: "Normal"
...@@ -38,7 +41,7 @@ DapUiQmlScreen { ...@@ -38,7 +41,7 @@ DapUiQmlScreen {
Rectangle { Rectangle {
id: inputNameWalletArea id: inputNameWalletArea
height: 68 height: 68
color: "#EDEFF2" color: "#F8F7FA"
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 1 anchors.leftMargin: 1
anchors.right: parent.right anchors.right: parent.right
...@@ -50,7 +53,7 @@ DapUiQmlScreen { ...@@ -50,7 +53,7 @@ DapUiQmlScreen {
anchors.left: parent.left anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 20 anchors.leftMargin: 20
font.pointSize: 16 font.pixelSize: 16 * pt
color: "#070023" color: "#070023"
font.family: "Roboto" font.family: "Roboto"
font.styleName: "Normal" font.styleName: "Normal"
...@@ -73,7 +76,7 @@ DapUiQmlScreen { ...@@ -73,7 +76,7 @@ DapUiQmlScreen {
id: chooseSignatureTypeText id: chooseSignatureTypeText
color: "#ffffff" color: "#ffffff"
text: qsTr("Choose signature type") text: qsTr("Choose signature type")
font.pointSize: 12 font.pixelSize: 12 * pt
anchors.leftMargin: 16 anchors.leftMargin: 16
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
font.styleName: "Normal" font.styleName: "Normal"
...@@ -87,7 +90,7 @@ DapUiQmlScreen { ...@@ -87,7 +90,7 @@ DapUiQmlScreen {
Rectangle { Rectangle {
id: chooseSignatureTypeArea id: chooseSignatureTypeArea
height: 68 height: 68
color: "#EDEFF2" color: "#F8F7FA"
anchors.leftMargin: 1 anchors.leftMargin: 1
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
...@@ -95,6 +98,7 @@ DapUiQmlScreen { ...@@ -95,6 +98,7 @@ DapUiQmlScreen {
DapUiQmlWidgetSignatureTypeComboBox { DapUiQmlWidgetSignatureTypeComboBox {
id: comboBoxChooseSignatureType id: comboBoxChooseSignatureType
width: 368
height: 20 height: 20
anchors { anchors {
verticalCenter: chooseSignatureTypeArea.verticalCenter verticalCenter: chooseSignatureTypeArea.verticalCenter
...@@ -104,8 +108,6 @@ DapUiQmlScreen { ...@@ -104,8 +108,6 @@ DapUiQmlScreen {
leftMargin: 8 leftMargin: 8
rightMargin: 32 rightMargin: 32
} }
sourceArrow: popup.visible ? "qrc:/Resources/Icons/ic_arrow_drop_up.png" : "qrc:/Resources/Icons/icon_arrow_down.png"
} }
} }
...@@ -126,7 +128,7 @@ DapUiQmlScreen { ...@@ -126,7 +128,7 @@ DapUiQmlScreen {
font.styleName: "Normal" font.styleName: "Normal"
font.weight: Font.Normal font.weight: Font.Normal
anchors.left: parent.left anchors.left: parent.left
font.pointSize: 12 font.pixelSize: 12 * pt
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
anchors.leftMargin: 16 anchors.leftMargin: 16
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
...@@ -183,7 +185,7 @@ DapUiQmlScreen { ...@@ -183,7 +185,7 @@ DapUiQmlScreen {
font.family: "Roboto" font.family: "Roboto"
font.styleName: "Normal" font.styleName: "Normal"
font.weight: Font.Normal font.weight: Font.Normal
font.pointSize: 18 font.pixelSize: 18 * pt
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
......
...@@ -5,7 +5,9 @@ import "../" ...@@ -5,7 +5,9 @@ import "../"
DapUiQmlScreen { DapUiQmlScreen {
height: 36 * pt height: 36 * pt
color: "#edeff2" color: "#F8F7FA"
border.width: 1 * pt
border.color: "#E3E2E6"
property string backButtonNormal : "qrc:/res/icons/close_icon.png" property string backButtonNormal : "qrc:/res/icons/close_icon.png"
property string backButtonHovered : "qrc:/res/icons/close_icon_hover.png" property string backButtonHovered : "qrc:/res/icons/close_icon_hover.png"
...@@ -48,7 +50,7 @@ DapUiQmlScreen { ...@@ -48,7 +50,7 @@ DapUiQmlScreen {
Text { Text {
text: title text: title
horizontalAlignment: Qt.AlignLeft horizontalAlignment: Qt.AlignLeft
font.pointSize: 14 font.pointSize: 14 * pt
font.family: "Roboto" font.family: "Roboto"
font.weight: Font.Normal font.weight: Font.Normal
font.styleName: "Normal" font.styleName: "Normal"
......
...@@ -18,7 +18,7 @@ Button { ...@@ -18,7 +18,7 @@ Button {
contentItem: Rectangle { contentItem: Rectangle {
id: background id: background
anchors.fill: parent anchors.fill: parent
color: "transparent" color: "#070023"
Text { Text {
id: templateText id: templateText
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment