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

Merge branch 'master' into CURA-8979_Materials_Preference_Page

Browse source 
# Conflicts:
#	resources/qml/ColorDialog.qml
#	resources/qml/Preferences/ProfilesPage.qml
This commit is contained in:
casper 2022-03-21 13:39:16 +01:00
commit bfa8118c9f
355 changed files with 875 additions and 1175 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/themes/cura-light/theme.json
View file

@ -587,7 +587,8 @@
"checkbox_radius": [0.25, 0.25],
"spinbox": [6.0, 3.0],
"combobox_wide": [14, 2],
"combobox": [14, 2],
"combobox_wide": [22, 2],
"tooltip": [20.0, 10.0],
"tooltip_margins": [1.0, 1.0],