Merge branch 'bootstrap-icons' of https://github.com/noctalia-dev/noctalia-shell into bootstrap-icons
This commit is contained in:
commit
a00676f5db
3 changed files with 18 additions and 3 deletions
|
|
@ -47,7 +47,8 @@ NBox {
|
||||||
}
|
}
|
||||||
NText {
|
NText {
|
||||||
text: `System uptime: ${uptimeText}`
|
text: `System uptime: ${uptimeText}`
|
||||||
color: Color.mOnSurface
|
font.pointSize: Style.fontSizeS * scaling
|
||||||
|
color: Color.mOnSurfaceVariant
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,13 @@ Rectangle {
|
||||||
border.color: root.enabled && root.hovering ? colorBorderHover : colorBorder
|
border.color: root.enabled && root.hovering ? colorBorderHover : colorBorder
|
||||||
border.width: Math.max(1, Style.borderS * scaling)
|
border.width: Math.max(1, Style.borderS * scaling)
|
||||||
|
|
||||||
|
Behavior on color {
|
||||||
|
ColorAnimation {
|
||||||
|
duration: Style.animationNormal
|
||||||
|
easing.type: Easing.InOutQuad
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
NIcon {
|
NIcon {
|
||||||
icon: root.icon
|
icon: root.icon
|
||||||
font.pointSize: Math.max(1, root.width * 0.4)
|
font.pointSize: Math.max(1, root.width * 0.4)
|
||||||
|
|
@ -46,6 +53,13 @@ Rectangle {
|
||||||
x: (root.width - width) / 2
|
x: (root.width - width) / 2
|
||||||
// Center vertically accounting for font metrics
|
// Center vertically accounting for font metrics
|
||||||
y: (root.height - height) / 2 + (height - contentHeight) / 2
|
y: (root.height - height) / 2 + (height - contentHeight) / 2
|
||||||
|
|
||||||
|
Behavior on color {
|
||||||
|
ColorAnimation {
|
||||||
|
duration: Style.animationFast
|
||||||
|
easing.type: Easing.InOutQuad
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NTooltip {
|
NTooltip {
|
||||||
|
|
|
||||||
|
|
@ -112,8 +112,8 @@ Item {
|
||||||
RowLayout {
|
RowLayout {
|
||||||
id: contentLayout
|
id: contentLayout
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Style.marginM * scaling
|
anchors.margins: Style.marginL * scaling
|
||||||
spacing: Style.marginS * scaling
|
spacing: Style.marginL * scaling
|
||||||
|
|
||||||
// Icon
|
// Icon
|
||||||
NIcon {
|
NIcon {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue