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

Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10

Browse source
This commit is contained in:
Jaime van Kessel 2015-09-17 11:08:39 +02:00
commit e7a4f76c62
24 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
resources/themes/cura/fonts/ProximaNova-Black.otf
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/ProximaNova-Bold.otf
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/ProximaNova-BoldIt.otf
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/ProximaNova-Extrabold.otf
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/ProximaNova-Light.otf
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/ProximaNova-LightItalic.otf
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/ProximaNova-Regular.otf
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/ProximaNova-RegularItalic.otf
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/ProximaNovaCond-Light.otf
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/ProximaNovaCond-LightIt.otf
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/ProximaNovaCond-Regular.otf
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/Roboto-Black.ttf Normal file
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/Roboto-BlackItalic.ttf Normal file
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/Roboto-Bold.ttf Normal file
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/Roboto-BoldItalic.ttf Normal file
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/Roboto-Italic.ttf Normal file
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/Roboto-Light.ttf Normal file
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/Roboto-LightItalic.ttf Normal file
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/Roboto-Medium.ttf Normal file
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/Roboto-MediumItalic.ttf Normal file
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/Roboto-Regular.ttf Normal file
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/Roboto-Thin.ttf Normal file
View file

Binary file not shown.

BIN
resources/themes/cura/fonts/Roboto-ThinItalic.ttf Normal file
View file

Binary file not shown.

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

@ -3,48 +3,48 @@
"large": {
"size": 1.5,
"bold": true,
"family": "ProximaNova"
"family": "Roboto"
},
"default": {
"size": 1,
"family": "ProximaNova"
"family": "Roboto"
},
"default_allcaps": {
"size": 1,
"capitalize": true,
"family": "ProximaNova"
"family": "Roboto"
},
"small": {
"size": 0.75,
"family": "ProximaNova"
"family": "Roboto"
},
"tiny": {
"size": 0.5,
"family": "ProximaNova"
"family": "Roboto"
},
"caption": {
"size": 0.75,
"italic": true,
"family": "ProximaNova"
"family": "Roboto"
},
"sidebar_header": {
"size": 0.75,
"capitalize": true,
"family": "ProximaNova"
"family": "Roboto"
},
"timeslider_time": {
"size": 1.0,
"bold": true,
"family": "ProximaNova"
"family": "Roboto"
},
"button_tooltip": {
"size": 0.75,
"capitalize": true,
"family": "ProximaNova"
"family": "Roboto"
},
"setting_category": {
"size": 1.0,
"family": "ProximaNova"
"family": "Roboto"
}
},