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

Merge branch '4.0' into CURA-6005_cura_drive_plugin

Browse source 
Remove unused file.

Contributes to CURA-6005.
This commit is contained in:
Diego Prado Gesto 2018-12-18 07:17:37 +01:00
commit 3c99b69724
66 changed files with 786 additions and 2383 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/themes/cura-dark/theme.json
View file

@ -40,6 +40,8 @@
"text_scene": [255, 255, 255, 162],
"text_scene_hover": [255, 255, 255, 204],
"printer_type_label_background": [95, 95, 95, 255],
"error": [212, 31, 53, 255],
"disabled": [32, 32, 32, 255],

1901
resources/themes/cura-light/images/header_pattern.svg
View file

File diff suppressed because it is too large Load diff
Side by side

Before

Width:  |  Height:  |  Size: 785 KiB

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

@ -229,7 +229,7 @@
"checkbox_disabled": [223, 223, 223, 255],
"checkbox_text": [35, 35, 35, 255],
"tooltip": [68, 192, 255, 255],
"tooltip": [25, 25, 25, 255],
"tooltip_text": [255, 255, 255, 255],
"message_background": [255, 255, 255, 255],
@ -495,7 +495,7 @@
"toolbox_back_button": [4.0, 2.0],
"toolbox_installed_tile": [1.0, 8.0],
"toolbox_property_label": [1.0, 2.0],
"toolbox_heading_label": [1.0, 4.0],
"toolbox_heading_label": [1.0, 3.8],
"toolbox_header": [1.0, 4.0],
"toolbox_header_highlight": [0.25, 0.25],
"toolbox_progress_bar": [8.0, 0.5],