Merge branch 'fix_print_monitor_dark_theme' of https://github.com/fieldOfView/Cura into 4.0

This commit is contained in:
Jaime van Kessel 2018-12-18 13:54:32 +01:00
commit a181ffe79d
2 changed files with 3 additions and 2 deletions

View File

@ -13,11 +13,12 @@ Component
{ {
Rectangle Rectangle
{ {
color: UM.Theme.getColor("main_background")
anchors.right: parent.right anchors.right: parent.right
width: parent.width * 0.3 width: parent.width * 0.3
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
color: UM.Theme.getColor("main_background")
Cura.PrintMonitor Cura.PrintMonitor
{ {

View File

@ -12,7 +12,7 @@ import Cura 1.0 as Cura
import "PrinterOutput" import "PrinterOutput"
Rectangle Item
{ {
id: base id: base
UM.I18nCatalog { id: catalog; name: "cura"} UM.I18nCatalog { id: catalog; name: "cura"}