Merge branch 'master' into layer_view3_cleanup

This commit is contained in:
Jack Ha 2017-01-30 11:25:55 +01:00
commit 2f9618f2ad
60 changed files with 30062 additions and 10918 deletions

View file

@ -71,8 +71,9 @@ Item
width: valueLabel.width + UM.Theme.getSize("default_margin").width
Behavior on height { NumberAnimation { duration: 50; } }
border.width: UM.Theme.getSize("default_lining").width;
border.color: UM.Theme.getColor("slider_groove_border");
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("slider_groove_border")
color: UM.Theme.getColor("tool_panel_background")
visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false