3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '15.06'

Browse source 
* 15.06:
  Updated name in menu for firmware update
  Added exception handling to listen thread join
  Render a transparent ghost of the selection when things are selected.
  Add changes of 15.05.93 release
  Make button tooltip text use the dark color from the palette
  Render the build platform grid as a single sided plane
  Ignore selection when moving objects due to collision
  Use the right offset for object collision after Polygon collision was fixed
This commit is contained in:
Arjen Hiemstra 2015-06-05 10:41:53 +02:00
commit 98befd69ec
6 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/themes/cura/styles.qml
View file

@ -73,7 +73,7 @@ QtObject {
anchors.horizontalCenter: parent.horizontalCenter;
text: control.text;
font: UM.Theme.fonts.button_tooltip;
color: UM.Theme.colors.button_text;
color: UM.Theme.colors.button_tooltip_text;
}
}
}

1
resources/themes/cura/theme.json
View file

@ -63,6 +63,7 @@
"button_active_hover": [34, 150, 190, 255],
"button_text": [255, 255, 255, 255],
"button_disabled": [245, 245, 245, 255],
"button_tooltip_text": [35, 35, 35, 255],
"scrollbar_background": [245, 245, 245, 255],
"scrollbar_handle": [205, 202, 201, 255],