3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-28 13:21:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #513 from ad1217/theme-fix

Browse source 
Fix unset text colors on bright backgrounds
This commit is contained in:
awhiemstra 2015-10-28 15:51:43 +01:00
commit 70c46f8a4f
5 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/ProfileSetup.qml
View file

@ -81,6 +81,7 @@ Item{
text: catalog.i18nc("@label","Global Profile:"); text: catalog.i18nc("@label","Global Profile:");
width: parent.width/100*45 width: parent.width/100*45
font: UM.Theme.fonts.default; font: UM.Theme.fonts.default;
color: UM.Theme.colors.text_default;
} }

1
resources/qml/SidebarHeader.qml
View file

@ -100,6 +100,7 @@ Item
anchors.leftMargin: UM.Theme.sizes.default_margin.width anchors.leftMargin: UM.Theme.sizes.default_margin.width
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font: UM.Theme.fonts.default; font: UM.Theme.fonts.default;
color: UM.Theme.colors.text_default;
} }
ToolButton { ToolButton {

2
resources/qml/SidebarSimple.qml
View file

@ -33,6 +33,7 @@ Item
//: Infill selection label //: Infill selection label
text: catalog.i18nc("@label","Infill:"); text: catalog.i18nc("@label","Infill:");
font: UM.Theme.fonts.default; font: UM.Theme.fonts.default;
color: UM.Theme.colors.text_default;
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: UM.Theme.sizes.default_margin.height anchors.topMargin: UM.Theme.sizes.default_margin.height
anchors.left: parent.left anchors.left: parent.left
@ -166,6 +167,7 @@ Item
//: Helpers selection label //: Helpers selection label
text: catalog.i18nc("@label:listbox","Helpers:"); text: catalog.i18nc("@label:listbox","Helpers:");
font: UM.Theme.fonts.default; font: UM.Theme.fonts.default;
color: UM.Theme.colors.text_default;
} }
} }
Rectangle { Rectangle {

1
resources/qml/SidebarTooltip.qml
View file

@ -47,5 +47,6 @@ Rectangle {
} }
wrapMode: Text.Wrap; wrapMode: Text.Wrap;
font: UM.Theme.fonts.default; font: UM.Theme.fonts.default;
color: UM.Theme.colors.text_default;
} }
} }

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

@ -50,6 +50,7 @@
}, },
"colors": { "colors": {
"text_default": [0, 0, 0, 255],
"sidebar": [255, 255, 255, 255], "sidebar": [255, 255, 255, 255],
"lining": [208, 210, 211, 255], "lining": [208, 210, 211, 255],