Improve contrast - brighten up borders

This commit is contained in:
Sander Ferdinand 2018-04-30 00:52:48 +02:00
parent fe53cddd03
commit 7418a10d28
11 changed files with 25 additions and 15 deletions

View file

@ -578,7 +578,7 @@ Rectangle {
anchors.rightMargin: 0 anchors.rightMargin: 0
anchors.bottom: networkStatus.top; anchors.bottom: networkStatus.top;
height: 10 * scaleRatio height: 10 * scaleRatio
color: "black" color: "transparent"
} }
NetworkStatusItem { NetworkStatusItem {

View file

@ -57,7 +57,12 @@ RowLayout {
radius: 3 radius: 3
y: 0 y: 0
color: "transparent" 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 { Rectangle {

View file

@ -40,7 +40,7 @@ Item {
property bool placeholderFontBold: false property bool placeholderFontBold: false
property int placeholderFontSize: 18 * scaleRatio property int placeholderFontSize: 18 * scaleRatio
property string placeholderColor: MoneroComponents.Style.defaultFontColor property string placeholderColor: MoneroComponents.Style.defaultFontColor
property real placeholderOpacity: 0.25 property real placeholderOpacity: 0.35
property alias validator: input.validator property alias validator: input.validator
property alias readOnly : input.readOnly property alias readOnly : input.readOnly
@ -52,9 +52,9 @@ Item {
property bool copyButton: false property bool copyButton: false
property string borderColor: { property string borderColor: {
if(input.activeFocus){ if(input.activeFocus){
return Qt.rgba(255, 255, 255, 0.35); return MoneroComponents.Style.inputBorderColorActive;
} else { } else {
return Qt.rgba(255, 255, 255, 0.25); return MoneroComponents.Style.inputBorderColorInActive;
} }
} }
property bool borderDisabled: false property bool borderDisabled: false

View file

@ -112,7 +112,7 @@ ColumnLayout {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 10 * scaleRatio anchors.leftMargin: 10 * scaleRatio
opacity: 0.25 opacity: 0.35
color: MoneroComponents.Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
font.family: MoneroComponents.Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 18 * scaleRatio font.pixelSize: 18 * scaleRatio
@ -125,11 +125,11 @@ ColumnLayout {
border.width: 1 border.width: 1
border.color: { border.color: {
if(multiLine.error && multiLine.text !== ""){ if(multiLine.error && multiLine.text !== ""){
return Qt.rgba(255, 0, 0, 0.45); return MoneroComponents.Style.inputBorderColorInvalid;
} else if(multiLine.activeFocus){ } else if(multiLine.activeFocus){
return Qt.rgba(255, 255, 255, 0.35); return MoneroComponents.Style.inputBorderColorActive;
} else { } else {
return Qt.rgba(255, 255, 255, 0.25); return MoneroComponents.Style.inputBorderColorInActive;
} }
} }
radius: 4 radius: 4

View file

@ -34,7 +34,7 @@ import "../components" as MoneroComponents
Rectangle { Rectangle {
id: item id: item
color: "black" color: "transparent"
property var connected: Wallet.ConnectionStatus_Disconnected property var connected: Wallet.ConnectionStatus_Disconnected
function getConnectionStatusString(status) { function getConnectionStatusString(status) {

View file

@ -48,7 +48,7 @@ GridLayout {
property bool placeholderFontBold: false property bool placeholderFontBold: false
property int placeholderFontSize: 18 * scaleRatio property int placeholderFontSize: 18 * scaleRatio
property string placeholderColor: MoneroComponents.Style.defaultFontColor 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 lineEditBorderColor: Qt.rgba(0, 0, 0, 0.15)
property string lineEditBackgroundColor: "white" property string lineEditBackgroundColor: "white"

View file

@ -43,6 +43,7 @@ Item {
property int dropdownHeight: 42 property int dropdownHeight: 42
property int fontHeaderSize: 16 * scaleRatio property int fontHeaderSize: 16 * scaleRatio
property int fontItemSize: 14 * scaleRatio property int fontItemSize: 14 * scaleRatio
property string colorBorder: MoneroComponents.Style.inputBorderColorInActive
property string colorHeaderBackground: "transparent" property string colorHeaderBackground: "transparent"
property bool headerBorder: true property bool headerBorder: true
property bool headerFontBold: false property bool headerFontBold: false
@ -80,7 +81,7 @@ Item {
Rectangle { Rectangle {
color: dropdown.colorHeaderBackground color: dropdown.colorHeaderBackground
border.width: dropdown.headerBorder ? 1 : 0 border.width: dropdown.headerBorder ? 1 : 0
border.color: Qt.rgba(1, 1, 1, 0.25) border.color: dropdown.colorBorder
radius: 4 radius: 4
anchors.fill: parent anchors.fill: parent
} }

View file

@ -17,6 +17,9 @@ QtObject {
property string inputBoxBackgroundError: "#FFDDDD" property string inputBoxBackgroundError: "#FFDDDD"
property string inputBoxColor: "white" property string inputBoxColor: "white"
property string legacy_placeholderFontColor: "#BABABA" 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 buttonBackgroundColor: "#FA6800"
property string buttonBackgroundColorHover: "#E65E00" property string buttonBackgroundColorHover: "#E65E00"

View file

@ -248,6 +248,7 @@ Rectangle {
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
releasedColor: "#404040" releasedColor: "#404040"
pressedColor: "#202020" pressedColor: "#202020"
colorBorder: "#404040"
colorHeaderBackground: "#404040" colorHeaderBackground: "#404040"
onChanged: { onChanged: {

View file

@ -254,7 +254,7 @@ Rectangle {
lineEditBackgroundColor: "transparent" lineEditBackgroundColor: "transparent"
lineEditFontColor: "white" lineEditFontColor: "white"
lineEditBorderColor: Qt.rgba(255, 255, 255, 0.35) lineEditBorderColor: Style.inputBorderColorActive
daemonAddrLabelText: qsTr("Address") daemonAddrLabelText: qsTr("Address")
daemonPortLabelText: qsTr("Port") daemonPortLabelText: qsTr("Port")
@ -540,7 +540,7 @@ Rectangle {
ListModel { ListModel {
id: logLevel id: logLevel
ListElement { name: "wow"; column1: "0"; } ListElement { name: "none"; column1: "0"; }
ListElement { column1: "1"; } ListElement { column1: "1"; }
ListElement { column1: "2"; } ListElement { column1: "2"; }
ListElement { column1: "3"; } ListElement { column1: "3"; }

View file

@ -131,7 +131,7 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
radius: 2 radius: 2
border.color: Qt.rgba(255, 255, 255, 0.25) border.color: Style.inputBorderColorInActive
border.width: 1 border.width: 1
color: "transparent" color: "transparent"