Skip to content

Commit 3f25b37

Browse files
authored
Merge pull request #2424 from KomodoPlatform/add/order-options
Add Maker mode, and order form options for `GoodTillCancelled` / `FillOrKill`
2 parents d8ce050 + 98dde1b commit 3f25b37

29 files changed

+664
-412
lines changed

atomic_defi_design/Dex/Components/DexGradientAppButton.qml

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ DexRectangle
2222

2323
property bool text_left_align: false
2424

25-
property int minWidth: 90
2625

2726
property real textScale: 1
2827

atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ RowLayout
7878
Layout.preferredWidth: parent.width - 15
7979

8080
text_value: !details ? "" :
81-
`<font color="${root.color}"><b>${details.ticker}</b></font>&nbsp;&nbsp;&nbsp;<font color="${Dex.CurrentTheme.foregroundColor}">${details.name}</font>`
81+
`<font color="${root.color}"><b>${details.ticker}</b></font><br /><font color="${Dex.CurrentTheme.foregroundColor2}">${details.name}</font>`
8282
font.pixelSize: Style.textSizeSmall3
8383
elide: Text.ElideRight
8484
wrapMode: Text.NoWrap
@@ -96,7 +96,7 @@ RowLayout
9696
font: DexTypo.body2
9797
wrapMode: Label.NoWrap
9898
ToolTip.text: coin_value
99-
Component.onCompleted: font.pixelSize = 11.5
99+
Component.onCompleted: font.pixelSize = 11
100100
}
101101

102102
Dex.Text
@@ -112,7 +112,7 @@ RowLayout
112112
font: DexTypo.body2
113113
wrapMode: Label.NoWrap
114114
ToolTip.text: fiat_value
115-
Component.onCompleted: font.pixelSize = 11.5
115+
Component.onCompleted: font.pixelSize = 11
116116
}
117117
}
118118
}

0 commit comments

Comments
 (0)