From 98a527b015e9e98d197fd45af5efef88f4c43394 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Sun, 31 May 2015 07:35:33 -0400
Subject: [PATCH 1/3] add setting for sidebar background color

---
 resources/qml/Sidebar.qml        | 2 ++
 resources/themes/cura/theme.json | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index e803406369..3b641a4538 100644
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -17,6 +17,8 @@ UM.AngledCornerRectangle {
 
     cornerSize: UM.Theme.sizes.default_margin.width;
 
+    color: UM.Theme.colors.sidebar;
+
     function showTooltip(item, position, text) {
         tooltip.text = text;
         position = item.mapToItem(base, position.x, position.y / 2);
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index 2ea7f138f6..f73360d439 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -44,6 +44,8 @@
     },
 
     "colors": {
+        "sidebar": [255, 255, 255, 255],
+
         "primary": [12, 169, 227, 255],
         "primary_hover": [34, 150, 190, 255],
         "primary_text": [255, 255, 255, 255],

From cc8f974793f72ba521619e520eae1656135434c7 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Sun, 31 May 2015 09:18:36 -0400
Subject: [PATCH 2/3] add missing color to tool_button

---
 resources/themes/cura/styles.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml
index d17560d976..bdf332871c 100644
--- a/resources/themes/cura/styles.qml
+++ b/resources/themes/cura/styles.qml
@@ -73,6 +73,7 @@ QtObject {
                         anchors.horizontalCenter: parent.horizontalCenter;
                         text: control.text;
                         font: UM.Theme.fonts.button_tooltip;
+                        color: UM.Theme.colors.button_text;
                     }
                 }
             }

From 350e3312bdf3cc638ff1490749b7400769ee202d Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Sun, 31 May 2015 09:24:41 -0400
Subject: [PATCH 3/3] add missing width and height to section icon

---
 resources/themes/cura/styles.qml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml
index bdf332871c..9e9cc11e42 100644
--- a/resources/themes/cura/styles.qml
+++ b/resources/themes/cura/styles.qml
@@ -122,6 +122,8 @@ QtObject {
                 Image {
                     anchors.verticalCenter: parent.verticalCenter;
                     source: control.iconSource;
+                    width: UM.Theme.sizes.section_icon.width;
+                    height: UM.Theme.sizes.section_icon.height;
                 }
 
                 Label {