styling

electrum/gui/qml/components/InvoiceDialog.qml

@@ -44,24 +44,25 @@ Dialog {
             text: qsTr('Type')
         }
 
+        RowLayout {
+            Layout.fillWidth: true
+            Image {
+                //Layout.rowSpan: 2
+                Layout.preferredWidth: constants.iconSizeSmall
+                Layout.preferredHeight: constants.iconSizeSmall
+                source: invoice.invoiceType == Invoice.LightningInvoice
+                    ? "../../icons/lightning.png"
+                    : "../../icons/bitcoin.png"
+            }
+
             Label {
                 text: invoice.invoiceType == Invoice.OnchainInvoice
-                    ? qsTr('On-chain invoice')
+                        ? qsTr('On chain')
                         : invoice.invoiceType == Invoice.LightningInvoice
-                        ? qsTr('Lightning invoice')
+                            ? qsTr('Lightning')
                             : ''
                 Layout.fillWidth: true
             }
-
-        Label {
-            text: qsTr('Description')
-        }
-
-        Label {
-            text: invoice.message
-            Layout.fillWidth: true
-            wrapMode: Text.Wrap
-            elide: Text.ElideRight
         }
 
         Label {
@@ -71,6 +72,8 @@ Dialog {
         RowLayout {
             Layout.fillWidth: true
             Label {
+                font.pixelSize: constants.fontSizeLarge
+                font.family: FixedFont
                 font.bold: true
                 text: Config.formatSats(invoice.amount, false)
             }
@@ -90,6 +93,17 @@ Dialog {
             }
         }
 
+        Label {
+            text: qsTr('Description')
+        }
+
+        Label {
+            text: invoice.message
+            Layout.fillWidth: true
+            wrapMode: Text.Wrap
+            elide: Text.ElideRight
+        }
+
         Label {
             visible: invoice.invoiceType == Invoice.OnchainInvoice
             text: qsTr('Address')

electrum/gui/qml/components/RequestDialog.qml

@@ -142,6 +142,7 @@ Dialog {
                 text: Config.formatSats(modelItem.amount)
                 font.family: FixedFont
                 font.pixelSize: constants.fontSizeLarge
+                font.bold: true
             }
             Label {
                 visible: modelItem.amount.satsInt != 0

electrum/gui/qml/components/TxDetails.qml

@@ -89,6 +89,7 @@ Pane {
             RowLayout {
                 Label {
                     text: Config.formatSats(txdetails.amount)
+                    font.family: FixedFont
                 }
                 Label {
                     text: Config.baseUnit
@@ -106,6 +107,7 @@ Pane {
                 visible: txdetails.amount.satsInt < 0
                 Label {
                     text: Config.formatSats(txdetails.fee)
+                    font.family: FixedFont
                 }
                 Label {
                     text: Config.baseUnit
@@ -230,7 +232,8 @@ Pane {
                         }
                         Label {
                             text: Config.formatSats(modelData.value)
-                            font.pixelSize: constants.fontSizeLarge
+                            font.pixelSize: constants.fontSizeMedium
+                            font.family: FixedFont
                         }
                         Label {
                             text: Config.baseUnit

electrum/gui/qml/components/controls/GenericShareDialog.qml

@@ -34,6 +34,12 @@ Dialog {
         }
     }
 
+    Flickable {
+        anchors.fill: parent
+        contentHeight: rootLayout.height
+        clip:true
+        interactive: height < contentHeight
+
         ColumnLayout {
             id: rootLayout
             width: parent.width
@@ -105,6 +111,7 @@ Dialog {
                 }
             }
         }
+    }
 
     Component.onCompleted: {
         qr.source = 'image://qrgen/' + dialog.text

electrum/gui/qml/components/controls/TextHighlightPane.qml

@@ -4,6 +4,8 @@ import QtQuick.Controls 2.0
 import QtQuick.Controls.Material 2.0
 
 Pane {
+    topPadding: constants.paddingSmall
+    bottomPadding: constants.paddingSmall
     background: Rectangle {
         color: Qt.lighter(Material.background, 1.15)
         radius: constants.paddingSmall