Browse Source

Small variant for squid image.

pull/344/head
Sebastian Stehle 7 years ago
parent
commit
fc145ad1c8
  1. 2
      src/Squidex/Areas/IdentityServer/Views/Account/LogoutCompleted.cshtml
  2. 20
      src/Squidex/Pipeline/Squid/SquidMiddleware.cs
  3. 24
      src/Squidex/Pipeline/Squid/icon-happy-lg.svg
  4. 33
      src/Squidex/Pipeline/Squid/icon-sad-lg.svg
  5. 5
      src/Squidex/Squidex.csproj
  6. 2
      src/Squidex/app/shell/pages/not-found/not-found-page.component.html

2
src/Squidex/Areas/IdentityServer/Views/Account/LogoutCompleted.cshtml

@ -3,7 +3,7 @@
ViewBag.Title = "Logout"; ViewBag.Title = "Logout";
} }
<img class="splash-image" src="~/../squid.svg?title=SORRY&text=Hope%20to%20see%20you%20again%20soon!&face=happy" /> <img class="splash-image" src="~/../squid.svg?title=BYE%20BYE&text=Hope%20to%20see%20you%20again%20soon!&face=happy" />
<h1 class="splash-h1">Logged out!</h1> <h1 class="splash-h1">Logged out!</h1>

20
src/Squidex/Pipeline/Squid/SquidMiddleware.cs

@ -17,7 +17,9 @@ namespace Squidex.Pipeline.Squid
public sealed class SquidMiddleware public sealed class SquidMiddleware
{ {
private readonly RequestDelegate next; private readonly RequestDelegate next;
private readonly string squidHappyLG = LoadSvg("happy-lg");
private readonly string squidHappy = LoadSvg("happy"); private readonly string squidHappy = LoadSvg("happy");
private readonly string squidSadLG = LoadSvg("sad-lg");
private readonly string squidSad = LoadSvg("sad"); private readonly string squidSad = LoadSvg("sad");
public SquidMiddleware(RequestDelegate next) public SquidMiddleware(RequestDelegate next)
@ -61,7 +63,23 @@ namespace Squidex.Pipeline.Squid
background = backgroundValue; background = backgroundValue;
} }
var svg = isSad ? squidSad : squidHappy; var isSmall = false;
if (request.Query.TryGetValue("small", out _))
{
isSmall = true;
}
var svg = string.Empty;
if (isSmall)
{
svg = isSad ? squidSad : squidHappy;
}
else
{
svg = isSad ? squidSadLG : squidHappyLG;
}
var (l1, l2, l3) = SplitText(text); var (l1, l2, l3) = SplitText(text);

24
src/Squidex/Pipeline/Squid/icon-happy-lg.svg

