3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 15:27:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

Merge branch '2.1'

Browse source 
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
This commit is contained in:
Ghostkeeper 2016-03-17 15:24:00 +01:00
commit de9a66e1f4
47 changed files with 248 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,12 @@
"size": 1.0,
"family": "Open Sans"
},
"small_bold":
{
"size": 1.0,
"family": "Open Sans",
"bold": true
},
"very_small": {
"size": 0.75,
"family": "Open Sans"
@ -68,7 +74,7 @@
"text_hover": [70, 84, 113, 255],
"text_pressed": [12, 169, 227, 255],
"text_white": [255, 255, 255, 255],
"text_subtext": [127, 127, 127, 255],
"text_subtext": [100, 100, 100, 255],
"error": [255, 140, 0, 255],
"sidebar_header_bar": [24, 41, 77, 255],