CURA-5537 Style improvements

This commit is contained in:
Ian Paschal 2018-07-04 12:51:01 +02:00
parent 7d30cee205
commit d4aaec7355
4 changed files with 5 additions and 2 deletions

View file

@ -74,6 +74,7 @@ Item
} }
spacing: Math.floor(UM.Theme.getSize("narrow_margin").height) spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
width: childrenRect.width width: childrenRect.width
height: childrenRect.height
Label Label
{ {
text: catalog.i18nc("@label", "Version") + ":" text: catalog.i18nc("@label", "Version") + ":"
@ -110,6 +111,7 @@ Item
topMargin: UM.Theme.getSize("default_margin").height topMargin: UM.Theme.getSize("default_margin").height
} }
spacing: Math.floor(UM.Theme.getSize("narrow_margin").height) spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
height: childrenRect.height
Label Label
{ {
text: details.version || catalog.i18nc("@label", "Unknown") text: details.version || catalog.i18nc("@label", "Unknown")

View file

@ -25,7 +25,7 @@ Column
{ {
id: grid id: grid
property var model: toolbox.viewCategory == "material" ? toolbox.authorsModel : toolbox.packagesModel property var model: toolbox.viewCategory == "material" ? toolbox.authorsModel : toolbox.packagesModel
width: parent.width width: parent.width - 2 * parent.padding
columns: 2 columns: 2
columnSpacing: UM.Theme.getSize("default_margin").height columnSpacing: UM.Theme.getSize("default_margin").height
rowSpacing: UM.Theme.getSize("default_margin").width rowSpacing: UM.Theme.getSize("default_margin").width

View file

@ -25,6 +25,7 @@ Item
right: restartButton.right right: restartButton.right
rightMargin: UM.Theme.getSize("default_margin").width rightMargin: UM.Theme.getSize("default_margin").width
} }
color: UM.Theme.getColor("text")
} }
Button Button
{ {

View file

@ -448,7 +448,7 @@
"toolbox_footer_button": [8.0, 2.5], "toolbox_footer_button": [8.0, 2.5],
"toolbox_showcase_spacing": [1.0, 1.0], "toolbox_showcase_spacing": [1.0, 1.0],
"toolbox_header_tab": [8.0, 4.0], "toolbox_header_tab": [8.0, 4.0],
"toolbox_detail_header": [1.0, 12.0], "toolbox_detail_header": [1.0, 14.0],
"toolbox_detail_tile": [1.0, 8.0], "toolbox_detail_tile": [1.0, 8.0],
"toolbox_back_column": [6.0, 1.0], "toolbox_back_column": [6.0, 1.0],
"toolbox_back_button": [4.0, 2.0], "toolbox_back_button": [4.0, 2.0],