From 3d8ffa21e42c045aae544a57470e6ca05beedb09 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Sun, 28 Apr 2019 16:50:24 +0200
Subject: [PATCH] Fix dark theme

I don't think this ever worked, seeing as how there were rectangles without colour in there.
Use Item instead of a rectangle if it doesn't need a background colour or border colour.
---
 resources/qml/SettingsGuide.qml                           | 3 ++-
 resources/qml/SettingsSidebar.qml                         | 2 +-
 resources/qml/SidebarSettingTemplates/EmptyTemplate.qml   | 2 +-
 resources/qml/SidebarSettingTemplates/GeneralTemplate.qml | 5 +++++
 resources/qml/SidebarSettings/SettingItem.qml             | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/resources/qml/SettingsGuide.qml b/resources/qml/SettingsGuide.qml
index 9d71705e8..a99e2ea2c 100644
--- a/resources/qml/SettingsGuide.qml
+++ b/resources/qml/SettingsGuide.qml
@@ -82,8 +82,9 @@ Window {
 		Rectangle {
 			id: rightSideItem
 			width: UM.Theme.getSize("print_setup_widget").width
-			border.color: "black"
+			border.color: UM.Theme.getColor("lining")
 			border.width: 1
+			color: "transparent"
 
 			anchors {
 				top: globalItem.top
diff --git a/resources/qml/SettingsSidebar.qml b/resources/qml/SettingsSidebar.qml
index 0ea29e804..c1be6466c 100644
--- a/resources/qml/SettingsSidebar.qml
+++ b/resources/qml/SettingsSidebar.qml
@@ -14,7 +14,7 @@ import Cura 1.0 as Cura
 
 import CuraSettingsGuide 1.0 as CuraSettingsGuideNS
 
-Rectangle {
+Item {
 	id: rightSideItem
 	width: UM.Theme.getSize("print_setup_widget").width
 
diff --git a/resources/qml/SidebarSettingTemplates/EmptyTemplate.qml b/resources/qml/SidebarSettingTemplates/EmptyTemplate.qml
index f3dcb88ec..c809ca514 100644
--- a/resources/qml/SidebarSettingTemplates/EmptyTemplate.qml
+++ b/resources/qml/SidebarSettingTemplates/EmptyTemplate.qml
@@ -15,7 +15,7 @@ Rectangle {
 
 	Text {
 		text: "EMPTY"
-		color: "black"
+		color: UM.Theme.getColor("text")
 		font.pixelSize: 80
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.verticalCenter: parent.verticalCenter
diff --git a/resources/qml/SidebarSettingTemplates/GeneralTemplate.qml b/resources/qml/SidebarSettingTemplates/GeneralTemplate.qml
index 9fb471d4a..0cde92382 100644
--- a/resources/qml/SidebarSettingTemplates/GeneralTemplate.qml
+++ b/resources/qml/SidebarSettingTemplates/GeneralTemplate.qml
@@ -74,6 +74,7 @@ Rectangle {
 
 				text: general_template.setting_name
 				font: UM.Theme.getFont("large")
+				color: UM.Theme.getColor("text")
 				renderType: Text.NativeRendering
 			}
 
@@ -86,6 +87,7 @@ Rectangle {
 				width: rect_scroll.width
 				wrapMode: Text.WordWrap
 				font: UM.Theme.getFont("default")
+				color: UM.Theme.getColor("text")
 				renderType: Text.NativeRendering
 			}
 
@@ -214,6 +216,7 @@ Rectangle {
 				width: rect_scroll.width
 				text: general_template.setting_img_description
 				font: UM.Theme.getFont("default_italic")
+				color: UM.Theme.getColor("text")
 				renderType: Text.NativeRendering
 				wrapMode: Text.WordWrap
 			}
@@ -231,6 +234,7 @@ Rectangle {
 				text: CuraSettingsGuide.parseStylingList(general_template.setting_hints)
 				width: rect_scroll.width
 				font: UM.Theme.getFont("default")
+				color: UM.Theme.getColor("text")
 				renderType: Text.NativeRendering
 				wrapMode: Text.WordWrap
 				textFormat: Text.RichText
@@ -251,6 +255,7 @@ Rectangle {
 				text: general_template.setting_notes
 				width: rect_scroll.width
 				font: UM.Theme.getFont("default_bold")
+				color: UM.Theme.getColor("text")
 				renderType: Text.NativeRendering
 				wrapMode: Text.WordWrap
 			}
diff --git a/resources/qml/SidebarSettings/SettingItem.qml b/resources/qml/SidebarSettings/SettingItem.qml
index ddc4a005f..2570d0b39 100644
--- a/resources/qml/SidebarSettings/SettingItem.qml
+++ b/resources/qml/SidebarSettings/SettingItem.qml
@@ -11,7 +11,7 @@ import QtQuick.Controls 2.0
 import UM 1.1 as UM
 import Cura 1.0 as Cura
 
-Rectangle {
+Item {
 	id: base
 
 	height: UM.Theme.getSize("section").height