@ -0,0 +1,24 @@
<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" viewBox="0 0 600 391.9" style="enable-background:new 0 0 600 391.9">
<style>.st0{fill:#3389ff}.st1{fill:#3370ff}.st2{fill:#fff}.st3{fill:#253256}.st9{font-family:-apple-system,BlinkMacSystemFont,&quot;Segoe UI&quot;,Roboto,&quot;Helvetica Neue&quot;,Arial,sans-serif,&quot;Apple Color Emoji&quot;,&quot;Segoe UI Emoji&quot;,&quot;Segoe UI Symbol&quot;}.st10{font-size:30px}.st12{fill:#3e4c7d}</style>
<path d="M532.8 152.9c.5-6.9 13.9-1.9 13.3-8.4-6.8-67.5-69.9-110.1-70-110.1-.1 0-73.5 20.2-101.5 82-2.7 5.9 11.6 5.5 9.9 12.2-2.1 8.2-18.6 8.9-20.4 33.1-2 26.1 16.7 55.8 15.1 70.4l18.3 4.5.4-2c.8-4.6 5.1-7.7 9.7-7 4.6.8 7.8 5.1 7 9.7l-.1.5 20.4-6.3.1-.4c.8-4.7 5.2-7.9 9.9-7.1 4.7.8 7.9 5.2 7.1 9.9l-.1.4 17.3 12.5.1-.5c.8-4.6 5.1-7.7 9.7-7 4.6.8 7.7 5.1 7 9.7l-.1.5 18.9 3.1c5.2-20 30.2-36.5 36.7-61.9 6-23.4-9.3-29.4-8.7-37.8z" class="st0"/>
<path d="M420.9 233.9c-2.7-7-23-1.1-20.3 5.9 9.9 25.8-.3 43.5-12.9 62-9.9 14.5-11.4 31.4-3.4 48.4 3.2 6.8 9 2 5.8-4.8-11.8-24.9 12.4-41.3 22.3-60 7.8-15 15.1-34.4 8.5-51.5zM460.8 245.3c4.2-7.4 22.9 1.6 18.6 9-15.7 27.3-9.7 48.1-1.6 70.1.5 1.3 15.2 19.1-7.8 53.8-4.7 7.1-9.3 1.1-4.6-6 17.3-26.1-2.6-47.1-8.1-68.9-4.3-17.6-6.9-39.9 3.5-58z" class="st1"/>
<path d="M448 316.8c-.9-10.5-4.2-19.1-5.5-29.5-1.5-12.6 3-24.4 8.9-35.3 3.7-6.7-15.4-12.7-19.1-6.1-8.6 15.8-4.8 34.6-.8 52 2.5 10.9 7.3 21.2 3.6 33-3.5 11-11 21-17.6 29.7-4.5 6 1.4 11.1 6 5.1 10.5-13.8 26.1-29.7 24.5-48.9z" class="st1"/>
<path d="M513.7 318.6c-1-13.5-7.2-24.2-15-34.9-2.9-4-4.3-8.9-3.2-13.8 1.2-5.1 5-8.9 8-13 3.4-4.6 5.1-9.9 6.4-15.5 1.5-5.9 2.2-12 2.7-18.1 1.2-15 .5-30.2-.9-45.1-1.5-16.5-4.1-32.8-7.5-49-3.1-14.6-6.8-29.1-11.9-43.1-3.4-9.5-7.3-19.8-14-27.5-1.9-2.2-4.3-4.5-7.3-4.9-5.7-.9-12.3 6.8-15.8 10.3-8.7 8.8-16.3 18.9-23.4 29-9.1 12.9-17.4 26.3-25.1 40-7.8 14.1-15 28.5-20.9 43.5-5 12.6-9.3 25.8-10.7 39.4-1 9.6.2 18.4 3.7 27.3 3.3 8.2 1.1 17.1-6.5 22-11.1 7.2-20.6 15.1-26.3 27.4-5.2 11.2-5.6 24.2 1.2 34.9 3.6 5.6 8.3.9 4.8-4.7-7-11-1.3-23.6 6.6-32.2 10.9-11.9 29.6-16.1 37.7-30.6 2.5-4.5 4.2-9.7 4.5-14.9 21.3 4.6 53.2 10.9 77.4 12.4-.9 4.3-1 8.8-.3 13.1 2.4 16.4 18.6 26.9 24.6 41.9 4.4 10.9 5.3 24.7-5.1 32.5-5.3 4-2.5 10.1 2.8 6.1 10.3-7.8 14.4-20.1 13.5-32.5z" class="st1"/>
<ellipse cx="405.8" cy="178.3" class="st0" rx="8.3" ry="12.7" transform="rotate(-80.689 405.782 178.323)"/>
<ellipse cx="493.3" cy="192.7" class="st0" rx="8.3" ry="12.7" transform="rotate(-80.689 493.236 192.67)"/>
<ellipse cx="485.5" cy="169.9" class="st3" rx="9.4" ry="9.4" transform="rotate(-80.689 485.487 169.884)"/>
<ellipse cx="424" cy="159.8" class="st3" rx="9.4" ry="9.4" transform="rotate(-80.689 423.967 159.791)"/>
<path d="M466.9 199.9c-2 12.2-11.3 20.8-20.8 19.2s-15.5-12.7-13.6-24.8c2-12.2 7.7 1.3 17.2 2.8 9.5 1.6 19.2-9.3 17.2 2.8z" class="st3"/>
<path d="M423.5 153.4c-5.2-.8-6.5 7.2-1.3 8 5.1.9 6.4-7.2 1.3-8zM485 163.5c-5.2-.8-6.5 7.2-1.3 8 5.1.8 6.5-7.2 1.3-8zM449.7 197.1c-4.1-.7-7.4-3.5-10.1-5.6 2.4 3.5 5.5 8 9.6 8.7 4.1.7 8.4-2.6 11.8-5.2-3.1 1.2-7.2 2.8-11.3 2.1z" class="st2"/>
<path d="M346 223.2c-16.9-8.5-28.9-20-36.6-29.3 18.6-27 26.6-58.4 20.1-89.5C314.7 34.4 232-7.4 144.7 11 57.4 29.4-1.4 101.1 13.4 171s97.4 111.8 184.7 93.4c31.1-6.6 58.6-19.9 80.4-37.5 44.3 17.3 67.5-3.7 67.5-3.7z" style="fill:[COLOR]"/>
<text transform="translate(74.602 96.7)" style="letter-spacing:1;font-size:20px;font-family:-apple-system,BlinkMacSystemFont,&quot;Segoe UI&quot;,Roboto,&quot;Helvetica Neue&quot;,Arial,sans-serif,&quot;Apple Color Emoji&quot;,&quot;Segoe UI Emoji&quot;,&quot;Segoe UI Symbol&quot;;font-weight:700;fill:#2d3964">{{TITLE}}</text>
<text transform="translate(74.602 139.655)">
<tspan x="0" y="0" class="st2 st9 st10">{{TEXT1}}</tspan>
<tspan x="0" y="40" class="st2 st9 st10">{{TEXT2}}</tspan>
<tspan x="0" y="80" class="st2 st9 st10">{{TEXT3}}</tspan>
</text>
<circle cx="579" cy="124.6" r="5.9" style="fill:#414e7c"/>
<circle cx="553.3" cy="112.9" r="1.8" class="st0"/>
<circle cx="578.1" cy="152.3" r="3.6" class="st0"/>
<path d="M300.7 29.6l9.4-3.9-.8 10.6zM305.9 277.5l9.5-3.9-.9 10.6z" class="st12"/>
</svg>

After

Width:  |  Height:  |  Size: 4.1 KiB

33
src/Squidex/Pipeline/Squid/icon-sad-lg.svg

@ -0,0 +1,33 @@
<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" style="enable-background:new 0 0 600 391.9" viewBox="0 0 600 391.9">
<style>.st5{fill:#2d3964}.st6{font-family:-apple-system,BlinkMacSystemFont,&quot;Segoe UI&quot;,Roboto,&quot;Helvetica Neue&quot;,Arial,sans-serif,&quot;Apple Color Emoji&quot;,&quot;Segoe UI Emoji&quot;,&quot;Segoe UI Symbol&quot;}.st7{font-size:30px}.st8{fill:#e4e4ea}.st9{fill:#3389ff}.st11{fill:#3370ff}.st12{fill:#253256}.st13{fill:#fff}</style>
<path d="M349 231.4c-16.9-8.5-28.9-20-36.6-29.3 18.6-27 26.6-58.4 20.1-89.5C317.7 42.7 235 .9 147.7 19.3c-87.3 18.4-146.1 90-131.3 160s97.4 111.8 184.7 93.4c31.1-6.6 58.6-19.9 80.4-37.5 44.3 17.3 67.5-3.8 67.5-3.8z" style="fill:[COLOR]"/>
<text transform="translate(77.559 104.938)" style="letter-spacing:1;font-size:20px;font-family:-apple-system,BlinkMacSystemFont,&quot;Segoe UI&quot;,Roboto,&quot;Helvetica Neue&quot;,Arial,sans-serif,&quot;Apple Color Emoji&quot;,&quot;Segoe UI Emoji&quot;,&quot;Segoe UI Symbol&quot;;font-weight:700;fill:#4cc159">{{TITLE}}</text>
<text transform="translate(77.559 147.894)">
<tspan x="0" y="0" class="st5 st6 st7">{{TEXT1}}</tspan>
<tspan x="0" y="40" class="st5 st6 st7">{{TEXT2}}</tspan>
<tspan x="0" y="80" class="st5 st6 st7">{{TEXT3}}</tspan>
</text>
<circle cx="581.9" cy="132.9" r="5.9" class="st8"/>
<circle cx="566.2" cy="105.1" r="1.8" class="st9"/>
<circle cx="571.1" cy="180.5" r="3.6" class="st9"/>
<path style="fill:#ceced8" d="M356.7 48.4l9.5-3.9-.9 10.6z"/>
<path d="M303.4 280.5l9.5-3.9-.9 10.5z" class="st8"/>
<path d="M526.9 147c-.6-6.9 13.5-4.2 11.8-10.5-17.6-65.6-87-97.5-87-97.5-.1 0-69.4 31.9-87 97.5-1.7 6.3 12.4 3.5 11.8 10.5-.8 8.4-16.9 11.9-14.8 36 2.3 26.1 25.5 52.5 26.4 67.1l18.8 1.5v-2.1c0-4.7 3.8-8.5 8.5-8.5s8.5 3.8 8.5 8.5v.6l19.2-9.6v-.4c0-4.8 3.9-8.7 8.7-8.7 4.8 0 8.7 3.9 8.7 8.7v.4l19.1 9.6v-.6c0-4.7 3.8-8.5 8.5-8.5s8.5 3.8 8.5 8.5v.6h19.2c1.9-20.6 23.9-41 26.2-67.1 1.9-24.2-14.3-27.6-15.1-36z" class="st9"/>
<path d="M429.5 245.1c-3.8-6.5-22.9 2.6-19.1 9.1 14 23.9 6.7 43-2.7 63.4-7.4 15.9-6.2 32.9 4.4 48.4 4.3 6.2 9.2.5 5-5.6-15.7-22.7 5.5-42.8 12.3-62.9 5.4-16.2 9.4-36.5.1-52.4zM470.8 250c3-8 22.9-2.2 19.9 5.9-11.1 29.5-1.8 49.1 9.8 69.5.7 1.2 18.2 16.4 1 54.5-3.5 7.8-9 2.6-5.5-5.1 12.9-28.6-10.2-46.1-19.1-66.8-7.3-16.9-13.5-38.4-6.1-58z" class="st11"/>
<path d="M469.7 322.7c-2.6-10.2-7.3-18.2-10.2-28.2-3.5-12.2-1-24.6 3.1-36.4 2.5-7.2-17.3-10.1-19.8-2.9-6 17 .8 35 7.6 51.5 4.2 10.4 10.7 19.8 8.9 32-1.7 11.4-7.5 22.5-12.6 32.2-3.5 6.7 3.2 10.8 6.7 4.1 8.2-15.4 21-33.5 16.3-52.3z" class="st11"/>
<path d="M535 313.9c-3.2-13.2-11-22.8-20.5-32-3.6-3.5-5.7-8.1-5.4-13.1.3-5.2 3.5-9.6 5.8-14.2 2.6-5.1 3.4-10.6 3.8-16.3.5-6.1.3-12.2-.2-18.3-1.3-15-4.4-29.9-8.2-44.5-4.2-16-9.4-31.8-15.4-47.2-5.4-13.9-11.4-27.7-18.7-40.7-4.9-8.8-10.4-18.4-18.3-25-2.2-1.8-5-3.7-8-3.7-5.8 0-11.1 8.8-13.9 12.7-7.2 10.1-13 21.3-18.4 32.4-6.9 14.2-13 28.8-18.3 43.6-5.5 15.2-10.2 30.6-13.6 46.4-2.9 13.3-5 27-4.2 40.7.6 9.6 3.2 18.2 8.1 26.4 4.5 7.6 3.8 16.7-2.8 22.8-9.7 9-17.9 18.3-21.5 31.3-3.3 12-1.6 24.8 6.8 34.3 4.4 5 8.4-.5 3.9-5.4-8.7-9.7-5.1-23.1 1.3-32.9 8.8-13.6 26.7-20.7 32.3-36.4 1.7-4.8 2.6-10.2 2.1-15.4 21.8 1.1 54.4 2.1 78.5-.3-.2 4.4.5 8.9 1.8 13 5.1 15.8 22.7 23.6 31.1 37.4 6.1 10.1 9.2 23.5.3 33-4.6 4.8-.8 10.4 3.8 5.6 8.6-9.4 10.7-22.2 7.8-34.2z" class="st11"/>
<g>
<path d="M432.5 216.8c0-12.3 7.8-22.3 17.4-22.3 9.6 0 17.4 10 17.4 22.3s-7.8 0-17.4 0c-9.6 0-17.4 12.4-17.4 0z" class="st12"/>
<path d="M463.1 202.3c-3.2-4.7-7.9-7.8-13.2-7.8-5.3 0-10 3-13.2 7.8h11.8c.3 0 .6-.2.7-.6l.8-4.8.7 4.6c.1.5.5.8.9.8h11.5z" class="st13"/>
<ellipse cx="405.6" cy="192.7" class="st9" rx="12.7" ry="8.3"/>
<ellipse cx="494.3" cy="192.7" class="st9" rx="12.7" ry="8.3"/>
<g>
<path d="M404.9 176.9c0-6.5 5.3-11.7 11.7-11.7 6.5 0 11.7 5.3 11.7 11.7h-23.4z" class="st12"/>
<path d="M413.7 166.6c-4 0-4 6.2 0 6.2s4-6.2 0-6.2zM417 172.3c-1.3 0-1.3 2.1 0 2.1s1.3-2.1 0-2.1z" class="st13"/>
<g>
<path d="M498.6 178.7c0-8.4-6.8-15.3-15.3-15.3-8.4 0-15.3 6.8-15.3 15.3h30.6z" class="st12"/>
<path d="M479.3 165.2c-5.2 0-5.2 8.1 0 8.1 5.3 0 5.3-8.1 0-8.1zM483.6 172.7c-1.7 0-1.7 2.7 0 2.7 1.8 0 1.8-2.7 0-2.7z" class="st13"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.2 KiB

5
src/Squidex/Squidex.csproj

@ -29,6 +29,11 @@
<Content Remove="tslint.json" /> <Content Remove="tslint.json" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Remove="Pipeline\Squid\icon-happy-lg.svg" />
<None Remove="Pipeline\Squid\icon-sad-lg.svg" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="dockerfile"> <None Update="dockerfile">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>

2
src/Squidex/app/shell/pages/not-found/not-found-page.component.html

@ -1,7 +1,7 @@
<sqx-title message="Not Found"></sqx-title> <sqx-title message="Not Found"></sqx-title>
<div class="landing-page"> <div class="landing-page">
<img class="splash-image" src="~/../squid.svg?title=OH%20DAMN&text=This%20is%20not%20the%20page%20you%20are%20looking%20for!&background=white" /> <img class="splash-image" src="~/../squid.svg?title=OH%20DAMN&text=This%20is%20not%20the%20page%20you%20are%20looking%20for!&background=white&small" />
<h1>Not Found</h1> <h1>Not Found</h1>

Loading…
Cancel
Save