From ebc355a28b278b1667bef69b3d5c15e7b3d7bd35 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 22 Jan 2019 14:59:12 +0100 Subject: [PATCH] SVGs fixed. --- src/Squidex/Pipeline/Squid/SquidMiddleware.cs | 12 ++-- src/Squidex/Pipeline/Squid/icon-happy-lg.svg | 24 ------- src/Squidex/Pipeline/Squid/icon-happy-sm.svg | 35 ++++++++++ src/Squidex/Pipeline/Squid/icon-happy.svg | 57 ++++++++++------- src/Squidex/Pipeline/Squid/icon-sad-lg.svg | 33 ---------- src/Squidex/Pipeline/Squid/icon-sad-sm.svg | 45 +++++++++++++ src/Squidex/Pipeline/Squid/icon-sad.svg | 64 +++++++++++-------- src/Squidex/Squidex.csproj | 4 +- 8 files changed, 160 insertions(+), 114 deletions(-) delete mode 100644 src/Squidex/Pipeline/Squid/icon-happy-lg.svg create mode 100644 src/Squidex/Pipeline/Squid/icon-happy-sm.svg delete mode 100644 src/Squidex/Pipeline/Squid/icon-sad-lg.svg create mode 100644 src/Squidex/Pipeline/Squid/icon-sad-sm.svg diff --git a/src/Squidex/Pipeline/Squid/SquidMiddleware.cs b/src/Squidex/Pipeline/Squid/SquidMiddleware.cs index 6def4b4c9..2a5dd9dae 100644 --- a/src/Squidex/Pipeline/Squid/SquidMiddleware.cs +++ b/src/Squidex/Pipeline/Squid/SquidMiddleware.cs @@ -17,10 +17,10 @@ namespace Squidex.Pipeline.Squid public sealed class SquidMiddleware { private readonly RequestDelegate next; - private readonly string squidHappyLG = LoadSvg("happy-lg"); - private readonly string squidHappy = LoadSvg("happy"); - private readonly string squidSadLG = LoadSvg("sad-lg"); - private readonly string squidSad = LoadSvg("sad"); + private readonly string squidHappyLG = LoadSvg("happy"); + private readonly string squidHappySM = LoadSvg("happy-sm"); + private readonly string squidSadLG = LoadSvg("sad"); + private readonly string squidSadSM = LoadSvg("sad-sm"); public SquidMiddleware(RequestDelegate next) { @@ -42,7 +42,7 @@ namespace Squidex.Pipeline.Squid var isSad = face == "sad"; - var title = isSad ? "OH YEAR" : "OH DAMN"; + var title = isSad ? "OH DAMN!" : "OH YEAH!"; if (request.Query.TryGetValue("title", out var titleValue) && !string.IsNullOrWhiteSpace(titleValue)) { @@ -74,7 +74,7 @@ namespace Squidex.Pipeline.Squid if (isSmall) { - svg = isSad ? squidSad : squidHappy; + svg = isSad ? squidSadSM : squidHappySM; } else { diff --git a/src/Squidex/Pipeline/Squid/icon-happy-lg.svg b/src/Squidex/Pipeline/Squid/icon-happy-lg.svg deleted file mode 100644 index a9293fce0..000000000 --- a/src/Squidex/Pipeline/Squid/icon-happy-lg.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - {{TITLE}} - - {{TEXT1}} - {{TEXT2}} - {{TEXT3}} - - - - - - \ No newline at end of file diff --git a/src/Squidex/Pipeline/Squid/icon-happy-sm.svg b/src/Squidex/Pipeline/Squid/icon-happy-sm.svg new file mode 100644 index 000000000..0db2ba4be --- /dev/null +++ b/src/Squidex/Pipeline/Squid/icon-happy-sm.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + {{TITLE}} + + + {{TEXT1}} + {{TEXT2}} + {{TEXT3}} + + + + + + diff --git a/src/Squidex/Pipeline/Squid/icon-happy.svg b/src/Squidex/Pipeline/Squid/icon-happy.svg index 2fec21cc8..8bba6ab6e 100644 --- a/src/Squidex/Pipeline/Squid/icon-happy.svg +++ b/src/Squidex/Pipeline/Squid/icon-happy.svg @@ -1,24 +1,35 @@ - - - - - - - - - - - - - - {{TITLE}} - - {{TEXT1}} - {{TEXT2}} - {{TEXT3}} + + + + + + + + + + + + + + + {{TITLE}} - - - - - \ No newline at end of file + + {{TEXT1}} + {{TEXT2}} + {{TEXT3}} + + + + + + diff --git a/src/Squidex/Pipeline/Squid/icon-sad-lg.svg b/src/Squidex/Pipeline/Squid/icon-sad-lg.svg deleted file mode 100644 index efaa1a56c..000000000 --- a/src/Squidex/Pipeline/Squid/icon-sad-lg.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - {{TITLE}} - - {{TEXT1}} - {{TEXT2}} - {{TEXT3}} - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Squidex/Pipeline/Squid/icon-sad-sm.svg b/src/Squidex/Pipeline/Squid/icon-sad-sm.svg new file mode 100644 index 000000000..246a0e4af --- /dev/null +++ b/src/Squidex/Pipeline/Squid/icon-sad-sm.svg @@ -0,0 +1,45 @@ + + + + + {{TITLE}} + + + {{TEXT1}} + {{TEXT2}} + {{TEXT3}} + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Squidex/Pipeline/Squid/icon-sad.svg b/src/Squidex/Pipeline/Squid/icon-sad.svg index 700a647eb..49a0018d8 100644 --- a/src/Squidex/Pipeline/Squid/icon-sad.svg +++ b/src/Squidex/Pipeline/Squid/icon-sad.svg @@ -1,33 +1,45 @@ - - - - {{TITLE}} - - {{TEXT1}} - {{TEXT2}} - {{TEXT3}} + + + + + {{TITLE}} - - - - - - - - - + + {{TEXT1}} + {{TEXT2}} + {{TEXT3}} + + + + + + + + + + - - - - + + + + - - + + - - + + - \ No newline at end of file + diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index cd011fe36..49cb6bcd3 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -30,8 +30,8 @@ - - + +