Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Tim Kuipers 2016-07-12 11:22:37 +02:00
commit 26612e17b6
6 changed files with 41 additions and 4 deletions

View file

@ -51,7 +51,13 @@ UM.ManagementPage
detailsVisible: true
section.property: "section"
section.delegate: Label { text: section }
section.delegate: Label
{
text: section
font.bold: true
anchors.left: parent.left;
anchors.leftMargin: UM.Theme.getSize("default_lining").width;
}
buttons: [
Button

View file

@ -64,7 +64,7 @@ Item {
return tooltip
}
MouseArea
MouseArea
{
id: mouse;
@ -114,7 +114,8 @@ Item {
elide: Text.ElideMiddle;
color: UM.Theme.getColor("setting_control_text");
font: UM.Theme.getFont("default");
// emphasize the setting if it has a value in the user or quality profile
font: base.stackLevel != undefined && base.stackLevel <= 1 ? UM.Theme.getFont("default_italic") : UM.Theme.getFont("default")
}
Row

View file

@ -14,6 +14,11 @@
"bold": true,
"family": "Open Sans"
},
"default_italic": {
"size": 1.15,
"italic": true,
"family": "Open Sans"
},
"small": {
"size": 1.0,
"bold": true,