From 2234641e4a3081e73d98e70ccc94b274591b7254 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Mon, 11 Mar 2019 09:07:56 +0100
Subject: [PATCH] Update submodule and styling

---
 Content.Client/UserInterface/NanoStyle.cs | 25 +++++++++++++++++++++++
 engine                                    |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs
index 0120b937e0..78f87ab06c 100644
--- a/Content.Client/UserInterface/NanoStyle.cs
+++ b/Content.Client/UserInterface/NanoStyle.cs
@@ -115,6 +115,18 @@ namespace Content.Client.UserInterface
                 BackgroundColor = new Color(160, 160, 160), ContentMarginTopOverride = 10
             };
 
+            var progressBarBackground = new StyleBoxFlat
+            {
+                BackgroundColor = new Color(0.25f, 0.25f, 0.25f)
+            };
+            progressBarBackground.SetContentMarginOverride(StyleBox.Margin.Vertical, 5);
+
+            var progressBarForeground = new StyleBoxFlat
+            {
+                BackgroundColor = new Color(0.25f, 0.50f, 0.25f)
+            };
+            progressBarForeground.SetContentMarginOverride(StyleBox.Margin.Vertical, 5);
+
             Stylesheet = new Stylesheet(new[]
             {
                 // Default font.
@@ -288,6 +300,19 @@ namespace Content.Client.UserInterface
                         new StyleProperty(ScrollBar.StylePropertyGrabber,
                             hScrollBarGrabberGrabbed),
                     }),
+
+                // ProgressBar
+                new StyleRule(new SelectorElement(typeof(ProgressBar), null, null, null),
+                    new[]
+                    {
+                        new StyleProperty(ProgressBar.StylePropertyBackground, progressBarBackground)
+                    }),
+
+                new StyleRule(new SelectorElement(typeof(ProgressBar), null, null, null),
+                    new[]
+                    {
+                        new StyleProperty(ProgressBar.StylePropertyForeground, progressBarForeground)
+                    }),
             });
         }
     }
diff --git a/engine b/engine
index 2ff15f7fb0..d139203367 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit 2ff15f7fb0a6a1f1338d2f46d8ff28f4bf289ff6
+Subproject commit d139203367129a1589fa45bf875a9657b1782beb