From 7c1b6ff5d162a068f45683844bf49d2a1de6eb01 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Thu, 13 Feb 2020 00:46:18 -0800 Subject: [PATCH 1/7] Add inverted_triangle.svg for OptionButton --- Resources/Nano/inverted_triangle.svg | 84 +++++++++++++++++++++++ Resources/Nano/inverted_triangle.svg.png | Bin 0 -> 238 bytes 2 files changed, 84 insertions(+) create mode 100644 Resources/Nano/inverted_triangle.svg create mode 100644 Resources/Nano/inverted_triangle.svg.png diff --git a/Resources/Nano/inverted_triangle.svg b/Resources/Nano/inverted_triangle.svg new file mode 100644 index 0000000000..76df934464 --- /dev/null +++ b/Resources/Nano/inverted_triangle.svg @@ -0,0 +1,84 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Resources/Nano/inverted_triangle.svg.png b/Resources/Nano/inverted_triangle.svg.png new file mode 100644 index 0000000000000000000000000000000000000000..fd4b38a61667a4876f617badf9844f59acc2bc02 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CO!3HF4Hmy+sQY^(zo*^7SP{WbZ0pxQQctjR6 zFfhLWVaBc1LD@h-$r9IylHmNblJdl&REF~Ma=pyF?Be9af>gcyqV(DCY@~pSvOQfK zLnNm5p5DlLC_%*aVS7Xx(?Qu19&PoL23DO@laI)tZfnNk|3+DfY3`?An$sC$*Bo@LGH>GVyLjk{POo;QiKXdNRWI?(X Date: Thu, 13 Feb 2020 00:47:46 -0800 Subject: [PATCH 2/7] Add styles for ContainerButton and OptionButton --- Content.Client/UserInterface/NanoStyle.cs | 27 ++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs index da1ef41482..165bc0169e 100644 --- a/Content.Client/UserInterface/NanoStyle.cs +++ b/Content.Client/UserInterface/NanoStyle.cs @@ -66,6 +66,8 @@ namespace Content.Client.UserInterface windowBackground.SetPatchMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2); windowBackground.SetExpandMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2); + var textureInvertedTriangle = resCache.GetTexture("/nano/inverted_triangle.svg.png"); + // Button styles. var buttonTex = resCache.GetTexture("/Nano/button.svg.96dpi.png"); var buttonNormal = new StyleBoxTexture @@ -684,7 +686,30 @@ namespace Content.Client.UserInterface new StyleRule(new SelectorElement(typeof(Slider), new []{StyleClassSliderBlue}, null, null), new [] { new StyleProperty(Slider.StylePropertyFill, sliderFillBlue), - }) + }), + + new StyleRule(new SelectorElement(typeof(TextureRect), new[] {OptionButton.StyleClassOptionTriangle}, null, null), new[] + { + new StyleProperty(TextureRect.StylePropertyTexture, textureInvertedTriangle), + //new StyleProperty(Control.StylePropertyModulateSelf, Color.FromHex("#FFFFFF")), + }), + new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassNormal}), new[] + { + new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonNormal), + }), + new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassHover}), new[] + { + new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonHover), + }), + new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassPressed}), new[] + { + new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonPressed), + }), + new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassDisabled}), new[] + { + new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonDisabled), + new StyleProperty("font-color", Color.FromHex("#E5E5E581")), + }), }); } } From 718bf0edc392349a680a30999d0cc346948589e8 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Fri, 14 Feb 2020 04:17:07 -0800 Subject: [PATCH 3/7] Update Button references --- Content.Client/Construction/ConstructionMenu.cs | 4 ++-- Content.Client/Instruments/InstrumentMenu.cs | 8 ++++---- Content.Client/Research/LatheMenu.cs | 8 ++++---- Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs | 4 ++-- .../UserInterface/Cargo/CargoConsoleOrderMenu.cs | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Content.Client/Construction/ConstructionMenu.cs b/Content.Client/Construction/ConstructionMenu.cs index 14502f26bb..81b14fe21d 100644 --- a/Content.Client/Construction/ConstructionMenu.cs +++ b/Content.Client/Construction/ConstructionMenu.cs @@ -91,14 +91,14 @@ namespace Content.Client.Construction BuildButton = new Button { SizeFlagsHorizontal = SizeFlags.FillExpand, - TextAlign = Button.AlignMode.Center, + TextAlign = Label.AlignMode.Center, Text = "Build!", Disabled = true, ToggleMode = false }; EraseButton = new Button { - TextAlign = Button.AlignMode.Center, Text = "Clear Ghosts", ToggleMode = true + TextAlign = Label.AlignMode.Center, Text = "Clear Ghosts", ToggleMode = true }; buttonsContainer.AddChild(BuildButton); buttonsContainer.AddChild(EraseButton); diff --git a/Content.Client/Instruments/InstrumentMenu.cs b/Content.Client/Instruments/InstrumentMenu.cs index 9dae5c476a..b0880fbb48 100644 --- a/Content.Client/Instruments/InstrumentMenu.cs +++ b/Content.Client/Instruments/InstrumentMenu.cs @@ -56,7 +56,7 @@ namespace Content.Client.Instruments midiInputButton = new Button() { Text = "MIDI Input", - TextAlign = Button.AlignMode.Center, + TextAlign = Label.AlignMode.Center, SizeFlagsHorizontal = SizeFlags.FillExpand, SizeFlagsStretchRatio = 1, ToggleMode = true, @@ -74,7 +74,7 @@ namespace Content.Client.Instruments var midiFileButton = new Button() { Text = "Open File", - TextAlign = Button.AlignMode.Center, + TextAlign = Label.AlignMode.Center, SizeFlagsHorizontal = SizeFlags.FillExpand, SizeFlagsStretchRatio = 1, }; @@ -92,7 +92,7 @@ namespace Content.Client.Instruments midiLoopButton = new Button() { Text = "Loop", - TextAlign = Button.AlignMode.Center, + TextAlign = Label.AlignMode.Center, SizeFlagsHorizontal = SizeFlags.FillExpand, SizeFlagsStretchRatio = 1, ToggleMode = true, @@ -111,7 +111,7 @@ namespace Content.Client.Instruments midiStopButton = new Button() { Text = "Stop", - TextAlign = Button.AlignMode.Center, + TextAlign = Label.AlignMode.Center, SizeFlagsHorizontal = SizeFlags.FillExpand, SizeFlagsStretchRatio = 1, Disabled = !_owner.Instrument.IsMidiOpen, diff --git a/Content.Client/Research/LatheMenu.cs b/Content.Client/Research/LatheMenu.cs index 2d951a2ff5..9a9a9961a9 100644 --- a/Content.Client/Research/LatheMenu.cs +++ b/Content.Client/Research/LatheMenu.cs @@ -65,7 +65,7 @@ namespace Content.Client.Research QueueButton = new Button() { Text = "Queue", - TextAlign = Button.AlignMode.Center, + TextAlign = Label.AlignMode.Center, SizeFlagsHorizontal = SizeFlags.Fill, SizeFlagsStretchRatio = 1, }; @@ -73,7 +73,7 @@ namespace Content.Client.Research ServerConnectButton = new Button() { Text = "Server list", - TextAlign = Button.AlignMode.Center, + TextAlign = Label.AlignMode.Center, SizeFlagsHorizontal = SizeFlags.Fill, SizeFlagsStretchRatio = 1, }; @@ -81,7 +81,7 @@ namespace Content.Client.Research ServerSyncButton = new Button() { Text = "Sync", - TextAlign = Button.AlignMode.Center, + TextAlign = Label.AlignMode.Center, SizeFlagsHorizontal = SizeFlags.Fill, SizeFlagsStretchRatio = 1, }; @@ -111,7 +111,7 @@ namespace Content.Client.Research var filterButton = new Button() { Text = "Filter", - TextAlign = Button.AlignMode.Center, + TextAlign = Label.AlignMode.Center, SizeFlagsHorizontal = SizeFlags.Fill, SizeFlagsStretchRatio = 1, Disabled = true, diff --git a/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs b/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs index 9572a5fc45..53b350bdd0 100644 --- a/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs +++ b/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs @@ -98,13 +98,13 @@ namespace Content.Client.UserInterface.Cargo CallShuttleButton = new Button() { Text = _loc.GetString("Call Shuttle"), - TextAlign = Button.AlignMode.Center, + TextAlign = Label.AlignMode.Center, SizeFlagsHorizontal = SizeFlags.FillExpand }; PermissionsButton = new Button() { Text = _loc.GetString("Permissions"), - TextAlign = Button.AlignMode.Center + TextAlign = Label.AlignMode.Center }; buttons.AddChild(CallShuttleButton); buttons.AddChild(PermissionsButton); diff --git a/Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs b/Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs index 5a90e37850..a831c90ccc 100644 --- a/Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs +++ b/Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs @@ -56,7 +56,7 @@ namespace Content.Client.UserInterface.Cargo SubmitButton = new Button() { Text = _loc.GetString("OK"), - TextAlign = Button.AlignMode.Center, + TextAlign = Label.AlignMode.Center, }; vBox.AddChild(SubmitButton); From 92030c6724f99debd51567baa4fbfb93cf258fb0 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Fri, 14 Feb 2020 04:18:14 -0800 Subject: [PATCH 4/7] Update NanoStyle for refactored Button and CheckBox --- Content.Client/UserInterface/NanoStyle.cs | 92 +++++++++-------------- 1 file changed, 34 insertions(+), 58 deletions(-) diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs index 165bc0169e..9cea23c04d 100644 --- a/Content.Client/UserInterface/NanoStyle.cs +++ b/Content.Client/UserInterface/NanoStyle.cs @@ -307,37 +307,28 @@ namespace Content.Client.UserInterface }), // Regular buttons! - new StyleRule( - new SelectorElement(typeof(Button), null, null, new[] {Button.StylePseudoClassNormal}), - new[] - { - new StyleProperty(Button.StylePropertyStyleBox, buttonNormal), - }), - new StyleRule( - new SelectorElement(typeof(Button), null, null, new[] {Button.StylePseudoClassHover}), - new[] - { - new StyleProperty(Button.StylePropertyStyleBox, buttonHover), - }), - new StyleRule( - new SelectorElement(typeof(Button), null, null, new[] {Button.StylePseudoClassPressed}), - new[] - { - new StyleProperty(Button.StylePropertyStyleBox, buttonPressed), - }), - new StyleRule( - new SelectorElement(typeof(Button), null, null, new[] {Button.StylePseudoClassDisabled}), - new[] - { - new StyleProperty(Button.StylePropertyStyleBox, buttonDisabled), - new StyleProperty("font-color", Color.FromHex("#E5E5E581")), - }), + new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassNormal}), new[] + { + new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonNormal), + }), + new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassHover}), new[] + { + new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonHover), + }), + new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassPressed}), new[] + { + new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonPressed), + }), + new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassDisabled}), new[] + { + new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonDisabled), + new StyleProperty("font-color", Color.FromHex("#E5E5E581")), + }), // Main menu: Make those buttons bigger. - new StyleRule( - new SelectorChild( - new SelectorElement(null, null, "mainMenuVBox", null), - new SelectorElement(typeof(Button), null, null, null)), + new StyleRule(new SelectorChild( + new SelectorElement(typeof(Button), null, "mainMenu", null), + new SelectorElement(typeof(Label), null, null, null)), new[] { new StyleProperty("font", notoSansBold16), @@ -436,15 +427,14 @@ namespace Content.Client.UserInterface }), // CheckBox - new StyleRule(new SelectorElement(typeof(CheckBox), null, null, null), new[] - { - new StyleProperty(CheckBox.StylePropertyIcon, checkBoxTextureUnchecked), - }), - - new StyleRule(new SelectorElement(typeof(CheckBox), null, null, new[] {Button.StylePseudoClassPressed}), - new[] + new StyleRule(new SelectorElement(typeof(TextureRect), null, CheckBox.StyleIdentifierCheckBoxUnchecked, null), new[] { - new StyleProperty(CheckBox.StylePropertyIcon, checkBoxTextureChecked), + new StyleProperty(TextureRect.StylePropertyTexture, checkBoxTextureUnchecked), + }), + + new StyleRule(new SelectorElement(typeof(TextureRect), null, CheckBox.StyleIdentifierCheckBoxChecked, null), new[] + { + new StyleProperty(TextureRect.StylePropertyTexture, checkBoxTextureChecked), }), new StyleRule(new SelectorElement(typeof(CheckBox), null, null, null), new[] @@ -558,10 +548,13 @@ namespace Content.Client.UserInterface }), // Big Button - new StyleRule(new SelectorElement(typeof(Button), new[] {StyleClassButtonBig}, null, null), new[] - { - new StyleProperty("font", notoSans16) - }), + new StyleRule(new SelectorChild( + new SelectorElement(typeof(Button), new[] {StyleClassButtonBig}, null, null), + new SelectorElement(typeof(Label), null, null, null)), + new[] + { + new StyleProperty("font", notoSans16) + }), //APC and SMES power state label colors new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassPowerStateNone}, null, null), new[] @@ -693,23 +686,6 @@ namespace Content.Client.UserInterface new StyleProperty(TextureRect.StylePropertyTexture, textureInvertedTriangle), //new StyleProperty(Control.StylePropertyModulateSelf, Color.FromHex("#FFFFFF")), }), - new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassNormal}), new[] - { - new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonNormal), - }), - new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassHover}), new[] - { - new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonHover), - }), - new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassPressed}), new[] - { - new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonPressed), - }), - new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassDisabled}), new[] - { - new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonDisabled), - new StyleProperty("font-color", Color.FromHex("#E5E5E581")), - }), }); } } From 983d626ce4a8f0b088a88671ed83122ad3fc17cb Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Fri, 14 Feb 2020 18:05:35 -0800 Subject: [PATCH 5/7] Fix Styling --- Content.Client/UserInterface/NanoStyle.cs | 69 +++++++++++++++++------ 1 file changed, 52 insertions(+), 17 deletions(-) diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs index 9cea23c04d..ecc828d36c 100644 --- a/Content.Client/UserInterface/NanoStyle.cs +++ b/Content.Client/UserInterface/NanoStyle.cs @@ -307,24 +307,36 @@ namespace Content.Client.UserInterface }), // Regular buttons! - new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassNormal}), new[] + new StyleRule(new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassNormal}), new[] { new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonNormal), }), - new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassHover}), new[] + new StyleRule(new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassHover}), new[] { new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonHover), }), - new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassPressed}), new[] + new StyleRule(new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassPressed}), new[] { new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonPressed), }), - new StyleRule( new SelectorElement(typeof(ContainerButton), null, null, new[] {ContainerButton.StylePseudoClassDisabled}), new[] + new StyleRule(new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassDisabled}), new[] { new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonDisabled), - new StyleProperty("font-color", Color.FromHex("#E5E5E581")), }), + new StyleRule(new SelectorElement(typeof(Label), new[] { Button.StyleClassButton }, null, null), new[] + { + new StyleProperty(Label.StylePropertyAlignMode, Label.AlignMode.Center), + }), + + new StyleRule(new SelectorChild( + new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassDisabled}), + new SelectorElement(typeof(Label), null, null, null)), + new[] + { + new StyleProperty("font-color", Color.FromHex("#E5E5E581")), + }), + // Main menu: Make those buttons bigger. new StyleRule(new SelectorChild( new SelectorElement(typeof(Button), null, "mainMenu", null), @@ -427,19 +439,19 @@ namespace Content.Client.UserInterface }), // CheckBox - new StyleRule(new SelectorElement(typeof(TextureRect), null, CheckBox.StyleIdentifierCheckBoxUnchecked, null), new[] - { - new StyleProperty(TextureRect.StylePropertyTexture, checkBoxTextureUnchecked), - }), - - new StyleRule(new SelectorElement(typeof(TextureRect), null, CheckBox.StyleIdentifierCheckBoxChecked, null), new[] - { - new StyleProperty(TextureRect.StylePropertyTexture, checkBoxTextureChecked), - }), - - new StyleRule(new SelectorElement(typeof(CheckBox), null, null, null), new[] + new StyleRule(new SelectorElement(typeof(TextureRect), new [] { CheckBox.StyleClassCheckBox }, null, null), new[] { - new StyleProperty(CheckBox.StylePropertyHSeparation, 3), + new StyleProperty(TextureRect.StylePropertyTexture, checkBoxTextureUnchecked), + }), + + new StyleRule(new SelectorElement(typeof(TextureRect), new [] { CheckBox.StyleClassCheckBox, CheckBox.StyleClassCheckBoxChecked }, null, null), new[] + { + new StyleProperty(TextureRect.StylePropertyTexture, checkBoxTextureChecked), + }), + + new StyleRule(new SelectorElement(typeof(HBoxContainer), new [] { CheckBox.StyleClassCheckBox }, null, null), new[] + { + new StyleProperty(BoxContainer.StylePropertySeparation, 10), }), // Tooltip @@ -681,11 +693,34 @@ namespace Content.Client.UserInterface new StyleProperty(Slider.StylePropertyFill, sliderFillBlue), }), + // OptionButton + new StyleRule(new SelectorElement(typeof(OptionButton), null, null, new[] {ContainerButton.StylePseudoClassNormal}), new[] + { + new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonNormal), + }), + new StyleRule(new SelectorElement(typeof(OptionButton), null, null, new[] {ContainerButton.StylePseudoClassHover}), new[] + { + new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonHover), + }), + new StyleRule(new SelectorElement(typeof(OptionButton), null, null, new[] {ContainerButton.StylePseudoClassPressed}), new[] + { + new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonPressed), + }), + new StyleRule(new SelectorElement(typeof(OptionButton), null, null, new[] {ContainerButton.StylePseudoClassDisabled}), new[] + { + new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonDisabled), + }), + new StyleRule(new SelectorElement(typeof(TextureRect), new[] {OptionButton.StyleClassOptionTriangle}, null, null), new[] { new StyleProperty(TextureRect.StylePropertyTexture, textureInvertedTriangle), //new StyleProperty(Control.StylePropertyModulateSelf, Color.FromHex("#FFFFFF")), }), + + new StyleRule(new SelectorElement(typeof(Label), new[] { OptionButton.StyleClassOptionButton }, null, null), new[] + { + new StyleProperty(Label.StylePropertyAlignMode, Label.AlignMode.Center), + }), }); } } From aa16cd42bf70082570fa03677c6b0cd81b261084 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Sun, 16 Feb 2020 23:42:43 -0800 Subject: [PATCH 6/7] Change inverted_triangle.svg to px --- Resources/Nano/inverted_triangle.svg | 31 ++++++++++++----------- Resources/Nano/inverted_triangle.svg.png | Bin 238 -> 218 bytes 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Resources/Nano/inverted_triangle.svg b/Resources/Nano/inverted_triangle.svg index 76df934464..d1c2083eb7 100644 --- a/Resources/Nano/inverted_triangle.svg +++ b/Resources/Nano/inverted_triangle.svg @@ -9,16 +9,16 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="12mm" - height="8mm" + width="12" + height="8" viewBox="0 0 12 8" version="1.1" id="svg5650" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="inverted_triangle.svg" inkscape:export-filename="H:\Code\GitHub\space-station-14\Resources\Nano\inverted_triangle.svg.png" - inkscape:export-xdpi="25.400002" - inkscape:export-ydpi="25.400002"> + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + inkscape:window-width="1280" + inkscape:window-height="961" + inkscape:window-x="1432" + inkscape:window-y="-2" + inkscape:window-maximized="1" + units="px" /> @@ -60,7 +61,7 @@ inkscape:groupmode="layer" id="layer1" style="display:inline;opacity:1" - transform="translate(-1.9860501e-8,-288.99999)"> + transform="translate(-1.0101525,-296.07106)"> diff --git a/Resources/Nano/inverted_triangle.svg.png b/Resources/Nano/inverted_triangle.svg.png index fd4b38a61667a4876f617badf9844f59acc2bc02..ab0c04390d28c91f1ffdefd82e40b938e67bca84 100644 GIT binary patch delta 144 zcmV;B0B`^90onnO7YYan1^@s6&Ey{Oks%rj4#WTe4#WYKD-IixMks7oNklX|r2kCp|U< zPwXQi0-f^uDVG6VtieHgH-Zn2(Zb{`jVpOHIW^@aN*8ICO1l1)m#Fkg-}=6R_R6DB TZct|c0000 Date: Mon, 17 Feb 2020 11:16:50 +0100 Subject: [PATCH 7/7] Update submodule --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index a3a8a8b3cf..b282881482 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit a3a8a8b3cfce230f98b185b663422fb5a290c6e4 +Subproject commit b282881482f837624db7dabd6a1445f50a1b9767