Skip to content

Commit 294a978

Browse files
committed
Merge #254: Fix NetworkIndicator font size and padding
e621826 qml: fix NetworkIndicator font size and padding (jarolrod) Pull request description: Addresses [this](#251 (comment)) review feedback, and gets us to fit with the [design file](https://www.figma.com/file/ek8w3n3upbluw5UL2lGhRx/Bitcoin-Core-App-Design?node-id=6010%3A67918&t=N1q0V96d7QISBeRs-4). Overlooked in #251 ### Master | testnet | signet | regtest | | ------- | ------ | ------- | | <img width="752" alt="testnet-master" src="https://user-images.githubusercontent.com/23396902/218172893-9ad1b653-1a25-4fe6-9429-e422b1f799ca.png"> | <img width="752" alt="signet-master" src="https://user-images.githubusercontent.com/23396902/218172938-ac394c8b-608e-444c-89c2-804e953a7b9e.png"> | <img width="752" alt="regtest" src="https://user-images.githubusercontent.com/23396902/218172980-a23d0329-ae53-4719-8d25-f20f8d48cbac.png"> | ### PR | testnet | signet | regtest | | ------- | ------ | ------- | | <img width="752" alt="testnet-pr" src="https://user-images.githubusercontent.com/23396902/218173081-e610be32-c78c-46c9-a741-1e454bbe7a9f.png"> | <img width="752" alt="signet-pr" src="https://user-images.githubusercontent.com/23396902/218173130-483afeb1-bb25-4d53-a9f2-3e2da755ae39.png"> | <img width="752" alt="regtest-pr" src="https://user-images.githubusercontent.com/23396902/218173172-26449e22-5f32-4ad7-8289-5aa5e8d98428.png"> | [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/<PR>) [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/<PR>) [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/<PR>) [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/<PR>) ACKs for top commit: johnny9: ACK e621826 Tree-SHA512: 3094cd1e9fb7f9c0e6e276a80cfa190e9ae80991d6029fdbe793485dcaea76a14e4c5a9734a840b374f04653557d7ca33dd4074020565e81fcef7735abeb080e
2 parents ecf7145 + e621826 commit 294a978

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/qml/components/NetworkIndicator.qml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ import org.bitcoincore.qt 1.0
1212
Button {
1313
id: root
1414
property color bgColor
15-
property int textSize: 18
15+
property int textSize: 15
1616
font.family: "Inter"
1717
font.styleName: "Regular"
1818
font.pixelSize: root.textSize
19-
padding: 7
19+
topPadding: 2
20+
bottomPadding: 2
21+
leftPadding: 7
22+
rightPadding: 7
2023
state: chainModel.currentNetworkName
2124
contentItem: Text {
2225
text: root.text

0 commit comments

Comments
 (0)