From 96c63ef6e9d30bc38efdbfab00d5fba2bb2903c3 Mon Sep 17 00:00:00 2001
From: Tamara Hogenhout <t.hogenhout@ultimaker.com>
Date: Mon, 24 Aug 2015 17:05:24 +0200
Subject: [PATCH] 15.10 Restyling of the message stack

Contributes to: issue CURA-60
---
 resources/themes/cura/icons/cross2.svg | 10 ++++++++++
 resources/themes/cura/styles.qml       |  9 +++------
 resources/themes/cura/theme.json       |  3 ++-
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 resources/themes/cura/icons/cross2.svg

diff --git a/resources/themes/cura/icons/cross2.svg b/resources/themes/cura/icons/cross2.svg
new file mode 100644
index 0000000000..dda0b9d501
--- /dev/null
+++ b/resources/themes/cura/icons/cross2.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 20 20" xml:space="preserve">
+<rect x="0" y="0" fill="none" width="20" height="20"/>
+<g>
+	<path d="M0,0v20h20V0H0z M15.5,13.7l-1.8,1.8L10,11.9l-3.7,3.7l-1.8-1.8L8.1,10L4.4,6.4l1.8-1.8L10,8.2l3.7-3.7l1.8,1.8L11.8,10
+		L15.5,13.7z"/>
+</g>
+</svg>
diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml
index 0810989304..a2d7fe7c7b 100644
--- a/resources/themes/cura/styles.qml
+++ b/resources/themes/cura/styles.qml
@@ -205,26 +205,23 @@ QtObject {
             background:Rectangle {
                 implicitWidth: UM.Theme.sizes.message.width - (UM.Theme.sizes.default_margin.width * 2)
                 implicitHeight: UM.Theme.sizes.progressbar.height
-                x: UM.Theme.sizes.default_margin.width
                 color: UM.Theme.colors.progressbar_background
             }
             progress: Rectangle {
                 color: control.indeterminate ? "transparent" : UM.Theme.colors.progressbar_control
-
                 Rectangle{
                     color: UM.Theme.colors.progressbar_control
                     width: UM.Theme.sizes.progressbar_control.width
                     height: UM.Theme.sizes.progressbar_control.height
-                    x: UM.Theme.sizes.default_margin.width
                     visible: control.indeterminate
 
                     SequentialAnimation on x {
                         id: xAnim
-                        property int animEndPoint: UM.Theme.sizes.message.width - UM.Theme.sizes.default_margin.width - UM.Theme.sizes.progressbar_control.width
+                        property int animEndPoint: UM.Theme.sizes.message.width - (UM.Theme.sizes.default_margin.width * 2) - UM.Theme.sizes.progressbar_control.width
                         running: control.indeterminate
                         loops: Animation.Infinite
-                        NumberAnimation { from: UM.Theme.sizes.default_margin.width; to: xAnim.animEndPoint; duration: 2000;}
-                        NumberAnimation { from: xAnim.animEndPoint; to: UM.Theme.sizes.default_margin.width; duration: 2000;}
+                        NumberAnimation { from: 0; to: xAnim.animEndPoint; duration: 2000;}
+                        NumberAnimation { from: xAnim.animEndPoint; to: 0; duration: 2000;}
                     }
                 }
             }
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index 413a653d3c..1e3f24e1f2 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -132,7 +132,8 @@
         "save_button_background": [249, 249, 249, 255],
 
         "message_background": [255, 255, 255, 255],
-        "message_text": [12, 169, 227, 255],
+        "message_text": [32, 166, 219, 255],
+        "message_dismiss": [139, 143, 153, 255],
 
         "tool_panel_background": [255, 255, 255, 255]
     },