Calm down the boldness and tiny spacing adjustments
This commit is contained in:
parent
9661712829
commit
0e8c37a215
5 changed files with 11 additions and 9 deletions
|
|
@ -23,9 +23,10 @@ Singleton {
|
||||||
property real fontSizeXL: 18
|
property real fontSizeXL: 18
|
||||||
property real fontSizeXXL: 24
|
property real fontSizeXXL: 24
|
||||||
|
|
||||||
// Font weight / Unsure if we keep em?
|
// Font weight
|
||||||
property int fontWeightRegular: 400
|
property int fontWeightRegular: 400
|
||||||
property int fontWeightMedium: 500
|
property int fontWeightMedium: 500
|
||||||
|
property int fontWeightSemiBold: 600
|
||||||
property int fontWeightBold: 700
|
property int fontWeightBold: 700
|
||||||
|
|
||||||
// Radii
|
// Radii
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ Row {
|
||||||
fullTitleMetrics.contentWidth, 150 * scaling)
|
fullTitleMetrics.contentWidth, 150 * scaling)
|
||||||
text: getTitle()
|
text: getTitle()
|
||||||
font.pointSize: Style.fontSizeReduced * scaling
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
font.weight: Style.fontWeightBold
|
font.weight: Style.fontWeightMedium
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ Row {
|
||||||
150 * scaling)
|
150 * scaling)
|
||||||
text: getTitle()
|
text: getTitle()
|
||||||
font.pointSize: Style.fontSizeReduced * scaling
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
font.weight: Style.fontWeightBold
|
font.weight: Style.fontWeightMedium
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ Row {
|
||||||
Row {
|
Row {
|
||||||
id: row
|
id: row
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
spacing: Style.marginTiny * scaling
|
spacing: Style.marginSmall * scaling
|
||||||
Row {
|
Row {
|
||||||
id: cpuUsageLayout
|
id: cpuUsageLayout
|
||||||
spacing: Style.marginTiny * scaling
|
spacing: Style.marginTiny * scaling
|
||||||
|
|
@ -43,7 +43,7 @@ Row {
|
||||||
id: cpuUsageText
|
id: cpuUsageText
|
||||||
text: `${SystemStatService.cpuUsage}%`
|
text: `${SystemStatService.cpuUsage}%`
|
||||||
font.pointSize: Style.fontSizeReduced * scaling
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
font.weight: Style.fontWeightBold
|
font.weight: Style.fontWeightMedium
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
color: Color.mPrimary
|
color: Color.mPrimary
|
||||||
|
|
@ -53,7 +53,8 @@ Row {
|
||||||
// CPU Temperature Component
|
// CPU Temperature Component
|
||||||
Row {
|
Row {
|
||||||
id: cpuTempLayout
|
id: cpuTempLayout
|
||||||
spacing: Style.marginTiny * scaling
|
// spacing is thin here to compensate for the vertical thermometer icon
|
||||||
|
spacing: Style.marginTiniest * scaling
|
||||||
|
|
||||||
NIcon {
|
NIcon {
|
||||||
text: "thermometer"
|
text: "thermometer"
|
||||||
|
|
@ -63,7 +64,7 @@ Row {
|
||||||
NText {
|
NText {
|
||||||
text: `${SystemStatService.cpuTemp}°C`
|
text: `${SystemStatService.cpuTemp}°C`
|
||||||
font.pointSize: Style.fontSizeReduced * scaling
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
font.weight: Style.fontWeightBold
|
font.weight: Style.fontWeightMedium
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
color: Color.mPrimary
|
color: Color.mPrimary
|
||||||
|
|
@ -83,7 +84,7 @@ Row {
|
||||||
NText {
|
NText {
|
||||||
text: `${SystemStatService.memoryUsageGb}G`
|
text: `${SystemStatService.memoryUsageGb}G`
|
||||||
font.pointSize: Style.fontSizeReduced * scaling
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
font.weight: Style.fontWeightBold
|
font.weight: Style.fontWeightMedium
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
color: Color.mPrimary
|
color: Color.mPrimary
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,6 @@ Text {
|
||||||
|
|
||||||
font.family: Settings.data.ui.fontFamily
|
font.family: Settings.data.ui.fontFamily
|
||||||
font.pointSize: Style.fontSizeMedium * scaling
|
font.pointSize: Style.fontSizeMedium * scaling
|
||||||
font.weight: Style.fontWeightRegular
|
font.weight: Style.fontWeightMedium
|
||||||
color: Color.mOnSurface
|
color: Color.mOnSurface
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue