GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 20:19:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-6085_fix_font_sizes' of github.com:Ultimaker/Cura into 4.0

Browse Source
This commit is contained in:
Jaime van Kessel 2019-01-08 11:44:49 +01:00
commit a25ae4ee07
2 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml
View File

@ -30,6 +30,7 @@ Item
CheckBox CheckBox
{ {
id: disableButton id: disableButton
anchors.verticalCenter: pluginInfo.verticalCenter
checked: isEnabled checked: isEnabled
visible: model.type == "plugin" visible: model.type == "plugin"
width: visible ? UM.Theme.getSize("checkbox").width : 0 width: visible ? UM.Theme.getSize("checkbox").width : 0

93
resources/themes/cura-light/theme.json
View File

@ -9,6 +9,21 @@
"weight": 40, "weight": 40,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"large_ja_JP": {
"size": 1.35,
"weight": 50,
"family": "Noto Sans"
},
"large_zh_CN": {
"size": 1.35,
"weight": 50,
"family": "Noto Sans"
},
"large_zh_TW": {
"size": 1.35,
"weight": 50,
"family": "Noto Sans"
},
"large_bold": { "large_bold": {
"size": 1.35, "size": 1.35,
"weight": 63, "weight": 63,
@ -19,6 +34,21 @@
"weight": 40, "weight": 40,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"medium_ja_JP": {
"size": 1.16,
"weight": 50,
"family": "Noto Sans"
},
"medium_zh_CN": {
"size": 1.16,
"weight": 50,
"family": "Noto Sans"
},
"medium_zh_TW": {
"size": 1.16,
"weight": 50,
"family": "Noto Sans"
},
"medium_bold": { "medium_bold": {
"size": 1.16, "size": 1.16,
"weight": 63, "weight": 63,
@ -29,21 +59,84 @@
"weight": 40, "weight": 40,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"default_ja_JP": {
"size": 1.0,
"weight": 50,
"family": "Noto Sans"
},
"default_zh_CN": {
"size": 1.0,
"weight": 50,
"family": "Noto Sans"
},
"default_zh_TW": {
"size": 1.0,
"weight": 50,
"family": "Noto Sans"
},
"default_bold": { "default_bold": {
"size": 0.95, "size": 0.95,
"weight": 63, "weight": 63,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"default_bold_ja_JP": {
"size": 1.0,
"weight": 63,
"family": "Noto Sans"
},
"default_bold_zh_CN": {
"size": 1.0,
"weight": 63,
"family": "Noto Sans"
},
"default_bold_zh_TW": {
"size": 1.0,
"weight": 63,
"family": "Noto Sans"
},
"default_italic": { "default_italic": {
"size": 0.95, "size": 0.95,
"weight": 40, "weight": 40,
"italic": true, "italic": true,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"default_italic_ja_JP": {
"size": 1.0,
"weight": 50,
"italic": true,
"family": "Noto Sans"
},
"default_italic_zh_CN": {
"size": 1.0,
"weight": 50,
"italic": true,
"family": "Noto Sans"
},
"default_italic_zh_TW": {
"size": 1.0,
"weight": 50,
"italic": true,
"family": "Noto Sans"
},
"small": { "small": {
"size": 0.7, "size": 0.7,
"weight": 40, "weight": 40,
"family": "Noto Sans" "family": "Noto Sans"
},
"small_ja_JP": {
"size": 0.7,
"weight": 50,
"family": "Noto Sans"
},
"small_zh_CN": {
"size": 0.7,
"weight": 50,
"family": "Noto Sans"
},
"small_zh_TW": {
"size": 0.7,
"weight": 50,
"family": "Noto Sans"
} }
}, },