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

Merge pull request #17 from ad1217/themes

Browse Source 
Fixes for theming
This commit is contained in:
awhiemstra 2015-06-01 13:22:35 +02:00
commit 0121c3523a
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/Sidebar.qml
View File

@ -17,6 +17,8 @@ UM.AngledCornerRectangle {
cornerSize: UM.Theme.sizes.default_margin.width; cornerSize: UM.Theme.sizes.default_margin.width;
color: UM.Theme.colors.sidebar;
function showTooltip(item, position, text) { function showTooltip(item, position, text) {
tooltip.text = text; tooltip.text = text;
position = item.mapToItem(base, position.x, position.y / 2); position = item.mapToItem(base, position.x, position.y / 2);

3
resources/themes/cura/styles.qml
View File

@ -73,6 +73,7 @@ QtObject {
anchors.horizontalCenter: parent.horizontalCenter; anchors.horizontalCenter: parent.horizontalCenter;
text: control.text; text: control.text;
font: UM.Theme.fonts.button_tooltip; font: UM.Theme.fonts.button_tooltip;
color: UM.Theme.colors.button_text;
} }
} }
} }
@ -121,6 +122,8 @@ QtObject {
Image { Image {
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
source: control.iconSource; source: control.iconSource;
width: UM.Theme.sizes.section_icon.width;
height: UM.Theme.sizes.section_icon.height;
} }
Label { Label {

2
resources/themes/cura/theme.json
View File

@ -44,6 +44,8 @@
}, },
"colors": { "colors": {
"sidebar": [255, 255, 255, 255],
"primary": [12, 169, 227, 255], "primary": [12, 169, 227, 255],
"primary_hover": [34, 150, 190, 255], "primary_hover": [34, 150, 190, 255],
"primary_text": [255, 255, 255, 255], "primary_text": [255, 255, 255, 255],