Merge branch develop into feature/push-notification

This commit is contained in:
CMK 2021-04-27 16:29:17 +08:00
commit 9c3e4a706e
23 changed files with 872 additions and 92 deletions

View File

@ -146,7 +146,7 @@
"title": "Tell us about you.", "title": "Tell us about you.",
"input": { "input": {
"avatar": { "avatar": {
"delete": "delete" "delete": "Delete"
}, },
"username": { "username": {
"placeholder": "username", "placeholder": "username",

View File

@ -34,7 +34,7 @@ extension CategoryPickerSection {
cell.categoryView.titleLabel.textColor = .white cell.categoryView.titleLabel.textColor = .white
} }
} else { } else {
cell.categoryView.bgView.backgroundColor = Asset.Colors.Background.systemBackground.color cell.categoryView.bgView.backgroundColor = Asset.Colors.Background.secondaryGroupedSystemBackground.color
cell.categoryView.bgView.applyShadow(color: Asset.Colors.brandBlue.color, alpha: 0, x: 0, y: 0, blur: 0.0) cell.categoryView.bgView.applyShadow(color: Asset.Colors.brandBlue.color, alpha: 0, x: 0, y: 0, blur: 0.0)
if case .all = item { if case .all = item {
cell.categoryView.titleLabel.textColor = Asset.Colors.brandBlue.color cell.categoryView.titleLabel.textColor = Asset.Colors.brandBlue.color

View File

@ -23,6 +23,7 @@ internal typealias AssetImageTypeAlias = ImageAsset.Image
internal enum Asset { internal enum Asset {
internal static let accentColor = ColorAsset(name: "AccentColor") internal static let accentColor = ColorAsset(name: "AccentColor")
internal enum Asset { internal enum Asset {
internal static let email = ImageAsset(name: "Asset/email")
internal static let mastodonTextLogo = ImageAsset(name: "Asset/mastodon.text.logo") internal static let mastodonTextLogo = ImageAsset(name: "Asset/mastodon.text.logo")
} }
internal enum Circles { internal enum Circles {
@ -62,7 +63,6 @@ internal enum Asset {
internal static let normal = ColorAsset(name: "Colors/Button/normal") internal static let normal = ColorAsset(name: "Colors/Button/normal")
} }
internal enum Icon { internal enum Icon {
internal static let photo = ColorAsset(name: "Colors/Icon/photo")
internal static let plus = ColorAsset(name: "Colors/Icon/plus") internal static let plus = ColorAsset(name: "Colors/Icon/plus")
} }
internal enum Label { internal enum Label {
@ -83,6 +83,7 @@ internal enum Asset {
internal static let bar = ColorAsset(name: "Colors/Slider/bar") internal static let bar = ColorAsset(name: "Colors/Slider/bar")
} }
internal enum TextField { internal enum TextField {
internal static let background = ColorAsset(name: "Colors/TextField/background")
internal static let highlight = ColorAsset(name: "Colors/TextField/highlight") internal static let highlight = ColorAsset(name: "Colors/TextField/highlight")
internal static let invalid = ColorAsset(name: "Colors/TextField/invalid") internal static let invalid = ColorAsset(name: "Colors/TextField/invalid")
internal static let valid = ColorAsset(name: "Colors/TextField/valid") internal static let valid = ColorAsset(name: "Colors/TextField/valid")

View File

@ -502,7 +502,7 @@ internal enum L10n {
} }
internal enum Input { internal enum Input {
internal enum Avatar { internal enum Avatar {
/// delete /// Delete
internal static let delete = L10n.tr("Localizable", "Scene.Register.Input.Avatar.Delete") internal static let delete = L10n.tr("Localizable", "Scene.Register.Input.Avatar.Delete")
} }
internal enum DisplayName { internal enum DisplayName {

View File

@ -0,0 +1,22 @@
{
"images" : [
{
"filename" : "c1.svg",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "c1-1.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

View File

@ -0,0 +1,342 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" 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 674.4 707.4" style="enable-background:new 0 0 674.4 707.4;" xml:space="preserve">
<style type="text/css">
.st0{fill:#000000;}
.st1{fill:#FFFFFF;}
.st2{fill:url(#SVGID_1_);}
.st3{fill:#543930;}
.st4{fill:#DB957C;}
.st5{fill:#FBCA82;}
.st6{fill:#F6EBE5;}
.st7{fill:#7D7774;}
.st8{fill:#E3D9D3;}
.st9{fill:url(#SVGID_2_);}
.st10{fill:#4E414F;}
.st11{fill:#B84242;stroke:#000000;stroke-miterlimit:10;}
.st12{fill:#F0F8FF;}
.st13{fill:#65686B;}
.st14{fill:#DDE4EB;}
.st15{fill:#964545;stroke:#421E1E;stroke-miterlimit:10;}
.st16{fill:#6E3232;stroke:#421E1E;stroke-miterlimit:10;}
.st17{fill:#CF7676;}
.st18{fill:#A8ADB3;}
.st19{fill:none;stroke:#000000;stroke-miterlimit:10;}
</style>
<rect x="-45" y="-50.2" class="st0" width="762.8" height="798.4"/>
<path class="st1" d="M463.7,155.1c-7-1.4-12.5-7.6-14.4-14.4c-1.9-6.9-0.6-14.4,2.3-20.9c1.7-3.8,3.9-7.5,7-10.2s6.4-4.4,10.6-4.1
c1.4-7.2,8.3-11.7,14.7-15.2c9.4-5,19.5-9.5,30.1-9.3c10.6,0.1,21.1,5.5,24.3,15.6c8.7-2.7,17.7-4.9,26.8-4.4
c9.1,0.4,18.4,3.8,24.3,10.7c9.2,10.7,8.3,27.1,2.4,39.9c-7,15.1-21,27.6-37.5,29.5c-5.2,9.6-16.3,14.3-27,16.7
c-10.7,2.4-22,3.1-32.8,0.9c-10.8-2.2-21.1-7.4-28.4-15.7C461.7,168.9,461.3,161.5,463.7,155.1z"/>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="364.8752" y1="353.0159" x2="377.5741" y2="340.3171">
<stop offset="0" style="stop-color:#FBCA82"/>
<stop offset="1" style="stop-color:#FBDB83"/>
</linearGradient>
<path class="st2" d="M332.3,410.5c30-4,70-27,68-44s-16-48-35-42s-29,19-46,19S332.3,410.5,332.3,410.5z"/>
<path class="st3" d="M333.2,408.9c0.4-0.2,0.8-0.4,1.2-0.5c0.1,0,0.2,0,0.3-0.1l0.4-0.1l1-0.2c1.4-0.2,2.7-0.5,4.1-0.8
c2.7-0.6,5.4-1.3,8-2.1c5.3-1.6,10.5-3.5,15.6-5.7c5.1-2.3,10-4.8,14.8-7.7c2.4-1.4,4.7-3,6.9-4.7c2.2-1.7,4.3-3.4,6.3-5.4
c2-1.9,3.8-4,5.2-6.3c1.4-2.3,2.5-4.8,2.6-7.5c0-1.3-0.2-2.7-0.4-4c-0.2-1.4-0.5-2.7-0.8-4.1c-0.6-2.7-1.4-5.4-2.4-8
c-1.9-5.3-4.2-10.4-7.4-15c-1.6-2.3-3.3-4.5-5.3-6.4c-2-1.9-4.2-3.7-6.7-4.8c-2.5-1.1-5.3-1.6-8-1.3c-1.4,0.2-2.7,0.5-4,1
c-1.3,0.5-2.6,0.9-3.9,1.5c-5.2,2.1-10,4.9-14.8,7.8c-4.8,2.9-9.7,5.8-15.1,7.8c-2.7,1-5.5,1.6-8.4,2l-2.2,0.1l-1.1,0.1
c-0.3,0-0.6,0-0.9,0.1c-1.1,0.2-1.9,1-2.4,2.1c-0.5,1.1-0.7,2.4-0.8,3.7c-0.1,1.3,0,2.7,0.1,4c0.3,2.7,0.8,5.4,1.4,8.2
c1.2,5.4,2.9,10.8,4.7,16c1.8,5.3,3.9,10.5,6,15.7c1.1,2.6,2.1,5.2,3.3,7.7l1.7,3.8l0.9,1.9l0.4,1l0.2,0.5l0.1,0.2c0,0,0,0.1,0,0
c0-0.1-0.1-0.2-0.2-0.3C333.6,409.1,333.4,409,333.2,408.9z M331.4,412.2c-0.2-0.2-0.5-0.4-0.6-0.6c-0.1-0.1-0.2-0.3-0.2-0.4
l-0.1-0.1l-0.1-0.2l-0.2-0.5l-0.4-1l-0.8-2l-1.6-3.9c-1.1-2.6-2.1-5.2-3.1-7.9c-2-5.3-3.9-10.6-5.7-16c-1.7-5.4-3.3-10.8-4.5-16.4
c-0.6-2.8-1.1-5.6-1.3-8.5c-0.1-1.5-0.2-2.9,0-4.4c0.1-1.5,0.3-3.1,1.1-4.6c0.4-0.8,0.9-1.5,1.6-2.2c0.7-0.6,1.6-1.1,2.5-1.2
c0.5-0.1,0.9-0.1,1.3-0.2l1,0l2-0.1c2.7-0.3,5.3-0.8,7.9-1.7c5.1-1.8,10-4.6,14.8-7.4c4.9-2.8,9.9-5.6,15.2-7.7
c1.3-0.6,2.7-1,4-1.5c1.3-0.5,2.9-0.8,4.3-1c3-0.3,6.1,0.3,8.7,1.6c2.7,1.2,5,3.1,7.1,5.1c2.1,2,3.8,4.3,5.4,6.7
c1.6,2.4,3,4.9,4.2,7.4c1.3,2.5,2.4,5.2,3.4,7.8c1,2.7,1.8,5.4,2.5,8.1c0.3,1.4,0.6,2.8,0.9,4.2c0.2,1.4,0.5,2.8,0.5,4.3
c0,3-1.2,5.9-2.6,8.4c-1.5,2.5-3.3,4.7-5.3,6.8c-2,2.1-4.1,4-6.4,5.7c-2.2,1.8-4.5,3.4-6.9,5c-4.8,3.1-9.8,5.8-14.9,8.2
c-5.1,2.4-10.4,4.5-15.8,6.3c-2.7,0.9-5.4,1.7-8.2,2.4c-1.4,0.3-2.8,0.7-4.2,0.9l-1.1,0.2l-0.3,0.1l-0.4,0.1l-0.7,0.1
C333.3,412.2,332.3,412.2,331.4,412.2z"/>
</g>
<path class="st4" d="M332.3,408.9c-1.1-2.6-8.2-18.3-13.1-34.3c7.7-2.4,15.3-5.4,22-8.1c10.3-4.1,19.2-7.6,25-7.6
c1.7,0,3,0.3,4.1,0.9c12.4,6.7,15.8,18.1,16.8,26.5C373.1,397.8,350.8,406.4,332.3,408.9z"/>
<g>
<path class="st5" d="M215.3,554.5c0,20-4,37-8,47s22,44,48,22s29-65,27-86S215.3,554.5,215.3,554.5z"/>
<g>
<path class="st3" d="M215.7,554.8c0,1.4,0.1,2.7,0,4.2c0,1.5-0.1,3-0.1,4.4c-0.1,3-0.4,5.9-0.7,8.8c-0.6,5.9-1.6,11.7-3.1,17.5
c-0.7,2.9-1.5,5.7-2.5,8.6c-0.2,0.7-0.5,1.4-0.7,2.1c-0.2,0.7-0.6,1.5-0.7,2c-0.3,1.2-0.2,2.6,0.1,3.9c0.6,2.7,1.9,5.3,3.5,7.7
c1.6,2.4,3.4,4.6,5.5,6.6c4.1,4,9.1,7.1,14.7,8.5c2.8,0.7,5.6,0.8,8.4,0.5c2.8-0.4,5.5-1.2,8.1-2.5c2.6-1.2,4.9-3,7.1-4.8
c2.2-1.9,4.2-4,6.1-6.2c3.7-4.4,6.9-9.4,9.5-14.6c5.2-10.5,8.2-21.9,9.8-33.5c0.8-5.8,1.2-11.6,1.3-17.5c0-2.9,0-5.9-0.2-8.8
c-0.1-1.5-0.2-2.9-0.3-4.4c-0.2-1.3-0.6-2.6-1.6-3.5c-0.9-0.9-2.2-1.4-3.5-1.7c-1.4-0.3-2.8-0.3-4.2-0.2c-2.9,0.2-5.7,0.7-8.5,1.5
c-5.6,1.5-11.1,3.5-16.6,5.8c-5.4,2.3-10.7,4.8-16,7.4c-2.6,1.3-5.2,2.7-7.8,4l-3.9,2.1l-1.9,1.1l-1,0.5l-0.5,0.3L215.7,554.8
C215.7,554.9,215.7,554.9,215.7,554.8C215.7,554.8,215.7,554.8,215.7,554.8z M214.9,554.3c0.1-0.1,0.1-0.1,0.2-0.2
c0.1-0.1,0.2-0.1,0.2-0.1l0.2-0.1l0.5-0.3l1-0.6l1.9-1.1l3.9-2.1c2.6-1.4,5.2-2.8,7.8-4.1c5.3-2.7,10.6-5.2,16-7.6
c5.4-2.3,11-4.5,16.7-6c2.9-0.8,5.8-1.4,8.8-1.6c1.5-0.1,3.1-0.1,4.6,0.3c1.5,0.3,3.1,0.9,4.3,2.1c1.2,1.2,1.8,2.8,2,4.4
c0.2,1.5,0.3,3,0.4,4.5c0.2,3,0.2,5.9,0.2,8.9c-0.1,5.9-0.5,11.8-1.3,17.7c-1.6,11.7-4.6,23.4-9.8,34.1c-2.6,5.3-5.8,10.4-9.7,15
c-2,2.2-4,4.4-6.3,6.4c-2.3,1.9-4.7,3.8-7.4,5.1c-2.7,1.4-5.7,2.3-8.7,2.7c-3,0.4-6.1,0.2-9.1-0.5c-6-1.4-11.3-4.8-15.5-9
c-2.2-2.1-4.1-4.5-5.7-7c-1.6-2.5-3-5.3-3.7-8.3c-0.3-1.5-0.5-3.1-0.1-4.8c0.2-0.9,0.5-1.4,0.8-2.2c0.3-0.7,0.5-1.4,0.8-2.1
c1-2.8,1.8-5.6,2.5-8.4c1.5-5.7,2.5-11.4,3.3-17.2c0.4-2.9,0.7-5.8,0.9-8.8c0.1-1.5,0.2-2.9,0.2-4.4
C214.7,557.5,214.8,555.8,214.9,554.3z"/>
</g>
</g>
<path class="st4" d="M237.3,629.8c-11,0-20.2-7.8-25.2-15.1c-3.4-5.1-5-10.1-3.9-12.8c1.9-4.7,8-21.9,8.1-46.8
c2.3-1.3,12.3-7,23.8-12.3l5.7,7.6c-0.9,17.4-5.1,30.1-8.2,39.4c-4.3,13.1-7,21,4.7,27.1c4.2,2.2,8.9,3.6,14.2,4.2
c-0.6,0.6-1.2,1.1-1.8,1.6C249.1,627.5,243.3,629.8,237.3,629.8C237.3,629.8,237.3,629.8,237.3,629.8z"/>
<g>
<path class="st6" d="M292.5,326.4c-12,7.5-8,23,3,28s45,19,58,0s20-38,13-53s-14-2-14,5s-8,29-22,25S300.5,321.4,292.5,326.4z"/>
<g>
<path class="st7" d="M292.7,326.7c-2.2,1.4-4.1,3.3-5.4,5.5c-1.3,2.2-1.8,4.9-1.7,7.4c0.3,5.2,3.3,10.1,7.7,12.9
c2.2,1.4,4.7,2.3,7.1,3.4c2.5,1,4.9,2,7.5,2.8c5,1.7,10.2,3.2,15.4,4c5.2,0.8,10.6,1.1,15.8,0.1c2.6-0.5,5.1-1.4,7.4-2.7
c2.3-1.3,4.3-3,5.9-5.1c3.1-4.3,5.9-8.9,8.4-13.5c2.5-4.7,4.6-9.6,6.1-14.7c1.5-5.1,2.3-10.4,1.8-15.7l-0.1-1l-0.2-1l-0.3-2
c-0.2-0.6-0.4-1.3-0.5-1.9l-0.3-1c-0.1-0.3-0.2-0.6-0.4-0.9l-0.7-1.8c-0.3-0.6-0.6-1.2-0.9-1.8c-0.6-1.2-1.3-2.3-2.2-3.2
c-0.9-1-1.9-1.8-3.2-1.9c-1.2-0.1-2.4,0.5-3.3,1.4c-1.8,1.9-2.9,4.4-3.5,6.9c-0.2,0.6-0.3,1.3-0.3,1.9c-0.1,0.7-0.1,1.3-0.1,2
c-0.1,1.4-0.3,2.7-0.6,4c-0.6,2.6-1.5,5.2-2.7,7.6c-1.1,2.4-2.5,4.8-4.1,6.9c-1.7,2.1-3.7,4.1-6.1,5.3c-1.2,0.6-2.5,1.1-3.9,1.3
c-1.4,0.2-2.8,0.1-4.1-0.2c-2.6-0.7-5.2-1.5-7.7-2.2c-5.1-1.5-10.2-3-15.5-4c-2.6-0.5-5.2-0.8-7.9-0.8
C297.6,325,294.9,325.4,292.7,326.7z M292.3,326c2.4-1.5,5.2-1.9,7.9-1.9c2.7,0,5.4,0.3,8,0.8c5.3,1,10.4,2.6,15.5,4.1
c2.6,0.8,5.1,1.6,7.7,2.2c1.3,0.3,2.6,0.4,3.8,0.2c1.3-0.2,2.5-0.6,3.7-1.2c2.3-1.2,4.3-3,5.9-5.1c1.6-2.1,3-4.4,4.1-6.8
c1.1-2.4,2-4.9,2.6-7.5c0.3-1.3,0.6-2.6,0.6-3.9c0-0.6,0-1.3,0.1-2c0.1-0.7,0.2-1.3,0.4-2c0.7-2.6,1.7-5.2,3.7-7.2
c1-1,2.3-1.7,3.8-1.6c1.5,0.2,2.6,1.1,3.6,2.1c0.9,1,1.7,2.2,2.3,3.4c0.3,0.6,0.6,1.2,0.9,1.8l0.8,1.9c0.1,0.3,0.3,0.6,0.4,0.9
l0.3,1c0.2,0.6,0.4,1.3,0.5,1.9l0.4,2l0.2,1l0.1,1c0.5,5.4-0.3,10.8-1.8,15.9c-1.5,5.2-3.7,10.1-6.2,14.8
c-2.5,4.7-5.3,9.3-8.4,13.7c-1.7,2.2-3.7,4-6.1,5.3c-2.4,1.4-5,2.3-7.6,2.8c-5.3,1.1-10.8,0.8-16.1,0c-5.3-0.8-10.5-2.3-15.6-4
c-2.5-0.9-5-1.8-7.5-2.8c-2.5-1.1-5-2-7.3-3.5c-4.6-3-7.8-8.2-8.1-13.7c-0.2-2.7,0.5-5.5,1.8-7.9C287.9,329.4,290,327.5,292.3,326
z"/>
</g>
</g>
<path class="st8" d="M332,363.5c-2.4,0-5-0.2-7.8-0.6l2.7-11.4c18.2-6.4,24.9-17.6,26.6-20.9c1.6-3.2,5.5-5.7,8.6-5.7
c0.8,0,1.9,0.2,2.7,1c0.8,0.9,1.1,2.3,0.9,4.1c-2.6,7.3-6.8,15.4-12.7,24C348.8,360.4,341.7,363.5,332,363.5
C332,363.5,332,363.5,332,363.5z"/>
<g>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="196.4622" y1="448.0467" x2="465.0097" y2="194.1282">
<stop offset="0" style="stop-color:#FBCA82"/>
<stop offset="1" style="stop-color:#FBDB83"/>
</linearGradient>
<path class="st9" d="M120.3,396.5c0,0-32,19-48,25s-19,23-7,38s30,19,54,8c0,0-21,47,11,73s81,34,124,22s83-38,92-82s6-126-16-163
c0,0,34.6-32,37-63c1-13,0-17,0-17s10-3,7-14s-16-4-16-4l-6-3c0,0-1-12-11-12s-12,9-10,16s2,7,2,7s5,30-24,39s-47-16-96-7
c-49,9-75,46-79,75S120.3,396.5,120.3,396.5z"/>
<path class="st3" d="M120.7,396.9c-0.5,0.4-0.8,0.5-1.2,0.8l-1.1,0.6l-2.2,1.3l-4.3,2.5c-2.9,1.7-5.8,3.3-8.7,4.9
c-5.8,3.2-11.7,6.4-17.7,9.3c-3,1.5-6,2.9-9.1,4.2c-1.5,0.7-3.1,1.2-4.6,1.9c-0.7,0.3-1.5,0.6-2.2,1l-2.1,1.2c-2.7,1.8-5,4.2-6.6,7
c-1.6,2.8-2.3,6.1-2.3,9.3c0,3.2,0.7,6.5,1.9,9.5c1.3,3,3,5.9,5,8.5c4.1,5.2,9.3,9.5,15.4,11.9c6.1,2.4,12.9,3,19.4,2
c6.5-0.9,12.9-3,18.9-5.8l1.2-0.5l-0.5,1.2l0,0c-2,4.8-3.4,9.9-4.5,15c-0.5,2.6-1,5.1-1.3,7.7c-0.3,2.6-0.5,5.2-0.6,7.8
c-0.1,2.6,0,5.2,0.3,7.8c0.2,1.3,0.3,2.6,0.5,3.9l0.3,1.9l0.4,1.9c1.2,5.1,3.1,9.9,5.9,14.2c2.7,4.4,6.2,8.3,10.2,11.5l6.3,4.7
l6.6,4.2c8.9,5.4,18.6,9.5,28.6,12.5c20,6,41.4,7.4,62.1,4.6c1.3-0.2,2.6-0.3,3.9-0.5l3.9-0.7l3.9-0.7l3.8-0.9
c5.1-1.1,10.1-2.7,15.1-4.4c9.9-3.4,19.6-7.5,28.8-12.6c9.1-5.1,17.8-11.2,25.4-18.4c7.6-7.2,14.1-15.6,18.9-24.9
c2.4-4.7,4.4-9.5,5.9-14.5c1.5-5,2.5-10.2,3.3-15.4c1.6-10.4,2.5-20.9,3-31.4c0.4-10.5,0.4-21.1,0-31.6c-0.4-10.5-1.3-21-2.7-31.4
c-1.4-10.4-3.3-20.8-6-31c-1.4-5.1-3-10.1-4.8-15c-1.9-4.9-4.1-9.7-6.7-14.2l-0.2-0.3l0.3-0.3l0,0c5.5-5.2,10.6-10.9,15.3-16.9
c4.7-6,9-12.2,12.7-18.9c3.6-6.7,6.6-13.7,8.1-21.1c0.8-3.7,0.9-7.5,1.1-11.3c0.1-1.9,0.1-3.8,0.1-5.7c0-1.9-0.1-3.8-0.4-5.6
l-0.1-0.5l0.4-0.1c2.7-1,5.2-3,6.4-5.6c0.6-1.3,0.8-2.8,0.8-4.3c-0.1-0.7-0.1-1.5-0.3-2.2l-0.2-1.1c-0.1-0.4-0.2-0.7-0.3-1.1
c-0.5-1.4-1.3-2.7-2.4-3.5c-1.1-0.9-2.6-1.3-4-1.4c-2.9-0.1-5.9,0.8-8.6,2.1l-0.2,0.1l-0.2-0.1l-6-3l0,0l-0.2-0.1l0-0.3
c-0.2-1.9-0.8-3.8-1.6-5.5c-0.8-1.7-2-3.3-3.5-4.4c-1.5-1.1-3.4-1.6-5.3-1.6c-1.9,0-3.8,0.4-5.5,1.3c-1.6,0.9-2.9,2.3-3.7,4.1
c-0.8,1.7-1.1,3.6-1,5.6c0,1,0.1,1.9,0.3,2.9c0.2,0.9,0.4,1.9,0.7,2.8l1.7,5.7l0,0l0,0c0.5,3.5,0.5,6.9,0.1,10.4
c-0.4,3.4-1.2,6.9-2.5,10.1c-1.3,3.2-3.1,6.3-5.4,8.9c-2.3,2.7-5,4.9-8,6.7c-3,1.8-6.2,3.1-9.6,4.1c-3.3,1-6.8,1.6-10.3,1.7
c-7,0.4-13.9-1.1-20.5-2.9c-6.6-1.8-13.1-3.8-19.7-5.3c-3.3-0.7-6.6-1.4-10-1.8c-3.4-0.4-6.7-0.7-10.1-0.9
c-6.8-0.2-13.5,0.2-20.2,1.2c-1.7,0.3-3.3,0.5-5,0.9l-4.9,1.1c-3.3,0.6-6.5,1.8-9.8,2.8c-1.6,0.4-3.2,1.1-4.8,1.7l-4.7,1.9
l-4.5,2.2c-1.5,0.7-3,1.5-4.5,2.4l-4.3,2.6c-0.7,0.4-1.4,0.9-2.1,1.4l-2.1,1.5c-2.8,1.9-5.3,4.2-7.9,6.3c-1.3,1.1-2.4,2.3-3.7,3.5
l-1.8,1.8c-0.6,0.6-1.1,1.3-1.7,1.9c-1.1,1.3-2.2,2.5-3.3,3.8l-3.1,4.1c-1.1,1.3-1.9,2.8-2.8,4.2c-0.9,1.4-1.9,2.8-2.6,4.3
c-0.8,1.5-1.7,3-2.4,4.5l-2.1,4.6c-1.2,3.2-2.4,6.3-3.2,9.6c-0.2,0.8-0.5,1.6-0.6,2.5l-0.5,2.5c-0.3,1.7-0.6,3.3-0.8,5
c-1,6.8-2.3,13.5-3.7,20.2c-1.4,6.7-3,13.3-4.7,19.9c-0.8,3.3-1.7,6.6-2.6,9.9l-1.4,4.9l-0.7,2.5l-0.4,1.2
C121,395.9,121,396.2,120.7,396.9z M119.9,396.2l2.7-9.7c0.9-3.3,1.8-6.6,2.6-9.9c1.7-6.6,3.2-13.2,4.6-19.9
c1.4-6.7,2.6-13.4,3.6-20.1c0.2-1.7,0.5-3.4,0.8-5.1l0.5-2.5c0.2-0.8,0.4-1.7,0.7-2.5c0.8-3.3,2-6.6,3.2-9.8c2.6-6.4,6-12.4,9.9-18
l3.1-4.1c1.1-1.3,2.2-2.6,3.3-3.9c0.6-0.6,1.1-1.3,1.7-1.9l1.8-1.8c1.2-1.2,2.4-2.5,3.7-3.6c2.6-2.2,5.2-4.6,8-6.5l2.1-1.5
c0.7-0.5,1.4-1,2.1-1.5l4.4-2.7c1.4-0.9,3-1.7,4.5-2.5l4.6-2.3l4.8-1.9c1.6-0.6,3.2-1.3,4.8-1.8c3.3-1,6.5-2.2,9.9-2.8l5-1.1
c1.7-0.4,3.4-0.6,5.1-0.9c6.8-1,13.7-1.4,20.6-1.2c3.4,0.1,6.9,0.4,10.3,0.9c3.4,0.5,6.8,1.1,10.1,1.8c6.7,1.5,13.2,3.5,19.8,5.3
c6.5,1.8,13.2,3.1,19.9,2.8c3.3-0.1,6.6-0.7,9.9-1.6c3.2-0.9,6.3-2.2,9.2-3.8c2.9-1.7,5.5-3.8,7.7-6.3c2.2-2.5,3.9-5.4,5.2-8.5
c2.5-6.2,3.3-13.1,2.5-19.7l0,0.1l-1.6-5.7c-0.3-0.9-0.5-1.9-0.7-2.9c-0.2-1-0.3-2-0.3-3.1c0-2.1,0.3-4.1,1.1-6.1
c0.8-1.9,2.3-3.6,4.2-4.6c1.9-1,4-1.4,6-1.4c2.1,0,4.2,0.6,5.9,1.8c1.7,1.2,3,2.9,3.9,4.8c0.9,1.9,1.4,3.8,1.6,5.9l-0.3-0.4l0,0
l6,3l-0.5,0c1.4-0.7,2.9-1.3,4.4-1.7c1.5-0.4,3.1-0.6,4.7-0.5c1.6,0.1,3.3,0.6,4.6,1.6c1.3,1,2.2,2.5,2.7,4
c0.1,0.4,0.3,0.8,0.3,1.1l0.2,1.2c0.2,0.8,0.2,1.6,0.3,2.4c0,1.6-0.2,3.2-0.9,4.7c-0.7,1.5-1.7,2.8-2.9,3.8c-1.2,1-2.6,1.8-4.2,2.4
l0.3-0.6c0.4,2,0.4,3.9,0.5,5.8c0,1.9,0,3.8-0.1,5.7c-0.2,3.8-0.4,7.7-1.1,11.4c-1.5,7.6-4.5,14.7-8.2,21.4
c-3.7,6.7-8,13-12.8,19.1c-4.8,6-9.8,11.7-15.4,17l0,0l0.1-0.6c2.7,4.6,4.9,9.4,6.8,14.3c1.9,4.9,3.5,10,4.9,15.1
c2.7,10.2,4.7,20.6,6.1,31.1c1.4,10.5,2.3,21,2.7,31.5c0.4,10.5,0.5,21.1,0,31.7c-0.5,10.5-1.4,21.1-3,31.5
c-0.8,5.2-1.8,10.4-3.3,15.5c-1.5,5.1-3.5,10-5.9,14.8c-4.8,9.5-11.4,18-19,25.3c-7.6,7.3-16.3,13.5-25.5,18.8
c-9.2,5.3-18.9,9.5-28.9,13c-5,1.7-10,3.3-15.2,4.6l-3.9,1l-3.9,0.8l-3.9,0.8c-1.3,0.3-2.6,0.4-3.9,0.6c-21,3.1-42.7,2.3-63.4-3.4
c-2.6-0.8-5.1-1.6-7.7-2.4l-7.5-2.9l-7.3-3.4l-7.1-3.9c-2.3-1.4-4.5-2.9-6.8-4.4c-2.2-1.6-4.3-3.3-6.4-5c-4.2-3.6-7.7-8-10.4-12.7
c-2.7-4.8-4.4-10-5.4-15.3c-1-5.3-1.2-10.7-1-16c0.1-2.7,0.4-5.3,0.8-7.9c0.4-2.6,0.9-5.2,1.5-7.8c1.2-5.2,2.7-10.2,4.7-15.2l0,0
l0.7,0.7c-6.1,2.8-12.5,4.9-19.2,5.8c-6.6,1-13.6,0.4-19.9-2.1l-2.3-1l-2.2-1.2c-0.8-0.4-1.4-0.9-2.1-1.4c-0.7-0.5-1.4-0.9-2-1.5
l-1.9-1.6l-1.8-1.8c-0.6-0.6-1.2-1.2-1.7-1.9c-0.5-0.6-1.1-1.2-1.6-1.9c-2.1-2.7-3.8-5.6-5.1-8.7c-1.3-3.1-2-6.5-2-9.9
c0-3.4,0.8-6.8,2.5-9.8c1.6-3,4.1-5.5,6.9-7.4l2.2-1.3c0.8-0.4,1.5-0.7,2.3-1c1.5-0.7,3.1-1.2,4.6-1.9c3-1.3,6-2.7,9-4.2
c6-2.9,11.8-6.1,17.7-9.3c2.9-1.6,5.8-3.2,8.7-4.9L119.9,396.2z"/>
</g>
<path class="st4" d="M359.2,226.5c-3.4,0-8.8-1.2-13.6-4.5c-3.7-2.5-3.4-5.6-2.9-7.2c0.8-2.6,3.2-4.8,5.3-4.8c0.5,0,0.9,0.1,1.3,0.4
c0.1,0.1,0.5,0.6,1.1,1.2c1.1,2.6,1.3,4.9,1.3,5l0,0.3l6.5,3.2l0.2-0.1c0,0,1.8-0.9,4.1-1.6c1.5,0.6,2.7,3.1,2.1,5.8
C364.4,225.7,362.3,226.5,359.2,226.5z"/>
<g>
<path class="st10" d="M279.6,368.5c-5.8,0-12.7-6.3-18.9-17.2c-2-3.6-2.4-6.5-1-8.8c1.9-3.3,7.5-5.2,15.6-5.2
c5.7,0,12.2,1,17.8,2.7c1.8,0.5,2.9,1.6,3.3,3.2c1.5,6.1-6.6,18-11.5,22.9C283.4,367.7,281.6,368.5,279.6,368.5
C279.6,368.5,279.6,368.5,279.6,368.5z"/>
<path d="M275.3,337.9c5.7,0,12.1,1,17.7,2.6c1.6,0.5,2.6,1.4,3,2.9c1.5,5.8-6.6,17.7-11.4,22.5c-1.4,1.4-3.1,2.2-5,2.2
c-5.6,0-12.5-6.3-18.4-16.9c-1.9-3.4-2.3-6.2-1-8.3C261.9,339.7,267.5,337.9,275.3,337.9 M275.3,336.9c-11.8,0-21,4-15,14.7
c6.5,11.6,13.6,17.5,19.3,17.5c2.1,0,4.1-0.8,5.7-2.5c6-6,18-24,8-27C287.7,337.9,281.2,336.9,275.3,336.9L275.3,336.9z"/>
</g>
<path class="st4" d="M256.6,546c-22.5,0-47.8-3.6-77.4-11c-21.9-5.5-33.8-18.6-36.5-40.2c-1.7-13.3,0.2-28.4,3.4-44.3
c-5.8,4.4-11.8,8.7-16.2,11.5c-2.5,1.6-6,3.5-10,5.5l-0.1,0.3c-0.2,0.5-20.5,47,10.9,72.4c21.4,17.4,51.8,27.3,83.4,27.3
c0,0,0,0,0,0c13.7,0,27.3-1.8,40.2-5.4c19.8-5.5,37.7-13.7,51.9-23.8C292,543.4,275.4,546,256.6,546z"/>
<path class="st4" d="M94.1,473.3c-11.4,0-21-4.7-28.5-14.1c-7-8.8-9.1-18.7-5.5-26.5c4.8-3.2,10.3-4.9,15.8-4.9
c7.7,0,14.9,3.2,20.9,9.1c7.8,7.8,9.8,18.6,9.9,18.7l0.1,0.4l0.4,0c0.1,0,1.3,0.1,3.5,0.1c6.9,0,23.1,0.3,38-8.1
c-6,5-16.4,12-28.8,19.1l0.3-0.6l-1.2,0.6C110.1,471.2,101.7,473.3,94.1,473.3z"/>
<g>
<path class="st5" d="M152.3,509.5c-6,22,11,45,39,37c0,0,5,32,32,26s28-32,19-56c-9-24-39-32-61-22"/>
<path class="st3" d="M152.3,509.5c-1.4,5.4-1.4,11.1,0,16.4c1.4,5.3,4.2,10.3,8.2,14.1c4,3.8,9.1,6.3,14.5,7.2
c2.7,0.5,5.5,0.5,8.2,0.3c2.7-0.2,5.4-0.7,8.1-1.4l0.5-0.1l0.1,0.6l0,0c0.7,3.8,1.9,7.5,3.6,11c1.7,3.5,3.8,6.7,6.6,9.4
c2.8,2.7,6.2,4.5,9.9,5.3c3.7,0.8,7.6,0.6,11.4-0.3c3.8-0.9,7.4-2.2,10.7-4.2c1.6-1,3.1-2.2,4.5-3.5c1.3-1.4,2.5-2.8,3.6-4.4
c1-1.6,1.8-3.4,2.5-5.1c0.7-1.8,1.1-3.7,1.5-5.6c0.7-3.8,0.7-7.7,0.4-11.5c-0.7-7.7-2.8-15.3-5.7-22.4c-1.5-3.5-3.6-6.7-6.1-9.6
c-2.5-2.8-5.5-5.4-8.7-7.4c-6.5-4-14.1-6.4-21.8-7c-7.7-0.6-15.6,0.5-22.8,3.4c14-7.1,31.9-6.3,45.5,2c3.4,2.1,6.5,4.7,9.1,7.7
c2.6,3,4.8,6.4,6.4,10.1c2.9,7.4,5,15.1,5.6,23c0.2,2,0.2,4,0.1,5.9c-0.1,2-0.3,4-0.6,5.9c-0.4,2-0.9,3.9-1.6,5.8
c-0.7,1.9-1.6,3.7-2.7,5.4c-1.1,1.7-2.4,3.2-3.8,4.7c-1.5,1.4-3,2.6-4.7,3.7c-3.4,2.1-7.2,3.5-11.1,4.3c-3.9,0.9-8,1.1-11.9,0.2
c-3.9-0.9-7.6-2.9-10.5-5.7c-2.9-2.8-5.1-6.1-6.8-9.7c-1.7-3.6-2.9-7.4-3.6-11.3l0,0l0.6,0.4c-2.7,0.8-5.5,1.3-8.3,1.6
c-2.8,0.2-5.7,0.1-8.4-0.4c-5.6-1-10.9-3.5-14.9-7.5c-4-4-6.8-9.1-8-14.6c-0.6-2.7-0.9-5.5-0.8-8.3
C151,515,151.5,512.2,152.3,509.5z"/>
</g>
<path class="st4" d="M216.8,572.8c-20.7,0-25-26-25-26.3l-0.1-0.6l-0.5,0.2c-3.7,1.1-7.4,1.6-10.9,1.6c-13.4,0-27.5-9.3-28.9-26.7
c6.3,9,18.2,9.7,30.9,9.7c0,0,0,0,0,0c2.3,0,4.6-0.2,6.8-0.5l0.5-0.1l-0.1-0.5c0-0.1-1.6-9.7,5.9-11.6c2.2-0.6,4.2-0.8,6.1-0.8
c11.1,0,18.2,9.6,21.3,28.4c1.8,11.3,1.4,20.3-1.4,26.8C219.8,572.6,218.3,572.8,216.8,572.8C216.8,572.8,216.8,572.8,216.8,572.8z"
/>
<g>
<path d="M221.1,327L221.1,327c-1.5,0.6-3.3-0.2-3.9-1.8c-4-10.1-6.3-15-11.5-24.5c-0.8-1.4-0.3-3.3,1.1-4.1l0,0
c1.4-0.8,3.3-0.3,4.1,1.2c5.4,9.7,7.7,14.8,11.8,25.2C223.4,324.7,222.6,326.5,221.1,327z"/>
</g>
<g>
<path class="st1" d="M287.8,345.1c-4.3,0-15.4-0.4-26.9-4c2.6-2.4,7.7-3.7,14.4-3.7c5.3,0,11.1,0.8,16.4,2.2
c-0.5,2.5-1.4,4.7-1.7,5.4C289.6,345.1,288.9,345.1,287.8,345.1C287.8,345.1,287.8,345.1,287.8,345.1z"/>
<path d="M275.3,337.9c5.1,0,10.7,0.7,15.8,2.1c-0.4,2-1.1,3.8-1.5,4.6c-0.4,0-1,0-1.8,0c-4.2,0-14.8-0.4-25.9-3.7
C264.6,338.9,269.3,337.9,275.3,337.9 M275.3,336.9c-6.7,0-12.6,1.3-15.3,4.4c11.7,3.8,23,4.3,27.8,4.3c1.6,0,2.5,0,2.5,0
s1.4-2.9,2-6.3C286.9,337.8,280.8,336.9,275.3,336.9L275.3,336.9z"/>
</g>
<path class="st11" d="M263.2,344.6c-0.5,2,1.7,4.1,1.7,7.7c-0.2,10,8.8,14.4,14.2,16.1C283.1,356.2,276.9,348.6,263.2,344.6z"/>
<g>
<path class="st6" d="M212.3,337.5c-12,7.5-8,23,3,28s45,19,58,0s20-38,13-53s-15.2-3.3-13.9,7.1c0.9,6.9-8.1,26.9-22.1,22.9
C236.3,338.5,220.3,332.5,212.3,337.5z"/>
<path class="st7" d="M212.5,337.9c-2.2,1.4-4.1,3.3-5.4,5.6c-1.3,2.3-1.8,4.9-1.7,7.5c0.3,5.2,3.4,10.2,7.8,12.9
c2.2,1.4,4.8,2.3,7.2,3.4c2.5,1,5,2,7.5,2.8c5.1,1.7,10.2,3.1,15.5,3.9c5.3,0.8,10.7,1,15.8-0.1c2.6-0.6,5.1-1.5,7.3-2.8
c2.2-1.4,4.2-3.2,5.8-5.3c3.1-4.4,5.9-8.9,8.4-13.7c2.5-4.7,4.6-9.7,6-14.8c1.4-5.1,2.1-10.5,1.5-15.8c-0.4-2.6-0.9-5.2-2-7.6
c-1-2.4-2.3-4.9-4.1-6.6c-0.9-0.9-2.1-1.5-3.3-1.5c-1.2,0-2.3,0.7-3.1,1.7c-0.9,0.9-1.5,2.1-2,3.3c-0.5,1.2-0.8,2.5-1,3.8
c-0.2,1.3-0.2,2.6-0.2,3.9l0.1,1c0,0.3,0.1,0.7,0.1,1.1c0,0.7-0.1,1.4-0.2,2.1c-0.4,2.7-1.3,5.3-2.5,7.8c-1.2,2.5-2.6,4.8-4.4,6.8
c-1.8,2-3.9,3.9-6.5,5c-1.3,0.6-2.6,1-4,1.1c-1.4,0.1-2.8,0.1-4.1-0.2c-2.7-0.7-5.2-1.5-7.8-2.2c-5.1-1.5-10.3-3.1-15.5-4.1
c-2.6-0.5-5.3-0.9-7.9-0.8C217.4,336.1,214.7,336.6,212.5,337.9z M212.1,337.2c2.4-1.5,5.2-1.9,8-1.9c2.7,0,5.4,0.3,8.1,0.8
c5.3,1,10.5,2.6,15.6,4.1c2.6,0.7,5.2,1.6,7.7,2.2c1.3,0.3,2.6,0.3,3.9,0.2c1.3-0.2,2.5-0.5,3.7-1.1c2.4-1.1,4.4-2.8,6.2-4.8
c1.7-2,3.2-4.3,4.3-6.7c1.1-2.4,2-4.9,2.4-7.5c0.1-0.6,0.2-1.3,0.1-1.9c0-0.3,0-0.6-0.1-1l-0.1-1c-0.1-1.4,0-2.8,0.2-4.1
c0.2-1.4,0.5-2.7,1-4c0.5-1.3,1.2-2.5,2.1-3.6c0.9-1.1,2.2-1.9,3.8-2c0.8,0,1.5,0.2,2.2,0.5c0.6,0.3,1.2,0.7,1.7,1.2
c2,2,3.3,4.4,4.3,6.9c1.1,2.5,1.7,5.2,2.1,7.9c0.6,5.4-0.1,10.9-1.5,16.1c-1.5,5.2-3.6,10.2-6.1,15c-2.5,4.8-5.3,9.4-8.4,13.8
c-1.6,2.2-3.7,4.1-6,5.5c-2.4,1.4-4.9,2.4-7.6,3c-5.4,1.2-10.9,1-16.2,0.2c-5.4-0.8-10.6-2.2-15.7-3.9c-2.6-0.9-5.1-1.8-7.6-2.8
c-2.5-1.1-5-2-7.4-3.5c-0.6-0.4-1.2-0.8-1.7-1.2l-1.6-1.4c-0.5-0.5-0.9-1.1-1.4-1.6c-0.4-0.6-0.8-1.2-1.2-1.7
c-1.4-2.4-2.3-5.1-2.5-8c-0.2-2.8,0.5-5.6,1.9-8.1C207.6,340.6,209.7,338.6,212.1,337.2z"/>
</g>
<path class="st8" d="M251.8,374.7c-12.5,0-26.7-5.2-36.3-9.6c-5.4-2.5-9.3-7.7-9.9-13.4c2.4-1.8,6-2.8,10.2-2.8
c4.4,0,9.3,1.1,14.4,3.1c10.1,4.1,19,7.6,26.3,7.6c0,0,0,0,0,0c5.3,0,9.1-1.9,11.6-5.8c3.6-5.6,8-8.1,10.9-8.1c1,0,1.8,0.3,2.4,0.9
c0.6,0.7,0.9,1.8,0.7,3.2c-2.4,4.9-5.5,10.1-9.1,15.4C268.6,371.5,261.5,374.7,251.8,374.7C251.8,374.7,251.8,374.7,251.8,374.7z"/>
<g>
<path class="st12" d="M495.3,123.5c-19.9-8.3-40-27-62-19s-22,30-30,50s-20,52,1,65s88,51,115,57s41-1,50-21s32-55,9-74
S507.3,128.5,495.3,123.5z"/>
<path class="st13" d="M495,124.1c-11-4.7-20.8-11.6-31.6-16.3c-5.4-2.4-11-4.2-16.9-4.6c-2.9-0.2-5.9,0-8.7,0.6
c-0.7,0.1-1.4,0.4-2.1,0.5c-0.7,0.2-1.4,0.4-2.1,0.7c-1.4,0.6-2.7,1.1-4,1.7c-5.2,2.6-9.6,6.8-12.6,11.8c-3.1,5-5,10.6-6.7,16.3
c-1.7,5.7-3.2,11.4-5.3,17c-1,2.8-2.1,5.6-3.2,8.3c-1.1,2.8-2.1,5.5-3,8.3c-1.9,5.6-3.5,11.3-4.5,17.1c-0.5,2.9-0.8,5.8-0.8,8.7
c0,2.9,0.2,5.8,0.8,8.6c1.2,5.6,4.1,10.7,8.7,14c1.1,0.8,2.3,1.6,3.6,2.4l3.8,2.3c2.5,1.5,5.1,3,7.6,4.5
c20.4,12,41.1,23.6,62.5,33.8c2.7,1.3,5.3,2.5,8.1,3.7c2.7,1.2,5.4,2.4,8.1,3.5l4.1,1.7l4.1,1.6c2.7,1.1,5.5,2,8.3,2.9
c5.6,1.6,11.3,2.8,17.1,3.4c5.8,0.5,11.6,0.3,17-1.3c5.4-1.7,10.2-4.9,13.7-9.3l1.3-1.7l1.2-1.8c0.8-1.2,1.5-2.5,2.2-3.7
c0.7-1.3,1.3-2.6,1.9-3.9c0.6-1.3,1.3-2.7,1.9-4.1c5.3-10.7,10.9-21.1,14.5-32.2c1.7-5.6,2.9-11.3,2.7-17c-0.1-2.8-0.6-5.7-1.5-8.3
c-0.9-2.7-2.3-5.1-4.1-7.3c-1.8-2.2-4-4-6.3-5.9c-2.3-1.9-4.6-3.7-6.9-5.6c-4.7-3.6-9.3-7.3-14.1-10.8
c-9.5-7.1-19.1-14.1-28.8-20.9c-4.9-3.4-9.8-6.7-14.7-9.9c-2.5-1.6-5-3.2-7.5-4.7c-1.3-0.8-2.5-1.5-3.8-2.2
C497.7,125.4,496.3,124.8,495,124.1z M495.5,123c1.4,0.6,2.8,1.3,4,2c1.3,0.7,2.6,1.4,3.9,2.2c2.6,1.5,5.1,3.1,7.6,4.7
c5,3.2,10,6.5,14.9,9.8c9.8,6.7,19.5,13.6,29.1,20.6c4.8,3.5,9.5,7.1,14.2,10.7c2.3,1.8,4.7,3.6,7,5.5c1.2,1,2.3,1.8,3.5,2.9
c0.6,0.5,1.2,1,1.7,1.6l1.6,1.7c2,2.4,3.6,5.1,4.7,8c1.1,2.9,1.6,6,1.8,9.1c0.3,6.2-0.9,12.2-2.7,18c-3.5,11.6-9.2,22.2-14.3,32.8
c-0.6,1.3-1.2,2.7-1.9,4c-0.7,1.4-1.3,2.8-2,4.1c-0.8,1.3-1.5,2.7-2.4,3.9l-1.3,1.9l-1.4,1.8c-3.8,4.9-9.3,8.5-15.2,10.4
c-6,1.8-12.2,2-18.3,1.3c-6-0.6-11.9-1.9-17.7-3.8c-11.4-3.9-22.1-9-32.8-14.2c-2.7-1.3-5.3-2.6-8-4c-2.7-1.3-5.3-2.6-8-4
c-5.3-2.7-10.5-5.5-15.8-8.2c-10.5-5.6-20.9-11.3-31.2-17.2c-2.6-1.5-5.1-3-7.7-4.5l-3.8-2.3c-1.3-0.7-2.6-1.6-3.8-2.5
c-2.5-1.9-4.6-4.3-6.1-7.1c-1.6-2.7-2.5-5.7-3-8.8c-0.5-3-0.6-6.1-0.4-9.1c0.2-3,0.5-6,1.1-8.9c1.1-5.9,2.8-11.6,4.7-17.3
c1-2.8,2-5.6,3.1-8.4c1.1-2.8,2.2-5.5,3.2-8.3c2-5.5,3.6-11.3,5.4-16.9c1.8-5.7,3.7-11.4,6.9-16.5c0.9-1.2,1.6-2.6,2.6-3.7l1.4-1.7
l1.6-1.6c1-1.1,2.3-1.9,3.5-2.8c0.6-0.5,1.3-0.8,1.9-1.2l2-1.1c1.4-0.6,2.8-1.2,4.1-1.8c0.7-0.2,1.4-0.5,2.2-0.7
c0.7-0.2,1.5-0.4,2.2-0.5c2.9-0.6,6-0.8,9-0.6c6,0.4,11.8,2.2,17.3,4.6C474.8,111.6,484.7,118.4,495.5,123z"/>
</g>
<path class="st14" d="M439.7,118c-9.1-2.5-16.5,3.5-22.7,16.8c-6.3,13.3-23.9,60.7-14.5,70.9c9.4,10.2,50.9,36.8,71.7,46.6
c20.8,9.8,58.8,27.4,74.8,16.5c16.1-11,23.1-33.7,27-43.9c3.9-10.2,7.1-29-14.1-40.8C540.8,172.5,455.8,122.3,439.7,118z"/>
<g>
<path class="st12" d="M578.3,181.5c-23-19-71-53-83-58c-19.9-8.3-40-27-62-19c-4.8,1.7-8.5,4.1-11.5,7c8.2,37.7,22.1,75,46.5,91
c24.3,15.9,82-9.4,118-10.2C584.7,188.4,582.2,184.7,578.3,181.5z"/>
<path class="st13" d="M577.9,182c-5.8-4.8-11.9-9.4-17.9-14c-6-4.6-12.2-9-18.3-13.4c-12.3-8.8-24.8-17.5-37.7-25.2
c-3.3-1.9-6.5-3.7-9.9-5.2c-3.5-1.5-6.9-3.2-10.3-5l-10-5.4c-3.3-1.8-6.6-3.6-10-5.1c-3.4-1.6-6.9-2.9-10.5-3.8
c-3.6-0.9-7.3-1.4-11-1.2c-3.7,0.1-7.3,1.1-10.7,2.5c-3.4,1.4-6.7,3.3-9.4,5.9l0,0l0.1-0.5c1.9,9.2,4.2,18.3,6.9,27.2
c2.8,8.9,6,17.7,9.9,26.2c3.9,8.5,8.7,16.6,14.6,23.9c0.7,0.9,1.5,1.8,2.2,2.7l2.4,2.5l1.2,1.3c0.4,0.4,0.9,0.8,1.3,1.2l2.6,2.3
c0.9,0.8,1.9,1.4,2.8,2.1l1.4,1l0.7,0.5l0.8,0.4l1.5,0.9c0.5,0.3,1.1,0.5,1.6,0.7c1,0.5,2.2,0.8,3.3,1.2c4.5,1.4,9.2,1.8,13.8,1.9
c4.7,0.1,9.4-0.3,14-0.8c9.3-1.1,18.5-3,27.6-5c9.1-2,18.3-4.2,27.4-6c9.2-1.9,18.4-3.6,27.9-3.9l0,0l-0.5,0.7
C584.2,188.4,581.4,184.8,577.9,182z M578.6,181.1c0.9,0.7,1.8,1.5,2.6,2.3c0.8,0.8,1.6,1.7,2.3,2.6c0.8,0.9,1.5,1.8,2.1,2.8
c0.7,1,1.3,2,1.8,3.1l1,1.8l-2.2,0.1l0,0c-9.2,0.1-18.5,1.6-27.7,3.2c-9.2,1.7-18.3,3.8-27.5,5.7c-4.6,1-9.2,1.8-13.8,2.7
c-4.6,0.8-9.3,1.6-13.9,2.1c-4.7,0.5-9.4,0.8-14.1,0.7c-4.7-0.1-9.4-0.6-13.9-2c-1.1-0.4-2.2-0.7-3.3-1.3c-0.5-0.2-1.1-0.5-1.6-0.7
l-1.5-0.9l-0.8-0.4l-0.7-0.5l-1.4-1c-0.9-0.7-1.9-1.3-2.8-2.1l-2.6-2.3c-0.4-0.4-0.9-0.8-1.3-1.2l-1.2-1.3l-2.4-2.5
c-0.8-0.9-1.5-1.8-2.3-2.7c-6-7.3-10.7-15.4-14.7-23.9c-4-8.5-7.2-17.3-10-26.3c-2.8-8.9-5.2-18-7.3-27.2l-0.1-0.3l0.2-0.2l0,0
c5.5-5.5,12.9-8.9,20.7-9.4c3.9-0.3,7.8,0.1,11.6,1c3.8,0.9,7.4,2.2,10.9,3.7c7.1,3,13.6,7,20.2,10.6c3.3,1.8,6.6,3.6,10.1,5.1
c1.7,0.8,3.5,1.6,5.2,2.6c1.7,0.9,3.3,1.9,4.9,2.9c6.5,4,12.7,8.3,19,12.6c6.2,4.3,12.4,8.7,18.5,13.2
C554.7,162.5,566.9,171.5,578.6,181.1z"/>
</g>
<ellipse class="st15" cx="479.3" cy="201.5" rx="18" ry="17"/>
<polygon class="st1" points="321.3,166.5 317.3,180.5 348.3,182.5 349.3,173.5 "/>
<polygon class="st1" points="368.4,116.1 357.9,123.8 375.6,150 383.2,144.4 "/>
<polygon class="st1" points="422.6,312.8 418.6,343.8 434.6,344.8 432.6,313.8 "/>
<polygon class="st1" points="501.9,298.9 492.9,302.9 500.9,325.9 514.9,321.9 "/>
<g>
<path class="st3" d="M119.1,467.1c6.9-3.4,13.5-7.2,19.9-11.5c3.2-2.2,6.3-4.4,9.2-6.9c2.9-2.5,5.9-5,8.1-8.1
c-2.2,3.2-5.1,5.8-8,8.3c-2.9,2.5-6,4.9-9.1,7.1c-6.3,4.5-12.9,8.5-19.7,12L119.1,467.1z"/>
</g>
<g>
<path d="M190.8,546.7c-0.4-1.2-0.7-2.5-0.9-3.8c-0.2-1.3-0.3-2.5-0.4-3.8c-0.2-2.5-0.2-5.1-0.2-7.6c0.1,2.5,0.3,5.1,0.7,7.6
c0.2,1.2,0.4,2.5,0.7,3.7c0.3,1.2,0.6,2.4,1.1,3.5L190.8,546.7z"/>
</g>
<path class="st16" d="M475.3,190.5c-4.5,3-9.3,6.3-8.7,11.2c0.7,4.8,0.7,9.8,7.7,10.8s14,2,16-4s4-14-1-16S478.3,188.5,475.3,190.5z
"/>
<g>
<path class="st5" d="M162.8,336c-16-22-38-27-54-20s-33,34-29,60s3,36-2,48s8,30,24,13c0,0,26,13,43-11s8-52,8-52"/>
<path class="st3" d="M162.8,336l-2.2-2.7c-0.4-0.4-0.7-0.9-1.1-1.3l-1.2-1.3c-0.8-0.8-1.6-1.7-2.4-2.5l-2.6-2.3
c-3.5-3-7.4-5.5-11.5-7.6c-8.2-4.1-17.8-5.5-26.6-3.3c-8.9,2-16.1,8.3-21.5,15.5c-2.7,3.6-5.1,7.6-7,11.7
c-1.9,4.1-3.5,8.4-4.5,12.9l-0.4,1.7l-0.3,1.7c-0.2,1.1-0.4,2.2-0.5,3.4c-0.2,2.3-0.4,4.5-0.3,6.8c-0.1,2.3,0.3,4.5,0.5,6.8
c0.3,2.3,0.7,4.6,1,6.9c0.6,4.6,1.1,9.3,1.4,14c0.2,4.7,0.1,9.5-0.6,14.2c-0.4,2.4-0.9,4.7-1.6,7c-0.7,2.3-1.5,4.5-2.4,6.7
c-1.7,4-1.4,8.7,0.6,12.6c0.5,1,1.1,1.9,1.8,2.7c0.7,0.8,1.5,1.5,2.4,2.1c0.9,0.6,1.9,1,2.9,1.3c1,0.3,2.1,0.4,3.2,0.2
c2.2-0.2,4.3-1,6.2-2.2c1.9-1.2,3.7-2.7,5.3-4.3l0,0l0.3-0.3l0.3,0.1c3.8,1.7,8,2.8,12.2,3.3c4.2,0.4,8.5,0.2,12.5-1
c2-0.6,4-1.4,5.8-2.4c1.9-1,3.6-2.2,5.2-3.5c3.2-2.7,6-6,8.1-9.7c2.4-3.5,4-7.5,5.5-11.4c1.3-4,2.3-8.2,2.8-12.4
c0.9-8.4,0.4-17.1-1.9-25.3l1-0.3c2.3,8.4,2.9,17.1,2,25.7c-0.5,4.3-1.5,8.5-2.8,12.6c-1.5,4-3.2,8-5.6,11.6
c-2.2,3.7-5,7.1-8.3,9.9c-1.7,1.4-3.5,2.6-5.4,3.7c-1.9,1-4,1.8-6,2.4c-4.2,1.2-8.6,1.5-12.9,1c-4.3-0.5-8.5-1.5-12.5-3.4l0.6-0.1
l0,0c-1.6,1.7-3.3,3.4-5.3,4.7c-2,1.3-4.3,2.3-6.8,2.6c-2.5,0.3-5.1-0.2-7.2-1.5c-1.1-0.6-2.1-1.4-2.9-2.4c-0.8-0.9-1.6-1.9-2.2-3
c-2.4-4.3-2.9-9.7-0.9-14.4c0.9-2.1,1.6-4.3,2.2-6.5c0.6-2.2,1.1-4.4,1.4-6.7c0.6-4.5,0.6-9.1,0.3-13.7c-0.3-4.6-0.8-9.2-1.4-13.8
c-0.3-2.3-0.7-4.6-1-6.9c-0.2-2.4-0.6-4.7-0.5-7.1c-0.1-2.4,0.2-4.8,0.3-7.1c0.1-1.2,0.4-2.4,0.5-3.5l0.3-1.8l0.4-1.7
c1-4.6,2.7-9.1,4.7-13.4c2-4.3,4.5-8.4,7.4-12.1c2.9-3.8,6.2-7.3,10.1-10.1c0.9-0.7,2-1.3,3-2c0.5-0.3,1-0.6,1.6-0.9l1.6-0.8
c1.1-0.5,2.2-0.9,3.4-1.3c1.1-0.4,2.3-0.6,3.5-1c9.4-2.1,19.3-0.2,27.6,4.2c4.2,2.2,8,5,11.4,8.2
C157.1,328.6,160.1,332.2,162.8,336z"/>
</g>
<path class="st4" d="M88.9,443.5c-3.6,0-6.8-1.9-9.1-5.2c-2.8-4.1-3.4-9.7-1.5-14c1.7-4.2,3.4-7.5,4.1-11.2c4,3.5,7.5,5.1,11.4,5.1
c0,0,0,0,0,0c3.1,0,6.2-1.2,8.9-3.3c1.4,1.8,7.3,8.7,16.9,8.7c3.7,0,7.5-1,11.4-2.9c12.6-6.3,19.7-11,22.9-18.8
c-1.3,8.9-4.5,17-9.6,24c-6.7,9.5-15.6,14.3-26.4,14.3c-8.9,0-15.9-3.4-15.9-3.5l-0.3-0.2l-0.3,0.3
C97.2,441.2,92.9,443.5,88.9,443.5z"/>
<path class="st4" d="M197.1,338c-0.3,3.3-4.5,4.6-9.4,4.1c-4.9-0.5-8.8-2.5-8.5-5.8c0.3-3.3,4.5-4.6,9.4-4.1
C193.6,332.7,197.4,334.7,197.1,338z"/>
<path class="st1" d="M449.9,106.4c0,0,45.3,21.1,59.3,30.3c14,9.2,54.9,36.7,53.7,40c-1.3,3.3-11.6-1.8-19.8-8.4
c-16.7-13.4-75-48.1-91.7-54.2C445.1,111.8,446.5,107.2,449.9,106.4z"/>
<path class="st17" d="M472.4,186.9c-3.8,1.5-4.5,3.3-3.8,4.1s3.6-1.3,5.5-2.3c1.8-1,5.9-1.8,9.2-0.5c3.3,1.3,4,1.1,4.2,0.5
c0.2-0.6-2.1-2.6-5.9-3C477.8,185.2,474.8,185.9,472.4,186.9z"/>
<ellipse class="st17" cx="489.5" cy="189.8" rx="0.9" ry="0.8"/>
<rect x="493.2" y="240.1" transform="matrix(0.8984 0.4391 -0.4391 0.8984 159.4241 -201.1793)" class="st18" width="42.7" height="7.7"/>
<path class="st1" d="M279,177.7c6.5,2.9,10.5,10.1,10.8,17.3c0.3,7.1-2.6,14.1-6.9,19.9c-2.5,3.3-5.5,6.4-9.1,8.4s-7.2,2.9-11.2,1.7
c-2.9,6.7-10.7,9.6-17.7,11.5c-10.3,2.8-21.1,4.9-31.4,2.4c-10.3-2.5-19.3-10-20.2-20.6c-9.1,0.7-18.4,0.8-27.1-1.6
c-8.8-2.5-17.1-7.8-21.3-15.9c-6.6-12.4-2-28.3,6.5-39.4c10.1-13.2,26.6-22.2,43.2-20.4c7.2-8.2,19.1-10.3,30-10.2
c11,0.1,22.1,1.9,32.1,6.4c10,4.5,18.9,12,24.2,21.6C284.1,164.7,282.8,171.9,279,177.7z"/>
<path class="st1" d="M166.5,247c2.2,10.2-4.4,16.8-15.8,19.2s-23.3-0.3-25.4-10.5c-2.2-10.2,6.6-17.3,17.9-19.7
S164.3,236.8,166.5,247z"/>
<path class="st1" d="M558,366.1c2.2,10.2-4.4,16.8-15.8,19.2c-11.4,2.4-23.3-0.3-25.4-10.5c-2.2-10.2,6.6-17.3,17.9-19.7
C546.1,352.7,555.9,355.9,558,366.1z"/>
<path class="st1" d="M490.4,428.4c-1.4,5-5.3,8.9-9.6,11.8c-6.1,4.2-13.4,6.8-20.8,7c-7.4,0.3-13.3-5.3-20.7-6.2
c-6.1-0.7-12.1-3-17.1-6.5c-4-2.8-7.6-6.6-8.9-11.3c-1.6-5.6,0.3-11.5,2.9-16.6c1.8-3.4,3.9-7.1,7.5-8.6c-0.8-7.4,1-15.1,4.9-21.5
c3.9-6.4,10-11.3,17-14c3.9-1.5,7.2-4.1,11.4-4.1c13.3-0.1,26.2,8.3,31.7,20.4c2.1,4.6,3,10.3,0.2,14.4c7.4,1.5,13.5,7.5,16.2,14.5
c0.9,2.4,1.6,4.9,1.6,7.5c0,4-1.7,7.9-4.6,10.7S494.3,428.6,490.4,428.4z"/>
<g>
<path class="st0" d="M190.6,218.4c-0.6-5.3,0.2-10.5,1.9-15.3c1.7-4.8,4.3-9.3,7.9-13c1.8-1.8,3.9-3.3,6.1-4.6
c2.2-1.2,4.9-2,7.5-1.8c2.6,0.1,5.1,1,7.4,2.2c2.2,1.2,4.3,2.7,6.1,4.4c1.9,1.7,3.6,3.6,4.9,5.8c1.3,2.2,2.2,4.7,2.4,7.2
c0.2,5.2-3,10.2-7.4,12.6c-2.3,1.2-4.9,1.8-7.4,1.3c-0.3-0.1-0.6-0.1-1-0.3c-0.3-0.1-0.6-0.3-0.9-0.4c-0.5-0.2-1.1-0.4-1.7-0.5
c-1.2-0.3-2.4-0.6-3.6-1.4c-0.3-0.2-0.5-0.5-0.7-0.8c-0.2-0.3-0.3-0.5-0.5-0.8c-0.3-0.6-0.6-1.1-0.9-1.7c-0.5-1.1-1-2.3-1.3-3.5
c-0.1-0.3-0.2-0.7-0.2-1.1c0-0.4,0.1-0.7,0.2-1c0.2-0.6,0.5-1.2,0.8-1.8c0.6-1.1,1.4-2.1,2.2-3.1l0.8,0.6c-0.8,0.9-1.5,1.9-2.1,2.9
c-0.6,1-1,2.1-0.7,3.1c0.3,1.1,0.8,2.3,1.3,3.4c0.3,0.5,0.5,1.1,0.8,1.6c0.1,0.3,0.3,0.5,0.5,0.8c0.1,0.2,0.3,0.4,0.5,0.5
c0.8,0.6,2,0.9,3.2,1.2c0.6,0.2,1.2,0.3,1.8,0.6c0.3,0.1,0.6,0.3,0.8,0.3c0.3,0.1,0.5,0.2,0.8,0.2c2.2,0.4,4.7-0.2,6.7-1.3
c4.1-2.2,6.9-6.8,6.7-11.5c-0.1-2.3-1-4.6-2.2-6.6c-1.2-2-2.9-3.8-4.7-5.4c-1.8-1.6-3.8-3-5.9-4.1c-2.1-1.1-4.4-1.8-6.7-1.9
c-2.3-0.1-4.6,0.6-6.6,1.7c-2.1,1.2-4,2.6-5.7,4.3c-3.3,3.4-5.8,7.7-7.2,12.3c-1.4,4.6-2,9.5-1.4,14.3L190.6,218.4z"/>
</g>
<g>
<path class="st0" d="M422.9,396.8c3-2,6.6-2.2,9.8-1.6c3.2,0.7,6.1,2.2,8.7,3.9c2.6,1.7,5.2,3.7,7.1,6.3c1,1.3,1.8,2.8,2.2,4.4
c0.5,1.6,0.6,3.4,0.3,5c-0.5,3.3-2.3,6.4-5.1,8.3c-2.7,2-6.3,2.6-9.5,2.1c-3.2-0.6-6.3-2.3-8.2-5.1c-0.5-0.7-0.8-1.6-0.9-2.6
c-0.1-0.9,0.1-1.8,0.5-2.7c0.7-1.6,2.1-3,3.9-3.5l0.4,1.8c-1.1,0.3-2.2,1.2-2.7,2.3c-0.2,0.6-0.4,1.2-0.3,1.8
c0,0.6,0.2,1.2,0.6,1.8c0.7,1.1,1.8,2.1,3,2.9c1.2,0.8,2.6,1.2,4,1.5c2.8,0.5,5.8,0,8.2-1.7c2.3-1.7,4-4.3,4.4-7.2
c0.2-1.4,0.1-2.9-0.2-4.3c-0.4-1.4-1.1-2.7-1.9-3.9c-1.8-2.4-4.1-4.3-6.7-6c-2.5-1.6-5.2-3.1-8.2-3.8c-2.9-0.6-6.2-0.4-8.7,1.3
L422.9,396.8z"/>
</g>
<path class="st19" d="M537.7,95.5c-5.3,1.7-10.2,4.8-13.2,9.5c-3,4.6-3.8,10.9-1.2,15.7c1.2,2.2,2.9,4,5,5.4
c3.3,2.3,7.3,3.5,11.2,3.4c3.7,0,7.5-1.2,10.1-3.8c2.6-2.6,4-6.6,2.7-10.1c-1.2-3.5-5.2-5.9-8.7-4.9"/>
<rect x="208.6" y="311.7" transform="matrix(0.9322 -0.362 0.362 0.9322 -99.1746 97.886)" class="st1" width="6.2" height="4"/>
</svg>

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -0,0 +1,342 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" 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 674.4 707.4" style="enable-background:new 0 0 674.4 707.4;" xml:space="preserve">
<style type="text/css">
.st0{fill:#D9E1E8;}
.st1{fill:#FFFFFF;}
.st2{fill:url(#SVGID_1_);}
.st3{fill:#543930;}
.st4{fill:#DB957C;}
.st5{fill:#FBCA82;}
.st6{fill:#F6EBE5;}
.st7{fill:#7D7774;}
.st8{fill:#E3D9D3;}
.st9{fill:url(#SVGID_2_);}
.st10{fill:#4E414F;}
.st11{fill:#B84242;stroke:#000000;stroke-miterlimit:10;}
.st12{fill:#F0F8FF;}
.st13{fill:#65686B;}
.st14{fill:#DDE4EB;}
.st15{fill:#964545;stroke:#421E1E;stroke-miterlimit:10;}
.st16{fill:#6E3232;stroke:#421E1E;stroke-miterlimit:10;}
.st17{fill:#CF7676;}
.st18{fill:#A8ADB3;}
.st19{fill:none;stroke:#D9E1E8;stroke-miterlimit:10;}
</style>
<rect x="-45" y="-50.2" class="st0" width="762.8" height="798.4"/>
<path class="st1" d="M463.7,155.1c-7-1.4-12.5-7.6-14.4-14.4c-1.9-6.9-0.6-14.4,2.3-20.9c1.7-3.8,3.9-7.5,7-10.2s6.4-4.4,10.6-4.1
c1.4-7.2,8.3-11.7,14.7-15.2c9.4-5,19.5-9.5,30.1-9.3c10.6,0.1,21.1,5.5,24.3,15.6c8.7-2.7,17.7-4.9,26.8-4.4
c9.1,0.4,18.4,3.8,24.3,10.7c9.2,10.7,8.3,27.1,2.4,39.9c-7,15.1-21,27.6-37.5,29.5c-5.2,9.6-16.3,14.3-27,16.7
c-10.7,2.4-22,3.1-32.8,0.9c-10.8-2.2-21.1-7.4-28.4-15.7C461.7,168.9,461.3,161.5,463.7,155.1z"/>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="364.8752" y1="353.0159" x2="377.5741" y2="340.3171">
<stop offset="0" style="stop-color:#FBCA82"/>
<stop offset="1" style="stop-color:#FBDB83"/>
</linearGradient>
<path class="st2" d="M332.3,410.5c30-4,70-27,68-44s-16-48-35-42s-29,19-46,19S332.3,410.5,332.3,410.5z"/>
<path class="st3" d="M333.2,408.9c0.4-0.2,0.8-0.4,1.2-0.5c0.1,0,0.2,0,0.3-0.1l0.4-0.1l1-0.2c1.4-0.2,2.7-0.5,4.1-0.8
c2.7-0.6,5.4-1.3,8-2.1c5.3-1.6,10.5-3.5,15.6-5.7c5.1-2.3,10-4.8,14.8-7.7c2.4-1.4,4.7-3,6.9-4.7c2.2-1.7,4.3-3.4,6.3-5.4
c2-1.9,3.8-4,5.2-6.3c1.4-2.3,2.5-4.8,2.6-7.5c0-1.3-0.2-2.7-0.4-4c-0.2-1.4-0.5-2.7-0.8-4.1c-0.6-2.7-1.4-5.4-2.4-8
c-1.9-5.3-4.2-10.4-7.4-15c-1.6-2.3-3.3-4.5-5.3-6.4c-2-1.9-4.2-3.7-6.7-4.8c-2.5-1.1-5.3-1.6-8-1.3c-1.4,0.2-2.7,0.5-4,1
c-1.3,0.5-2.6,0.9-3.9,1.5c-5.2,2.1-10,4.9-14.8,7.8c-4.8,2.9-9.7,5.8-15.1,7.8c-2.7,1-5.5,1.6-8.4,2l-2.2,0.1l-1.1,0.1
c-0.3,0-0.6,0-0.9,0.1c-1.1,0.2-1.9,1-2.4,2.1c-0.5,1.1-0.7,2.4-0.8,3.7c-0.1,1.3,0,2.7,0.1,4c0.3,2.7,0.8,5.4,1.4,8.2
c1.2,5.4,2.9,10.8,4.7,16c1.8,5.3,3.9,10.5,6,15.7c1.1,2.6,2.1,5.2,3.3,7.7l1.7,3.8l0.9,1.9l0.4,1l0.2,0.5l0.1,0.2c0,0,0,0.1,0,0
c0-0.1-0.1-0.2-0.2-0.3C333.6,409.1,333.4,409,333.2,408.9z M331.4,412.2c-0.2-0.2-0.5-0.4-0.6-0.6c-0.1-0.1-0.2-0.3-0.2-0.4
l-0.1-0.1l-0.1-0.2l-0.2-0.5l-0.4-1l-0.8-2l-1.6-3.9c-1.1-2.6-2.1-5.2-3.1-7.9c-2-5.3-3.9-10.6-5.7-16c-1.7-5.4-3.3-10.8-4.5-16.4
c-0.6-2.8-1.1-5.6-1.3-8.5c-0.1-1.5-0.2-2.9,0-4.4c0.1-1.5,0.3-3.1,1.1-4.6c0.4-0.8,0.9-1.5,1.6-2.2c0.7-0.6,1.6-1.1,2.5-1.2
c0.5-0.1,0.9-0.1,1.3-0.2l1,0l2-0.1c2.7-0.3,5.3-0.8,7.9-1.7c5.1-1.8,10-4.6,14.8-7.4c4.9-2.8,9.9-5.6,15.2-7.7
c1.3-0.6,2.7-1,4-1.5c1.3-0.5,2.9-0.8,4.3-1c3-0.3,6.1,0.3,8.7,1.6c2.7,1.2,5,3.1,7.1,5.1c2.1,2,3.8,4.3,5.4,6.7
c1.6,2.4,3,4.9,4.2,7.4c1.3,2.5,2.4,5.2,3.4,7.8c1,2.7,1.8,5.4,2.5,8.1c0.3,1.4,0.6,2.8,0.9,4.2c0.2,1.4,0.5,2.8,0.5,4.3
c0,3-1.2,5.9-2.6,8.4c-1.5,2.5-3.3,4.7-5.3,6.8c-2,2.1-4.1,4-6.4,5.7c-2.2,1.8-4.5,3.4-6.9,5c-4.8,3.1-9.8,5.8-14.9,8.2
c-5.1,2.4-10.4,4.5-15.8,6.3c-2.7,0.9-5.4,1.7-8.2,2.4c-1.4,0.3-2.8,0.7-4.2,0.9l-1.1,0.2l-0.3,0.1l-0.4,0.1l-0.7,0.1
C333.3,412.2,332.3,412.2,331.4,412.2z"/>
</g>
<path class="st4" d="M332.3,408.9c-1.1-2.6-8.2-18.3-13.1-34.3c7.7-2.4,15.3-5.4,22-8.1c10.3-4.1,19.2-7.6,25-7.6
c1.7,0,3,0.3,4.1,0.9c12.4,6.7,15.8,18.1,16.8,26.5C373.1,397.8,350.8,406.4,332.3,408.9z"/>
<g>
<path class="st5" d="M215.3,554.5c0,20-4,37-8,47s22,44,48,22s29-65,27-86S215.3,554.5,215.3,554.5z"/>
<g>
<path class="st3" d="M215.7,554.8c0,1.4,0.1,2.7,0,4.2c0,1.5-0.1,3-0.1,4.4c-0.1,3-0.4,5.9-0.7,8.8c-0.6,5.9-1.6,11.7-3.1,17.5
c-0.7,2.9-1.5,5.7-2.5,8.6c-0.2,0.7-0.5,1.4-0.7,2.1c-0.2,0.7-0.6,1.5-0.7,2c-0.3,1.2-0.2,2.6,0.1,3.9c0.6,2.7,1.9,5.3,3.5,7.7
c1.6,2.4,3.4,4.6,5.5,6.6c4.1,4,9.1,7.1,14.7,8.5c2.8,0.7,5.6,0.8,8.4,0.5c2.8-0.4,5.5-1.2,8.1-2.5c2.6-1.2,4.9-3,7.1-4.8
c2.2-1.9,4.2-4,6.1-6.2c3.7-4.4,6.9-9.4,9.5-14.6c5.2-10.5,8.2-21.9,9.8-33.5c0.8-5.8,1.2-11.6,1.3-17.5c0-2.9,0-5.9-0.2-8.8
c-0.1-1.5-0.2-2.9-0.3-4.4c-0.2-1.3-0.6-2.6-1.6-3.5c-0.9-0.9-2.2-1.4-3.5-1.7c-1.4-0.3-2.8-0.3-4.2-0.2c-2.9,0.2-5.7,0.7-8.5,1.5
c-5.6,1.5-11.1,3.5-16.6,5.8c-5.4,2.3-10.7,4.8-16,7.4c-2.6,1.3-5.2,2.7-7.8,4l-3.9,2.1l-1.9,1.1l-1,0.5l-0.5,0.3L215.7,554.8
C215.7,554.9,215.7,554.9,215.7,554.8C215.7,554.8,215.7,554.8,215.7,554.8z M214.9,554.3c0.1-0.1,0.1-0.1,0.2-0.2
c0.1-0.1,0.2-0.1,0.2-0.1l0.2-0.1l0.5-0.3l1-0.6l1.9-1.1l3.9-2.1c2.6-1.4,5.2-2.8,7.8-4.1c5.3-2.7,10.6-5.2,16-7.6
c5.4-2.3,11-4.5,16.7-6c2.9-0.8,5.8-1.4,8.8-1.6c1.5-0.1,3.1-0.1,4.6,0.3c1.5,0.3,3.1,0.9,4.3,2.1c1.2,1.2,1.8,2.8,2,4.4
c0.2,1.5,0.3,3,0.4,4.5c0.2,3,0.2,5.9,0.2,8.9c-0.1,5.9-0.5,11.8-1.3,17.7c-1.6,11.7-4.6,23.4-9.8,34.1c-2.6,5.3-5.8,10.4-9.7,15
c-2,2.2-4,4.4-6.3,6.4c-2.3,1.9-4.7,3.8-7.4,5.1c-2.7,1.4-5.7,2.3-8.7,2.7c-3,0.4-6.1,0.2-9.1-0.5c-6-1.4-11.3-4.8-15.5-9
c-2.2-2.1-4.1-4.5-5.7-7c-1.6-2.5-3-5.3-3.7-8.3c-0.3-1.5-0.5-3.1-0.1-4.8c0.2-0.9,0.5-1.4,0.8-2.2c0.3-0.7,0.5-1.4,0.8-2.1
c1-2.8,1.8-5.6,2.5-8.4c1.5-5.7,2.5-11.4,3.3-17.2c0.4-2.9,0.7-5.8,0.9-8.8c0.1-1.5,0.2-2.9,0.2-4.4
C214.7,557.5,214.8,555.8,214.9,554.3z"/>
</g>
</g>
<path class="st4" d="M237.3,629.8c-11,0-20.2-7.8-25.2-15.1c-3.4-5.1-5-10.1-3.9-12.8c1.9-4.7,8-21.9,8.1-46.8
c2.3-1.3,12.3-7,23.8-12.3l5.7,7.6c-0.9,17.4-5.1,30.1-8.2,39.4c-4.3,13.1-7,21,4.7,27.1c4.2,2.2,8.9,3.6,14.2,4.2
c-0.6,0.6-1.2,1.1-1.8,1.6C249.1,627.5,243.3,629.8,237.3,629.8C237.3,629.8,237.3,629.8,237.3,629.8z"/>
<g>
<path class="st6" d="M292.5,326.4c-12,7.5-8,23,3,28s45,19,58,0s20-38,13-53s-14-2-14,5s-8,29-22,25S300.5,321.4,292.5,326.4z"/>
<g>
<path class="st7" d="M292.7,326.7c-2.2,1.4-4.1,3.3-5.4,5.5c-1.3,2.2-1.8,4.9-1.7,7.4c0.3,5.2,3.3,10.1,7.7,12.9
c2.2,1.4,4.7,2.3,7.1,3.4c2.5,1,4.9,2,7.5,2.8c5,1.7,10.2,3.2,15.4,4c5.2,0.8,10.6,1.1,15.8,0.1c2.6-0.5,5.1-1.4,7.4-2.7
c2.3-1.3,4.3-3,5.9-5.1c3.1-4.3,5.9-8.9,8.4-13.5c2.5-4.7,4.6-9.6,6.1-14.7c1.5-5.1,2.3-10.4,1.8-15.7l-0.1-1l-0.2-1l-0.3-2
c-0.2-0.6-0.4-1.3-0.5-1.9l-0.3-1c-0.1-0.3-0.2-0.6-0.4-0.9l-0.7-1.8c-0.3-0.6-0.6-1.2-0.9-1.8c-0.6-1.2-1.3-2.3-2.2-3.2
c-0.9-1-1.9-1.8-3.2-1.9c-1.2-0.1-2.4,0.5-3.3,1.4c-1.8,1.9-2.9,4.4-3.5,6.9c-0.2,0.6-0.3,1.3-0.3,1.9c-0.1,0.7-0.1,1.3-0.1,2
c-0.1,1.4-0.3,2.7-0.6,4c-0.6,2.6-1.5,5.2-2.7,7.6c-1.1,2.4-2.5,4.8-4.1,6.9c-1.7,2.1-3.7,4.1-6.1,5.3c-1.2,0.6-2.5,1.1-3.9,1.3
c-1.4,0.2-2.8,0.1-4.1-0.2c-2.6-0.7-5.2-1.5-7.7-2.2c-5.1-1.5-10.2-3-15.5-4c-2.6-0.5-5.2-0.8-7.9-0.8
C297.6,325,294.9,325.4,292.7,326.7z M292.3,326c2.4-1.5,5.2-1.9,7.9-1.9c2.7,0,5.4,0.3,8,0.8c5.3,1,10.4,2.6,15.5,4.1
c2.6,0.8,5.1,1.6,7.7,2.2c1.3,0.3,2.6,0.4,3.8,0.2c1.3-0.2,2.5-0.6,3.7-1.2c2.3-1.2,4.3-3,5.9-5.1c1.6-2.1,3-4.4,4.1-6.8
c1.1-2.4,2-4.9,2.6-7.5c0.3-1.3,0.6-2.6,0.6-3.9c0-0.6,0-1.3,0.1-2c0.1-0.7,0.2-1.3,0.4-2c0.7-2.6,1.7-5.2,3.7-7.2
c1-1,2.3-1.7,3.8-1.6c1.5,0.2,2.6,1.1,3.6,2.1c0.9,1,1.7,2.2,2.3,3.4c0.3,0.6,0.6,1.2,0.9,1.8l0.8,1.9c0.1,0.3,0.3,0.6,0.4,0.9
l0.3,1c0.2,0.6,0.4,1.3,0.5,1.9l0.4,2l0.2,1l0.1,1c0.5,5.4-0.3,10.8-1.8,15.9c-1.5,5.2-3.7,10.1-6.2,14.8
c-2.5,4.7-5.3,9.3-8.4,13.7c-1.7,2.2-3.7,4-6.1,5.3c-2.4,1.4-5,2.3-7.6,2.8c-5.3,1.1-10.8,0.8-16.1,0c-5.3-0.8-10.5-2.3-15.6-4
c-2.5-0.9-5-1.8-7.5-2.8c-2.5-1.1-5-2-7.3-3.5c-4.6-3-7.8-8.2-8.1-13.7c-0.2-2.7,0.5-5.5,1.8-7.9C287.9,329.4,290,327.5,292.3,326
z"/>
</g>
</g>
<path class="st8" d="M332,363.5c-2.4,0-5-0.2-7.8-0.6l2.7-11.4c18.2-6.4,24.9-17.6,26.6-20.9c1.6-3.2,5.5-5.7,8.6-5.7
c0.8,0,1.9,0.2,2.7,1c0.8,0.9,1.1,2.3,0.9,4.1c-2.6,7.3-6.8,15.4-12.7,24C348.8,360.4,341.7,363.5,332,363.5
C332,363.5,332,363.5,332,363.5z"/>
<g>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="196.4622" y1="448.0467" x2="465.0097" y2="194.1282">
<stop offset="0" style="stop-color:#FBCA82"/>
<stop offset="1" style="stop-color:#FBDB83"/>
</linearGradient>
<path class="st9" d="M120.3,396.5c0,0-32,19-48,25s-19,23-7,38s30,19,54,8c0,0-21,47,11,73s81,34,124,22s83-38,92-82s6-126-16-163
c0,0,34.6-32,37-63c1-13,0-17,0-17s10-3,7-14s-16-4-16-4l-6-3c0,0-1-12-11-12s-12,9-10,16s2,7,2,7s5,30-24,39s-47-16-96-7
c-49,9-75,46-79,75S120.3,396.5,120.3,396.5z"/>
<path class="st3" d="M120.7,396.9c-0.5,0.4-0.8,0.5-1.2,0.8l-1.1,0.6l-2.2,1.3l-4.3,2.5c-2.9,1.7-5.8,3.3-8.7,4.9
c-5.8,3.2-11.7,6.4-17.7,9.3c-3,1.5-6,2.9-9.1,4.2c-1.5,0.7-3.1,1.2-4.6,1.9c-0.7,0.3-1.5,0.6-2.2,1l-2.1,1.2c-2.7,1.8-5,4.2-6.6,7
c-1.6,2.8-2.3,6.1-2.3,9.3c0,3.2,0.7,6.5,1.9,9.5c1.3,3,3,5.9,5,8.5c4.1,5.2,9.3,9.5,15.4,11.9c6.1,2.4,12.9,3,19.4,2
c6.5-0.9,12.9-3,18.9-5.8l1.2-0.5l-0.5,1.2l0,0c-2,4.8-3.4,9.9-4.5,15c-0.5,2.6-1,5.1-1.3,7.7c-0.3,2.6-0.5,5.2-0.6,7.8
c-0.1,2.6,0,5.2,0.3,7.8c0.2,1.3,0.3,2.6,0.5,3.9l0.3,1.9l0.4,1.9c1.2,5.1,3.1,9.9,5.9,14.2c2.7,4.4,6.2,8.3,10.2,11.5l6.3,4.7
l6.6,4.2c8.9,5.4,18.6,9.5,28.6,12.5c20,6,41.4,7.4,62.1,4.6c1.3-0.2,2.6-0.3,3.9-0.5l3.9-0.7l3.9-0.7l3.8-0.9
c5.1-1.1,10.1-2.7,15.1-4.4c9.9-3.4,19.6-7.5,28.8-12.6c9.1-5.1,17.8-11.2,25.4-18.4c7.6-7.2,14.1-15.6,18.9-24.9
c2.4-4.7,4.4-9.5,5.9-14.5c1.5-5,2.5-10.2,3.3-15.4c1.6-10.4,2.5-20.9,3-31.4c0.4-10.5,0.4-21.1,0-31.6c-0.4-10.5-1.3-21-2.7-31.4
c-1.4-10.4-3.3-20.8-6-31c-1.4-5.1-3-10.1-4.8-15c-1.9-4.9-4.1-9.7-6.7-14.2l-0.2-0.3l0.3-0.3l0,0c5.5-5.2,10.6-10.9,15.3-16.9
c4.7-6,9-12.2,12.7-18.9c3.6-6.7,6.6-13.7,8.1-21.1c0.8-3.7,0.9-7.5,1.1-11.3c0.1-1.9,0.1-3.8,0.1-5.7c0-1.9-0.1-3.8-0.4-5.6
l-0.1-0.5l0.4-0.1c2.7-1,5.2-3,6.4-5.6c0.6-1.3,0.8-2.8,0.8-4.3c-0.1-0.7-0.1-1.5-0.3-2.2l-0.2-1.1c-0.1-0.4-0.2-0.7-0.3-1.1
c-0.5-1.4-1.3-2.7-2.4-3.5c-1.1-0.9-2.6-1.3-4-1.4c-2.9-0.1-5.9,0.8-8.6,2.1l-0.2,0.1l-0.2-0.1l-6-3l0,0l-0.2-0.1l0-0.3
c-0.2-1.9-0.8-3.8-1.6-5.5c-0.8-1.7-2-3.3-3.5-4.4c-1.5-1.1-3.4-1.6-5.3-1.6c-1.9,0-3.8,0.4-5.5,1.3c-1.6,0.9-2.9,2.3-3.7,4.1
c-0.8,1.7-1.1,3.6-1,5.6c0,1,0.1,1.9,0.3,2.9c0.2,0.9,0.4,1.9,0.7,2.8l1.7,5.7l0,0l0,0c0.5,3.5,0.5,6.9,0.1,10.4
c-0.4,3.4-1.2,6.9-2.5,10.1c-1.3,3.2-3.1,6.3-5.4,8.9c-2.3,2.7-5,4.9-8,6.7c-3,1.8-6.2,3.1-9.6,4.1c-3.3,1-6.8,1.6-10.3,1.7
c-7,0.4-13.9-1.1-20.5-2.9c-6.6-1.8-13.1-3.8-19.7-5.3c-3.3-0.7-6.6-1.4-10-1.8c-3.4-0.4-6.7-0.7-10.1-0.9
c-6.8-0.2-13.5,0.2-20.2,1.2c-1.7,0.3-3.3,0.5-5,0.9l-4.9,1.1c-3.3,0.6-6.5,1.8-9.8,2.8c-1.6,0.4-3.2,1.1-4.8,1.7l-4.7,1.9
l-4.5,2.2c-1.5,0.7-3,1.5-4.5,2.4l-4.3,2.6c-0.7,0.4-1.4,0.9-2.1,1.4l-2.1,1.5c-2.8,1.9-5.3,4.2-7.9,6.3c-1.3,1.1-2.4,2.3-3.7,3.5
l-1.8,1.8c-0.6,0.6-1.1,1.3-1.7,1.9c-1.1,1.3-2.2,2.5-3.3,3.8l-3.1,4.1c-1.1,1.3-1.9,2.8-2.8,4.2c-0.9,1.4-1.9,2.8-2.6,4.3
c-0.8,1.5-1.7,3-2.4,4.5l-2.1,4.6c-1.2,3.2-2.4,6.3-3.2,9.6c-0.2,0.8-0.5,1.6-0.6,2.5l-0.5,2.5c-0.3,1.7-0.6,3.3-0.8,5
c-1,6.8-2.3,13.5-3.7,20.2c-1.4,6.7-3,13.3-4.7,19.9c-0.8,3.3-1.7,6.6-2.6,9.9l-1.4,4.9l-0.7,2.5l-0.4,1.2
C121,395.9,121,396.2,120.7,396.9z M119.9,396.2l2.7-9.7c0.9-3.3,1.8-6.6,2.6-9.9c1.7-6.6,3.2-13.2,4.6-19.9
c1.4-6.7,2.6-13.4,3.6-20.1c0.2-1.7,0.5-3.4,0.8-5.1l0.5-2.5c0.2-0.8,0.4-1.7,0.7-2.5c0.8-3.3,2-6.6,3.2-9.8c2.6-6.4,6-12.4,9.9-18
l3.1-4.1c1.1-1.3,2.2-2.6,3.3-3.9c0.6-0.6,1.1-1.3,1.7-1.9l1.8-1.8c1.2-1.2,2.4-2.5,3.7-3.6c2.6-2.2,5.2-4.6,8-6.5l2.1-1.5
c0.7-0.5,1.4-1,2.1-1.5l4.4-2.7c1.4-0.9,3-1.7,4.5-2.5l4.6-2.3l4.8-1.9c1.6-0.6,3.2-1.3,4.8-1.8c3.3-1,6.5-2.2,9.9-2.8l5-1.1
c1.7-0.4,3.4-0.6,5.1-0.9c6.8-1,13.7-1.4,20.6-1.2c3.4,0.1,6.9,0.4,10.3,0.9c3.4,0.5,6.8,1.1,10.1,1.8c6.7,1.5,13.2,3.5,19.8,5.3
c6.5,1.8,13.2,3.1,19.9,2.8c3.3-0.1,6.6-0.7,9.9-1.6c3.2-0.9,6.3-2.2,9.2-3.8c2.9-1.7,5.5-3.8,7.7-6.3c2.2-2.5,3.9-5.4,5.2-8.5
c2.5-6.2,3.3-13.1,2.5-19.7l0,0.1l-1.6-5.7c-0.3-0.9-0.5-1.9-0.7-2.9c-0.2-1-0.3-2-0.3-3.1c0-2.1,0.3-4.1,1.1-6.1
c0.8-1.9,2.3-3.6,4.2-4.6c1.9-1,4-1.4,6-1.4c2.1,0,4.2,0.6,5.9,1.8c1.7,1.2,3,2.9,3.9,4.8c0.9,1.9,1.4,3.8,1.6,5.9l-0.3-0.4l0,0
l6,3l-0.5,0c1.4-0.7,2.9-1.3,4.4-1.7c1.5-0.4,3.1-0.6,4.7-0.5c1.6,0.1,3.3,0.6,4.6,1.6c1.3,1,2.2,2.5,2.7,4
c0.1,0.4,0.3,0.8,0.3,1.1l0.2,1.2c0.2,0.8,0.2,1.6,0.3,2.4c0,1.6-0.2,3.2-0.9,4.7c-0.7,1.5-1.7,2.8-2.9,3.8c-1.2,1-2.6,1.8-4.2,2.4
l0.3-0.6c0.4,2,0.4,3.9,0.5,5.8c0,1.9,0,3.8-0.1,5.7c-0.2,3.8-0.4,7.7-1.1,11.4c-1.5,7.6-4.5,14.7-8.2,21.4
c-3.7,6.7-8,13-12.8,19.1c-4.8,6-9.8,11.7-15.4,17l0,0l0.1-0.6c2.7,4.6,4.9,9.4,6.8,14.3c1.9,4.9,3.5,10,4.9,15.1
c2.7,10.2,4.7,20.6,6.1,31.1c1.4,10.5,2.3,21,2.7,31.5c0.4,10.5,0.5,21.1,0,31.7c-0.5,10.5-1.4,21.1-3,31.5
c-0.8,5.2-1.8,10.4-3.3,15.5c-1.5,5.1-3.5,10-5.9,14.8c-4.8,9.5-11.4,18-19,25.3c-7.6,7.3-16.3,13.5-25.5,18.8
c-9.2,5.3-18.9,9.5-28.9,13c-5,1.7-10,3.3-15.2,4.6l-3.9,1l-3.9,0.8l-3.9,0.8c-1.3,0.3-2.6,0.4-3.9,0.6c-21,3.1-42.7,2.3-63.4-3.4
c-2.6-0.8-5.1-1.6-7.7-2.4l-7.5-2.9l-7.3-3.4l-7.1-3.9c-2.3-1.4-4.5-2.9-6.8-4.4c-2.2-1.6-4.3-3.3-6.4-5c-4.2-3.6-7.7-8-10.4-12.7
c-2.7-4.8-4.4-10-5.4-15.3c-1-5.3-1.2-10.7-1-16c0.1-2.7,0.4-5.3,0.8-7.9c0.4-2.6,0.9-5.2,1.5-7.8c1.2-5.2,2.7-10.2,4.7-15.2l0,0
l0.7,0.7c-6.1,2.8-12.5,4.9-19.2,5.8c-6.6,1-13.6,0.4-19.9-2.1l-2.3-1l-2.2-1.2c-0.8-0.4-1.4-0.9-2.1-1.4c-0.7-0.5-1.4-0.9-2-1.5
l-1.9-1.6l-1.8-1.8c-0.6-0.6-1.2-1.2-1.7-1.9c-0.5-0.6-1.1-1.2-1.6-1.9c-2.1-2.7-3.8-5.6-5.1-8.7c-1.3-3.1-2-6.5-2-9.9
c0-3.4,0.8-6.8,2.5-9.8c1.6-3,4.1-5.5,6.9-7.4l2.2-1.3c0.8-0.4,1.5-0.7,2.3-1c1.5-0.7,3.1-1.2,4.6-1.9c3-1.3,6-2.7,9-4.2
c6-2.9,11.8-6.1,17.7-9.3c2.9-1.6,5.8-3.2,8.7-4.9L119.9,396.2z"/>
</g>
<path class="st4" d="M359.2,226.5c-3.4,0-8.8-1.2-13.6-4.5c-3.7-2.5-3.4-5.6-2.9-7.2c0.8-2.6,3.2-4.8,5.3-4.8c0.5,0,0.9,0.1,1.3,0.4
c0.1,0.1,0.5,0.6,1.1,1.2c1.1,2.6,1.3,4.9,1.3,5l0,0.3l6.5,3.2l0.2-0.1c0,0,1.8-0.9,4.1-1.6c1.5,0.6,2.7,3.1,2.1,5.8
C364.4,225.7,362.3,226.5,359.2,226.5z"/>
<g>
<path class="st10" d="M279.6,368.5c-5.8,0-12.7-6.3-18.9-17.2c-2-3.6-2.4-6.5-1-8.8c1.9-3.3,7.5-5.2,15.6-5.2
c5.7,0,12.2,1,17.8,2.7c1.8,0.5,2.9,1.6,3.3,3.2c1.5,6.1-6.6,18-11.5,22.9C283.4,367.7,281.6,368.5,279.6,368.5
C279.6,368.5,279.6,368.5,279.6,368.5z"/>
<path d="M275.3,337.9c5.7,0,12.1,1,17.7,2.6c1.6,0.5,2.6,1.4,3,2.9c1.5,5.8-6.6,17.7-11.4,22.5c-1.4,1.4-3.1,2.2-5,2.2
c-5.6,0-12.5-6.3-18.4-16.9c-1.9-3.4-2.3-6.2-1-8.3C261.9,339.7,267.5,337.9,275.3,337.9 M275.3,336.9c-11.8,0-21,4-15,14.7
c6.5,11.6,13.6,17.5,19.3,17.5c2.1,0,4.1-0.8,5.7-2.5c6-6,18-24,8-27C287.7,337.9,281.2,336.9,275.3,336.9L275.3,336.9z"/>
</g>
<path class="st4" d="M256.6,546c-22.5,0-47.8-3.6-77.4-11c-21.9-5.5-33.8-18.6-36.5-40.2c-1.7-13.3,0.2-28.4,3.4-44.3
c-5.8,4.4-11.8,8.7-16.2,11.5c-2.5,1.6-6,3.5-10,5.5l-0.1,0.3c-0.2,0.5-20.5,47,10.9,72.4c21.4,17.4,51.8,27.3,83.4,27.3
c0,0,0,0,0,0c13.7,0,27.3-1.8,40.2-5.4c19.8-5.5,37.7-13.7,51.9-23.8C292,543.4,275.4,546,256.6,546z"/>
<path class="st4" d="M94.1,473.3c-11.4,0-21-4.7-28.5-14.1c-7-8.8-9.1-18.7-5.5-26.5c4.8-3.2,10.3-4.9,15.8-4.9
c7.7,0,14.9,3.2,20.9,9.1c7.8,7.8,9.8,18.6,9.9,18.7l0.1,0.4l0.4,0c0.1,0,1.3,0.1,3.5,0.1c6.9,0,23.1,0.3,38-8.1
c-6,5-16.4,12-28.8,19.1l0.3-0.6l-1.2,0.6C110.1,471.2,101.7,473.3,94.1,473.3z"/>
<g>
<path class="st5" d="M152.3,509.5c-6,22,11,45,39,37c0,0,5,32,32,26s28-32,19-56c-9-24-39-32-61-22"/>
<path class="st3" d="M152.3,509.5c-1.4,5.4-1.4,11.1,0,16.4c1.4,5.3,4.2,10.3,8.2,14.1c4,3.8,9.1,6.3,14.5,7.2
c2.7,0.5,5.5,0.5,8.2,0.3c2.7-0.2,5.4-0.7,8.1-1.4l0.5-0.1l0.1,0.6l0,0c0.7,3.8,1.9,7.5,3.6,11c1.7,3.5,3.8,6.7,6.6,9.4
c2.8,2.7,6.2,4.5,9.9,5.3c3.7,0.8,7.6,0.6,11.4-0.3c3.8-0.9,7.4-2.2,10.7-4.2c1.6-1,3.1-2.2,4.5-3.5c1.3-1.4,2.5-2.8,3.6-4.4
c1-1.6,1.8-3.4,2.5-5.1c0.7-1.8,1.1-3.7,1.5-5.6c0.7-3.8,0.7-7.7,0.4-11.5c-0.7-7.7-2.8-15.3-5.7-22.4c-1.5-3.5-3.6-6.7-6.1-9.6
c-2.5-2.8-5.5-5.4-8.7-7.4c-6.5-4-14.1-6.4-21.8-7c-7.7-0.6-15.6,0.5-22.8,3.4c14-7.1,31.9-6.3,45.5,2c3.4,2.1,6.5,4.7,9.1,7.7
c2.6,3,4.8,6.4,6.4,10.1c2.9,7.4,5,15.1,5.6,23c0.2,2,0.2,4,0.1,5.9c-0.1,2-0.3,4-0.6,5.9c-0.4,2-0.9,3.9-1.6,5.8
c-0.7,1.9-1.6,3.7-2.7,5.4c-1.1,1.7-2.4,3.2-3.8,4.7c-1.5,1.4-3,2.6-4.7,3.7c-3.4,2.1-7.2,3.5-11.1,4.3c-3.9,0.9-8,1.1-11.9,0.2
c-3.9-0.9-7.6-2.9-10.5-5.7c-2.9-2.8-5.1-6.1-6.8-9.7c-1.7-3.6-2.9-7.4-3.6-11.3l0,0l0.6,0.4c-2.7,0.8-5.5,1.3-8.3,1.6
c-2.8,0.2-5.7,0.1-8.4-0.4c-5.6-1-10.9-3.5-14.9-7.5c-4-4-6.8-9.1-8-14.6c-0.6-2.7-0.9-5.5-0.8-8.3
C151,515,151.5,512.2,152.3,509.5z"/>
</g>
<path class="st4" d="M216.8,572.8c-20.7,0-25-26-25-26.3l-0.1-0.6l-0.5,0.2c-3.7,1.1-7.4,1.6-10.9,1.6c-13.4,0-27.5-9.3-28.9-26.7
c6.3,9,18.2,9.7,30.9,9.7c0,0,0,0,0,0c2.3,0,4.6-0.2,6.8-0.5l0.5-0.1l-0.1-0.5c0-0.1-1.6-9.7,5.9-11.6c2.2-0.6,4.2-0.8,6.1-0.8
c11.1,0,18.2,9.6,21.3,28.4c1.8,11.3,1.4,20.3-1.4,26.8C219.8,572.6,218.3,572.8,216.8,572.8C216.8,572.8,216.8,572.8,216.8,572.8z"
/>
<g>
<path d="M221.1,327L221.1,327c-1.5,0.6-3.3-0.2-3.9-1.8c-4-10.1-6.3-15-11.5-24.5c-0.8-1.4-0.3-3.3,1.1-4.1l0,0
c1.4-0.8,3.3-0.3,4.1,1.2c5.4,9.7,7.7,14.8,11.8,25.2C223.4,324.7,222.6,326.5,221.1,327z"/>
</g>
<g>
<path class="st1" d="M287.8,345.1c-4.3,0-15.4-0.4-26.9-4c2.6-2.4,7.7-3.7,14.4-3.7c5.3,0,11.1,0.8,16.4,2.2
c-0.5,2.5-1.4,4.7-1.7,5.4C289.6,345.1,288.9,345.1,287.8,345.1C287.8,345.1,287.8,345.1,287.8,345.1z"/>
<path d="M275.3,337.9c5.1,0,10.7,0.7,15.8,2.1c-0.4,2-1.1,3.8-1.5,4.6c-0.4,0-1,0-1.8,0c-4.2,0-14.8-0.4-25.9-3.7
C264.6,338.9,269.3,337.9,275.3,337.9 M275.3,336.9c-6.7,0-12.6,1.3-15.3,4.4c11.7,3.8,23,4.3,27.8,4.3c1.6,0,2.5,0,2.5,0
s1.4-2.9,2-6.3C286.9,337.8,280.8,336.9,275.3,336.9L275.3,336.9z"/>
</g>
<path class="st11" d="M263.2,344.6c-0.5,2,1.7,4.1,1.7,7.7c-0.2,10,8.8,14.4,14.2,16.1C283.1,356.2,276.9,348.6,263.2,344.6z"/>
<g>
<path class="st6" d="M212.3,337.5c-12,7.5-8,23,3,28s45,19,58,0s20-38,13-53s-15.2-3.3-13.9,7.1c0.9,6.9-8.1,26.9-22.1,22.9
C236.3,338.5,220.3,332.5,212.3,337.5z"/>
<path class="st7" d="M212.5,337.9c-2.2,1.4-4.1,3.3-5.4,5.6c-1.3,2.3-1.8,4.9-1.7,7.5c0.3,5.2,3.4,10.2,7.8,12.9
c2.2,1.4,4.8,2.3,7.2,3.4c2.5,1,5,2,7.5,2.8c5.1,1.7,10.2,3.1,15.5,3.9c5.3,0.8,10.7,1,15.8-0.1c2.6-0.6,5.1-1.5,7.3-2.8
c2.2-1.4,4.2-3.2,5.8-5.3c3.1-4.4,5.9-8.9,8.4-13.7c2.5-4.7,4.6-9.7,6-14.8c1.4-5.1,2.1-10.5,1.5-15.8c-0.4-2.6-0.9-5.2-2-7.6
c-1-2.4-2.3-4.9-4.1-6.6c-0.9-0.9-2.1-1.5-3.3-1.5c-1.2,0-2.3,0.7-3.1,1.7c-0.9,0.9-1.5,2.1-2,3.3c-0.5,1.2-0.8,2.5-1,3.8
c-0.2,1.3-0.2,2.6-0.2,3.9l0.1,1c0,0.3,0.1,0.7,0.1,1.1c0,0.7-0.1,1.4-0.2,2.1c-0.4,2.7-1.3,5.3-2.5,7.8c-1.2,2.5-2.6,4.8-4.4,6.8
c-1.8,2-3.9,3.9-6.5,5c-1.3,0.6-2.6,1-4,1.1c-1.4,0.1-2.8,0.1-4.1-0.2c-2.7-0.7-5.2-1.5-7.8-2.2c-5.1-1.5-10.3-3.1-15.5-4.1
c-2.6-0.5-5.3-0.9-7.9-0.8C217.4,336.1,214.7,336.6,212.5,337.9z M212.1,337.2c2.4-1.5,5.2-1.9,8-1.9c2.7,0,5.4,0.3,8.1,0.8
c5.3,1,10.5,2.6,15.6,4.1c2.6,0.7,5.2,1.6,7.7,2.2c1.3,0.3,2.6,0.3,3.9,0.2c1.3-0.2,2.5-0.5,3.7-1.1c2.4-1.1,4.4-2.8,6.2-4.8
c1.7-2,3.2-4.3,4.3-6.7c1.1-2.4,2-4.9,2.4-7.5c0.1-0.6,0.2-1.3,0.1-1.9c0-0.3,0-0.6-0.1-1l-0.1-1c-0.1-1.4,0-2.8,0.2-4.1
c0.2-1.4,0.5-2.7,1-4c0.5-1.3,1.2-2.5,2.1-3.6c0.9-1.1,2.2-1.9,3.8-2c0.8,0,1.5,0.2,2.2,0.5c0.6,0.3,1.2,0.7,1.7,1.2
c2,2,3.3,4.4,4.3,6.9c1.1,2.5,1.7,5.2,2.1,7.9c0.6,5.4-0.1,10.9-1.5,16.1c-1.5,5.2-3.6,10.2-6.1,15c-2.5,4.8-5.3,9.4-8.4,13.8
c-1.6,2.2-3.7,4.1-6,5.5c-2.4,1.4-4.9,2.4-7.6,3c-5.4,1.2-10.9,1-16.2,0.2c-5.4-0.8-10.6-2.2-15.7-3.9c-2.6-0.9-5.1-1.8-7.6-2.8
c-2.5-1.1-5-2-7.4-3.5c-0.6-0.4-1.2-0.8-1.7-1.2l-1.6-1.4c-0.5-0.5-0.9-1.1-1.4-1.6c-0.4-0.6-0.8-1.2-1.2-1.7
c-1.4-2.4-2.3-5.1-2.5-8c-0.2-2.8,0.5-5.6,1.9-8.1C207.6,340.6,209.7,338.6,212.1,337.2z"/>
</g>
<path class="st8" d="M251.8,374.7c-12.5,0-26.7-5.2-36.3-9.6c-5.4-2.5-9.3-7.7-9.9-13.4c2.4-1.8,6-2.8,10.2-2.8
c4.4,0,9.3,1.1,14.4,3.1c10.1,4.1,19,7.6,26.3,7.6c0,0,0,0,0,0c5.3,0,9.1-1.9,11.6-5.8c3.6-5.6,8-8.1,10.9-8.1c1,0,1.8,0.3,2.4,0.9
c0.6,0.7,0.9,1.8,0.7,3.2c-2.4,4.9-5.5,10.1-9.1,15.4C268.6,371.5,261.5,374.7,251.8,374.7C251.8,374.7,251.8,374.7,251.8,374.7z"/>
<g>
<path class="st12" d="M495.3,123.5c-19.9-8.3-40-27-62-19s-22,30-30,50s-20,52,1,65s88,51,115,57s41-1,50-21s32-55,9-74
S507.3,128.5,495.3,123.5z"/>
<path class="st13" d="M495,124.1c-11-4.7-20.8-11.6-31.6-16.3c-5.4-2.4-11-4.2-16.9-4.6c-2.9-0.2-5.9,0-8.7,0.6
c-0.7,0.1-1.4,0.4-2.1,0.5c-0.7,0.2-1.4,0.4-2.1,0.7c-1.4,0.6-2.7,1.1-4,1.7c-5.2,2.6-9.6,6.8-12.6,11.8c-3.1,5-5,10.6-6.7,16.3
c-1.7,5.7-3.2,11.4-5.3,17c-1,2.8-2.1,5.6-3.2,8.3c-1.1,2.8-2.1,5.5-3,8.3c-1.9,5.6-3.5,11.3-4.5,17.1c-0.5,2.9-0.8,5.8-0.8,8.7
c0,2.9,0.2,5.8,0.8,8.6c1.2,5.6,4.1,10.7,8.7,14c1.1,0.8,2.3,1.6,3.6,2.4l3.8,2.3c2.5,1.5,5.1,3,7.6,4.5
c20.4,12,41.1,23.6,62.5,33.8c2.7,1.3,5.3,2.5,8.1,3.7c2.7,1.2,5.4,2.4,8.1,3.5l4.1,1.7l4.1,1.6c2.7,1.1,5.5,2,8.3,2.9
c5.6,1.6,11.3,2.8,17.1,3.4c5.8,0.5,11.6,0.3,17-1.3c5.4-1.7,10.2-4.9,13.7-9.3l1.3-1.7l1.2-1.8c0.8-1.2,1.5-2.5,2.2-3.7
c0.7-1.3,1.3-2.6,1.9-3.9c0.6-1.3,1.3-2.7,1.9-4.1c5.3-10.7,10.9-21.1,14.5-32.2c1.7-5.6,2.9-11.3,2.7-17c-0.1-2.8-0.6-5.7-1.5-8.3
c-0.9-2.7-2.3-5.1-4.1-7.3c-1.8-2.2-4-4-6.3-5.9c-2.3-1.9-4.6-3.7-6.9-5.6c-4.7-3.6-9.3-7.3-14.1-10.8
c-9.5-7.1-19.1-14.1-28.8-20.9c-4.9-3.4-9.8-6.7-14.7-9.9c-2.5-1.6-5-3.2-7.5-4.7c-1.3-0.8-2.5-1.5-3.8-2.2
C497.7,125.4,496.3,124.8,495,124.1z M495.5,123c1.4,0.6,2.8,1.3,4,2c1.3,0.7,2.6,1.4,3.9,2.2c2.6,1.5,5.1,3.1,7.6,4.7
c5,3.2,10,6.5,14.9,9.8c9.8,6.7,19.5,13.6,29.1,20.6c4.8,3.5,9.5,7.1,14.2,10.7c2.3,1.8,4.7,3.6,7,5.5c1.2,1,2.3,1.8,3.5,2.9
c0.6,0.5,1.2,1,1.7,1.6l1.6,1.7c2,2.4,3.6,5.1,4.7,8c1.1,2.9,1.6,6,1.8,9.1c0.3,6.2-0.9,12.2-2.7,18c-3.5,11.6-9.2,22.2-14.3,32.8
c-0.6,1.3-1.2,2.7-1.9,4c-0.7,1.4-1.3,2.8-2,4.1c-0.8,1.3-1.5,2.7-2.4,3.9l-1.3,1.9l-1.4,1.8c-3.8,4.9-9.3,8.5-15.2,10.4
c-6,1.8-12.2,2-18.3,1.3c-6-0.6-11.9-1.9-17.7-3.8c-11.4-3.9-22.1-9-32.8-14.2c-2.7-1.3-5.3-2.6-8-4c-2.7-1.3-5.3-2.6-8-4
c-5.3-2.7-10.5-5.5-15.8-8.2c-10.5-5.6-20.9-11.3-31.2-17.2c-2.6-1.5-5.1-3-7.7-4.5l-3.8-2.3c-1.3-0.7-2.6-1.6-3.8-2.5
c-2.5-1.9-4.6-4.3-6.1-7.1c-1.6-2.7-2.5-5.7-3-8.8c-0.5-3-0.6-6.1-0.4-9.1c0.2-3,0.5-6,1.1-8.9c1.1-5.9,2.8-11.6,4.7-17.3
c1-2.8,2-5.6,3.1-8.4c1.1-2.8,2.2-5.5,3.2-8.3c2-5.5,3.6-11.3,5.4-16.9c1.8-5.7,3.7-11.4,6.9-16.5c0.9-1.2,1.6-2.6,2.6-3.7l1.4-1.7
l1.6-1.6c1-1.1,2.3-1.9,3.5-2.8c0.6-0.5,1.3-0.8,1.9-1.2l2-1.1c1.4-0.6,2.8-1.2,4.1-1.8c0.7-0.2,1.4-0.5,2.2-0.7
c0.7-0.2,1.5-0.4,2.2-0.5c2.9-0.6,6-0.8,9-0.6c6,0.4,11.8,2.2,17.3,4.6C474.8,111.6,484.7,118.4,495.5,123z"/>
</g>
<path class="st14" d="M439.7,118c-9.1-2.5-16.5,3.5-22.7,16.8c-6.3,13.3-23.9,60.7-14.5,70.9c9.4,10.2,50.9,36.8,71.7,46.6
c20.8,9.8,58.8,27.4,74.8,16.5c16.1-11,23.1-33.7,27-43.9c3.9-10.2,7.1-29-14.1-40.8C540.8,172.5,455.8,122.3,439.7,118z"/>
<g>
<path class="st12" d="M578.3,181.5c-23-19-71-53-83-58c-19.9-8.3-40-27-62-19c-4.8,1.7-8.5,4.1-11.5,7c8.2,37.7,22.1,75,46.5,91
c24.3,15.9,82-9.4,118-10.2C584.7,188.4,582.2,184.7,578.3,181.5z"/>
<path class="st13" d="M577.9,182c-5.8-4.8-11.9-9.4-17.9-14c-6-4.6-12.2-9-18.3-13.4c-12.3-8.8-24.8-17.5-37.7-25.2
c-3.3-1.9-6.5-3.7-9.9-5.2c-3.5-1.5-6.9-3.2-10.3-5l-10-5.4c-3.3-1.8-6.6-3.6-10-5.1c-3.4-1.6-6.9-2.9-10.5-3.8
c-3.6-0.9-7.3-1.4-11-1.2c-3.7,0.1-7.3,1.1-10.7,2.5c-3.4,1.4-6.7,3.3-9.4,5.9l0,0l0.1-0.5c1.9,9.2,4.2,18.3,6.9,27.2
c2.8,8.9,6,17.7,9.9,26.2c3.9,8.5,8.7,16.6,14.6,23.9c0.7,0.9,1.5,1.8,2.2,2.7l2.4,2.5l1.2,1.3c0.4,0.4,0.9,0.8,1.3,1.2l2.6,2.3
c0.9,0.8,1.9,1.4,2.8,2.1l1.4,1l0.7,0.5l0.8,0.4l1.5,0.9c0.5,0.3,1.1,0.5,1.6,0.7c1,0.5,2.2,0.8,3.3,1.2c4.5,1.4,9.2,1.8,13.8,1.9
c4.7,0.1,9.4-0.3,14-0.8c9.3-1.1,18.5-3,27.6-5c9.1-2,18.3-4.2,27.4-6c9.2-1.9,18.4-3.6,27.9-3.9l0,0l-0.5,0.7
C584.2,188.4,581.4,184.8,577.9,182z M578.6,181.1c0.9,0.7,1.8,1.5,2.6,2.3c0.8,0.8,1.6,1.7,2.3,2.6c0.8,0.9,1.5,1.8,2.1,2.8
c0.7,1,1.3,2,1.8,3.1l1,1.8l-2.2,0.1l0,0c-9.2,0.1-18.5,1.6-27.7,3.2c-9.2,1.7-18.3,3.8-27.5,5.7c-4.6,1-9.2,1.8-13.8,2.7
c-4.6,0.8-9.3,1.6-13.9,2.1c-4.7,0.5-9.4,0.8-14.1,0.7c-4.7-0.1-9.4-0.6-13.9-2c-1.1-0.4-2.2-0.7-3.3-1.3c-0.5-0.2-1.1-0.5-1.6-0.7
l-1.5-0.9l-0.8-0.4l-0.7-0.5l-1.4-1c-0.9-0.7-1.9-1.3-2.8-2.1l-2.6-2.3c-0.4-0.4-0.9-0.8-1.3-1.2l-1.2-1.3l-2.4-2.5
c-0.8-0.9-1.5-1.8-2.3-2.7c-6-7.3-10.7-15.4-14.7-23.9c-4-8.5-7.2-17.3-10-26.3c-2.8-8.9-5.2-18-7.3-27.2l-0.1-0.3l0.2-0.2l0,0
c5.5-5.5,12.9-8.9,20.7-9.4c3.9-0.3,7.8,0.1,11.6,1c3.8,0.9,7.4,2.2,10.9,3.7c7.1,3,13.6,7,20.2,10.6c3.3,1.8,6.6,3.6,10.1,5.1
c1.7,0.8,3.5,1.6,5.2,2.6c1.7,0.9,3.3,1.9,4.9,2.9c6.5,4,12.7,8.3,19,12.6c6.2,4.3,12.4,8.7,18.5,13.2
C554.7,162.5,566.9,171.5,578.6,181.1z"/>
</g>
<ellipse class="st15" cx="479.3" cy="201.5" rx="18" ry="17"/>
<polygon class="st1" points="321.3,166.5 317.3,180.5 348.3,182.5 349.3,173.5 "/>
<polygon class="st1" points="368.4,116.1 357.9,123.8 375.6,150 383.2,144.4 "/>
<polygon class="st1" points="422.6,312.8 418.6,343.8 434.6,344.8 432.6,313.8 "/>
<polygon class="st1" points="501.9,298.9 492.9,302.9 500.9,325.9 514.9,321.9 "/>
<g>
<path class="st3" d="M119.1,467.1c6.9-3.4,13.5-7.2,19.9-11.5c3.2-2.2,6.3-4.4,9.2-6.9c2.9-2.5,5.9-5,8.1-8.1
c-2.2,3.2-5.1,5.8-8,8.3c-2.9,2.5-6,4.9-9.1,7.1c-6.3,4.5-12.9,8.5-19.7,12L119.1,467.1z"/>
</g>
<g>
<path d="M190.8,546.7c-0.4-1.2-0.7-2.5-0.9-3.8c-0.2-1.3-0.3-2.5-0.4-3.8c-0.2-2.5-0.2-5.1-0.2-7.6c0.1,2.5,0.3,5.1,0.7,7.6
c0.2,1.2,0.4,2.5,0.7,3.7c0.3,1.2,0.6,2.4,1.1,3.5L190.8,546.7z"/>
</g>
<path class="st16" d="M475.3,190.5c-4.5,3-9.3,6.3-8.7,11.2c0.7,4.8,0.7,9.8,7.7,10.8s14,2,16-4s4-14-1-16S478.3,188.5,475.3,190.5z
"/>
<g>
<path class="st5" d="M162.8,336c-16-22-38-27-54-20s-33,34-29,60s3,36-2,48s8,30,24,13c0,0,26,13,43-11s8-52,8-52"/>
<path class="st3" d="M162.8,336l-2.2-2.7c-0.4-0.4-0.7-0.9-1.1-1.3l-1.2-1.3c-0.8-0.8-1.6-1.7-2.4-2.5l-2.6-2.3
c-3.5-3-7.4-5.5-11.5-7.6c-8.2-4.1-17.8-5.5-26.6-3.3c-8.9,2-16.1,8.3-21.5,15.5c-2.7,3.6-5.1,7.6-7,11.7
c-1.9,4.1-3.5,8.4-4.5,12.9l-0.4,1.7l-0.3,1.7c-0.2,1.1-0.4,2.2-0.5,3.4c-0.2,2.3-0.4,4.5-0.3,6.8c-0.1,2.3,0.3,4.5,0.5,6.8
c0.3,2.3,0.7,4.6,1,6.9c0.6,4.6,1.1,9.3,1.4,14c0.2,4.7,0.1,9.5-0.6,14.2c-0.4,2.4-0.9,4.7-1.6,7c-0.7,2.3-1.5,4.5-2.4,6.7
c-1.7,4-1.4,8.7,0.6,12.6c0.5,1,1.1,1.9,1.8,2.7c0.7,0.8,1.5,1.5,2.4,2.1c0.9,0.6,1.9,1,2.9,1.3c1,0.3,2.1,0.4,3.2,0.2
c2.2-0.2,4.3-1,6.2-2.2c1.9-1.2,3.7-2.7,5.3-4.3l0,0l0.3-0.3l0.3,0.1c3.8,1.7,8,2.8,12.2,3.3c4.2,0.4,8.5,0.2,12.5-1
c2-0.6,4-1.4,5.8-2.4c1.9-1,3.6-2.2,5.2-3.5c3.2-2.7,6-6,8.1-9.7c2.4-3.5,4-7.5,5.5-11.4c1.3-4,2.3-8.2,2.8-12.4
c0.9-8.4,0.4-17.1-1.9-25.3l1-0.3c2.3,8.4,2.9,17.1,2,25.7c-0.5,4.3-1.5,8.5-2.8,12.6c-1.5,4-3.2,8-5.6,11.6
c-2.2,3.7-5,7.1-8.3,9.9c-1.7,1.4-3.5,2.6-5.4,3.7c-1.9,1-4,1.8-6,2.4c-4.2,1.2-8.6,1.5-12.9,1c-4.3-0.5-8.5-1.5-12.5-3.4l0.6-0.1
l0,0c-1.6,1.7-3.3,3.4-5.3,4.7c-2,1.3-4.3,2.3-6.8,2.6c-2.5,0.3-5.1-0.2-7.2-1.5c-1.1-0.6-2.1-1.4-2.9-2.4c-0.8-0.9-1.6-1.9-2.2-3
c-2.4-4.3-2.9-9.7-0.9-14.4c0.9-2.1,1.6-4.3,2.2-6.5c0.6-2.2,1.1-4.4,1.4-6.7c0.6-4.5,0.6-9.1,0.3-13.7c-0.3-4.6-0.8-9.2-1.4-13.8
c-0.3-2.3-0.7-4.6-1-6.9c-0.2-2.4-0.6-4.7-0.5-7.1c-0.1-2.4,0.2-4.8,0.3-7.1c0.1-1.2,0.4-2.4,0.5-3.5l0.3-1.8l0.4-1.7
c1-4.6,2.7-9.1,4.7-13.4c2-4.3,4.5-8.4,7.4-12.1c2.9-3.8,6.2-7.3,10.1-10.1c0.9-0.7,2-1.3,3-2c0.5-0.3,1-0.6,1.6-0.9l1.6-0.8
c1.1-0.5,2.2-0.9,3.4-1.3c1.1-0.4,2.3-0.6,3.5-1c9.4-2.1,19.3-0.2,27.6,4.2c4.2,2.2,8,5,11.4,8.2
C157.1,328.6,160.1,332.2,162.8,336z"/>
</g>
<path class="st4" d="M88.9,443.5c-3.6,0-6.8-1.9-9.1-5.2c-2.8-4.1-3.4-9.7-1.5-14c1.7-4.2,3.4-7.5,4.1-11.2c4,3.5,7.5,5.1,11.4,5.1
c0,0,0,0,0,0c3.1,0,6.2-1.2,8.9-3.3c1.4,1.8,7.3,8.7,16.9,8.7c3.7,0,7.5-1,11.4-2.9c12.6-6.3,19.7-11,22.9-18.8
c-1.3,8.9-4.5,17-9.6,24c-6.7,9.5-15.6,14.3-26.4,14.3c-8.9,0-15.9-3.4-15.9-3.5l-0.3-0.2l-0.3,0.3
C97.2,441.2,92.9,443.5,88.9,443.5z"/>
<path class="st4" d="M197.1,338c-0.3,3.3-4.5,4.6-9.4,4.1c-4.9-0.5-8.8-2.5-8.5-5.8c0.3-3.3,4.5-4.6,9.4-4.1
C193.6,332.7,197.4,334.7,197.1,338z"/>
<path class="st1" d="M449.9,106.4c0,0,45.3,21.1,59.3,30.3c14,9.2,54.9,36.7,53.7,40c-1.3,3.3-11.6-1.8-19.8-8.4
c-16.7-13.4-75-48.1-91.7-54.2C445.1,111.8,446.5,107.2,449.9,106.4z"/>
<path class="st17" d="M472.4,186.9c-3.8,1.5-4.5,3.3-3.8,4.1s3.6-1.3,5.5-2.3c1.8-1,5.9-1.8,9.2-0.5c3.3,1.3,4,1.1,4.2,0.5
c0.2-0.6-2.1-2.6-5.9-3C477.8,185.2,474.8,185.9,472.4,186.9z"/>
<ellipse class="st17" cx="489.5" cy="189.8" rx="0.9" ry="0.8"/>
<rect x="493.2" y="240.1" transform="matrix(0.8984 0.4391 -0.4391 0.8984 159.4241 -201.1793)" class="st18" width="42.7" height="7.7"/>
<path class="st1" d="M279,177.7c6.5,2.9,10.5,10.1,10.8,17.3c0.3,7.1-2.6,14.1-6.9,19.9c-2.5,3.3-5.5,6.4-9.1,8.4s-7.2,2.9-11.2,1.7
c-2.9,6.7-10.7,9.6-17.7,11.5c-10.3,2.8-21.1,4.9-31.4,2.4c-10.3-2.5-19.3-10-20.2-20.6c-9.1,0.7-18.4,0.8-27.1-1.6
c-8.8-2.5-17.1-7.8-21.3-15.9c-6.6-12.4-2-28.3,6.5-39.4c10.1-13.2,26.6-22.2,43.2-20.4c7.2-8.2,19.1-10.3,30-10.2
c11,0.1,22.1,1.9,32.1,6.4c10,4.5,18.9,12,24.2,21.6C284.1,164.7,282.8,171.9,279,177.7z"/>
<path class="st1" d="M166.5,247c2.2,10.2-4.4,16.8-15.8,19.2s-23.3-0.3-25.4-10.5c-2.2-10.2,6.6-17.3,17.9-19.7
S164.3,236.8,166.5,247z"/>
<path class="st1" d="M558,366.1c2.2,10.2-4.4,16.8-15.8,19.2c-11.4,2.4-23.3-0.3-25.4-10.5c-2.2-10.2,6.6-17.3,17.9-19.7
C546.1,352.7,555.9,355.9,558,366.1z"/>
<path class="st1" d="M490.4,428.4c-1.4,5-5.3,8.9-9.6,11.8c-6.1,4.2-13.4,6.8-20.8,7c-7.4,0.3-13.3-5.3-20.7-6.2
c-6.1-0.7-12.1-3-17.1-6.5c-4-2.8-7.6-6.6-8.9-11.3c-1.6-5.6,0.3-11.5,2.9-16.6c1.8-3.4,3.9-7.1,7.5-8.6c-0.8-7.4,1-15.1,4.9-21.5
c3.9-6.4,10-11.3,17-14c3.9-1.5,7.2-4.1,11.4-4.1c13.3-0.1,26.2,8.3,31.7,20.4c2.1,4.6,3,10.3,0.2,14.4c7.4,1.5,13.5,7.5,16.2,14.5
c0.9,2.4,1.6,4.9,1.6,7.5c0,4-1.7,7.9-4.6,10.7S494.3,428.6,490.4,428.4z"/>
<g>
<path class="st0" d="M190.6,218.4c-0.6-5.3,0.2-10.5,1.9-15.3c1.7-4.8,4.3-9.3,7.9-13c1.8-1.8,3.9-3.3,6.1-4.6
c2.2-1.2,4.9-2,7.5-1.8c2.6,0.1,5.1,1,7.4,2.2c2.2,1.2,4.3,2.7,6.1,4.4c1.9,1.7,3.6,3.6,4.9,5.8c1.3,2.2,2.2,4.7,2.4,7.2
c0.2,5.2-3,10.2-7.4,12.6c-2.3,1.2-4.9,1.8-7.4,1.3c-0.3-0.1-0.6-0.1-1-0.3c-0.3-0.1-0.6-0.3-0.9-0.4c-0.5-0.2-1.1-0.4-1.7-0.5
c-1.2-0.3-2.4-0.6-3.6-1.4c-0.3-0.2-0.5-0.5-0.7-0.8c-0.2-0.3-0.3-0.5-0.5-0.8c-0.3-0.6-0.6-1.1-0.9-1.7c-0.5-1.1-1-2.3-1.3-3.5
c-0.1-0.3-0.2-0.7-0.2-1.1c0-0.4,0.1-0.7,0.2-1c0.2-0.6,0.5-1.2,0.8-1.8c0.6-1.1,1.4-2.1,2.2-3.1l0.8,0.6c-0.8,0.9-1.5,1.9-2.1,2.9
c-0.6,1-1,2.1-0.7,3.1c0.3,1.1,0.8,2.3,1.3,3.4c0.3,0.5,0.5,1.1,0.8,1.6c0.1,0.3,0.3,0.5,0.5,0.8c0.1,0.2,0.3,0.4,0.5,0.5
c0.8,0.6,2,0.9,3.2,1.2c0.6,0.2,1.2,0.3,1.8,0.6c0.3,0.1,0.6,0.3,0.8,0.3c0.3,0.1,0.5,0.2,0.8,0.2c2.2,0.4,4.7-0.2,6.7-1.3
c4.1-2.2,6.9-6.8,6.7-11.5c-0.1-2.3-1-4.6-2.2-6.6c-1.2-2-2.9-3.8-4.7-5.4c-1.8-1.6-3.8-3-5.9-4.1c-2.1-1.1-4.4-1.8-6.7-1.9
c-2.3-0.1-4.6,0.6-6.6,1.7c-2.1,1.2-4,2.6-5.7,4.3c-3.3,3.4-5.8,7.7-7.2,12.3c-1.4,4.6-2,9.5-1.4,14.3L190.6,218.4z"/>
</g>
<g>
<path class="st0" d="M422.9,396.8c3-2,6.6-2.2,9.8-1.6c3.2,0.7,6.1,2.2,8.7,3.9c2.6,1.7,5.2,3.7,7.1,6.3c1,1.3,1.8,2.8,2.2,4.4
c0.5,1.6,0.6,3.4,0.3,5c-0.5,3.3-2.3,6.4-5.1,8.3c-2.7,2-6.3,2.6-9.5,2.1c-3.2-0.6-6.3-2.3-8.2-5.1c-0.5-0.7-0.8-1.6-0.9-2.6
c-0.1-0.9,0.1-1.8,0.5-2.7c0.7-1.6,2.1-3,3.9-3.5l0.4,1.8c-1.1,0.3-2.2,1.2-2.7,2.3c-0.2,0.6-0.4,1.2-0.3,1.8
c0,0.6,0.2,1.2,0.6,1.8c0.7,1.1,1.8,2.1,3,2.9c1.2,0.8,2.6,1.2,4,1.5c2.8,0.5,5.8,0,8.2-1.7c2.3-1.7,4-4.3,4.4-7.2
c0.2-1.4,0.1-2.9-0.2-4.3c-0.4-1.4-1.1-2.7-1.9-3.9c-1.8-2.4-4.1-4.3-6.7-6c-2.5-1.6-5.2-3.1-8.2-3.8c-2.9-0.6-6.2-0.4-8.7,1.3
L422.9,396.8z"/>
</g>
<path class="st19" d="M537.7,95.5c-5.3,1.7-10.2,4.8-13.2,9.5c-3,4.6-3.8,10.9-1.2,15.7c1.2,2.2,2.9,4,5,5.4
c3.3,2.3,7.3,3.5,11.2,3.4c3.7,0,7.5-1.2,10.1-3.8c2.6-2.6,4-6.6,2.7-10.1c-1.2-3.5-5.2-5.9-8.7-4.9"/>
<rect x="208.6" y="311.7" transform="matrix(0.9322 -0.362 0.362 0.9322 -99.1746 97.886)" class="st1" width="6.2" height="4"/>
</svg>

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -1,20 +0,0 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "0.300",
"blue" : "67",
"green" : "60",
"red" : "60"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

View File

@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "0.600",
"blue" : "213",
"green" : "212",
"red" : "212"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "0.240",
"blue" : "128",
"green" : "118",
"red" : "118"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

View File

@ -162,7 +162,7 @@ tap the link to confirm your account.";
"Scene.Register.Error.Special.PasswordTooShort" = "Password is too short (must be at least 8 characters)"; "Scene.Register.Error.Special.PasswordTooShort" = "Password is too short (must be at least 8 characters)";
"Scene.Register.Error.Special.UsernameInvalid" = "Username must only contain alphanumeric characters and underscores"; "Scene.Register.Error.Special.UsernameInvalid" = "Username must only contain alphanumeric characters and underscores";
"Scene.Register.Error.Special.UsernameTooLong" = "Username is too long (can't be longer than 30 characters)"; "Scene.Register.Error.Special.UsernameTooLong" = "Username is too long (can't be longer than 30 characters)";
"Scene.Register.Input.Avatar.Delete" = "delete"; "Scene.Register.Input.Avatar.Delete" = "Delete";
"Scene.Register.Input.DisplayName.Placeholder" = "display name"; "Scene.Register.Input.DisplayName.Placeholder" = "display name";
"Scene.Register.Input.Email.Placeholder" = "email"; "Scene.Register.Input.Email.Placeholder" = "email";
"Scene.Register.Input.Invite.RegistrationUserInviteRequest" = "Why do you want to join?"; "Scene.Register.Input.Invite.RegistrationUserInviteRequest" = "Why do you want to join?";

View File

@ -0,0 +1,2 @@
"NSCameraUsageDescription" = "Used to take photo for post status";
"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library";

View File

@ -36,6 +36,13 @@ final class MastodonConfirmEmailViewController: UIViewController, NeedsDependenc
label.numberOfLines = 0 label.numberOfLines = 0
return label return label
}() }()
let emailImageView: UIImageView = {
let imageView = UIImageView()
imageView.image = Asset.Asset.email.image
imageView.contentMode = .scaleAspectFit
return imageView
}()
let openEmailButton: UIButton = { let openEmailButton: UIButton = {
let button = UIButton(type: .system) let button = UIButton(type: .system)
@ -66,19 +73,10 @@ final class MastodonConfirmEmailViewController: UIViewController, NeedsDependenc
} }
extension MastodonConfirmEmailViewController { extension MastodonConfirmEmailViewController {
override var preferredStatusBarStyle: UIStatusBarStyle {
return .darkContent
}
override func viewDidLoad() { override func viewDidLoad() {
setupOnboardingAppearance() setupOnboardingAppearance()
// resizedView
let resizedView = UIView()
resizedView.translatesAutoresizingMaskIntoConstraints = false
resizedView.setContentHuggingPriority(.defaultLow, for: .vertical)
// stackView // stackView
let stackView = UIStackView() let stackView = UIStackView()
@ -89,7 +87,9 @@ extension MastodonConfirmEmailViewController {
stackView.isLayoutMarginsRelativeArrangement = true stackView.isLayoutMarginsRelativeArrangement = true
stackView.addArrangedSubview(self.largeTitleLabel) stackView.addArrangedSubview(self.largeTitleLabel)
stackView.addArrangedSubview(self.subtitleLabel) stackView.addArrangedSubview(self.subtitleLabel)
stackView.addArrangedSubview(resizedView) stackView.addArrangedSubview(self.emailImageView)
emailImageView.setContentHuggingPriority(.defaultLow, for: .vertical)
emailImageView.setContentCompressionResistancePriority(.defaultLow, for: .vertical)
stackView.addArrangedSubview(self.openEmailButton) stackView.addArrangedSubview(self.openEmailButton)
stackView.addArrangedSubview(self.dontReceiveButton) stackView.addArrangedSubview(self.dontReceiveButton)
@ -200,3 +200,27 @@ extension MastodonConfirmEmailViewController {
// MARK: - OnboardingViewControllerAppearance // MARK: - OnboardingViewControllerAppearance
extension MastodonConfirmEmailViewController: OnboardingViewControllerAppearance { } extension MastodonConfirmEmailViewController: OnboardingViewControllerAppearance { }
#if canImport(SwiftUI) && DEBUG
import SwiftUI
struct MastodonConfirmEmailViewController_Previews: PreviewProvider {
static var controls: some View {
UIViewControllerPreview {
let viewController = MastodonConfirmEmailViewController()
return viewController
}
.previewLayout(.fixed(width: 375, height: 800))
}
static var previews: some View {
Group {
controls.colorScheme(.light)
controls.colorScheme(.dark)
}
}
}
#endif

View File

@ -22,7 +22,6 @@ final class MastodonPickServerViewController: UIViewController, NeedsDependency
private var expandServerDomainSet = Set<String>() private var expandServerDomainSet = Set<String>()
private let emptyStateView = PickServerEmptyStateView() private let emptyStateView = PickServerEmptyStateView()
private let emptyStateViewHPadding: CGFloat = 4 // UIView's readableContentGuide is 4pt smaller then UITableViewCell's
let tableViewTopPaddingView = UIView() // fix empty state view background display when tableView bounce scrolling let tableViewTopPaddingView = UIView() // fix empty state view background display when tableView bounce scrolling
var tableViewTopPaddingViewHeightLayoutConstraint: NSLayoutConstraint! var tableViewTopPaddingViewHeightLayoutConstraint: NSLayoutConstraint!
@ -57,9 +56,6 @@ final class MastodonPickServerViewController: UIViewController, NeedsDependency
extension MastodonPickServerViewController { extension MastodonPickServerViewController {
override var preferredStatusBarStyle: UIStatusBarStyle {
return .darkContent
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
@ -85,15 +81,6 @@ extension MastodonPickServerViewController {
nextStepButton.heightAnchor.constraint(equalToConstant: MastodonPickServerViewController.actionButtonHeight).priority(.defaultHigh), nextStepButton.heightAnchor.constraint(equalToConstant: MastodonPickServerViewController.actionButtonHeight).priority(.defaultHigh),
view.layoutMarginsGuide.bottomAnchor.constraint(equalTo: nextStepButton.bottomAnchor, constant: WelcomeViewController.viewBottomPaddingHeight), view.layoutMarginsGuide.bottomAnchor.constraint(equalTo: nextStepButton.bottomAnchor, constant: WelcomeViewController.viewBottomPaddingHeight),
]) ])
emptyStateView.translatesAutoresizingMaskIntoConstraints = false
view.addSubview(emptyStateView)
NSLayoutConstraint.activate([
emptyStateView.topAnchor.constraint(equalTo: view.topAnchor),
emptyStateView.leadingAnchor.constraint(equalTo: view.readableContentGuide.leadingAnchor, constant: emptyStateViewHPadding),
emptyStateView.trailingAnchor.constraint(equalTo: view.readableContentGuide.trailingAnchor, constant: -emptyStateViewHPadding),
nextStepButton.topAnchor.constraint(equalTo: emptyStateView.bottomAnchor, constant: 21),
])
// fix AutoLayout warning when observe before view appear // fix AutoLayout warning when observe before view appear
viewModel.viewWillAppear viewModel.viewWillAppear
@ -126,6 +113,16 @@ extension MastodonPickServerViewController {
nextStepButton.topAnchor.constraint(equalTo: tableView.bottomAnchor, constant: 7), nextStepButton.topAnchor.constraint(equalTo: tableView.bottomAnchor, constant: 7),
]) ])
emptyStateView.translatesAutoresizingMaskIntoConstraints = false
view.addSubview(emptyStateView)
NSLayoutConstraint.activate([
emptyStateView.topAnchor.constraint(equalTo: view.topAnchor),
emptyStateView.leadingAnchor.constraint(equalTo: tableView.readableContentGuide.leadingAnchor),
emptyStateView.trailingAnchor.constraint(equalTo: tableView.readableContentGuide.trailingAnchor),
nextStepButton.topAnchor.constraint(equalTo: emptyStateView.bottomAnchor, constant: 21),
])
view.sendSubviewToBack(emptyStateView)
switch viewModel.mode { switch viewModel.mode {
case .signIn: case .signIn:
nextStepButton.setTitle(L10n.Common.Controls.Actions.signIn, for: .normal) nextStepButton.setTitle(L10n.Common.Controls.Actions.signIn, for: .normal)

View File

@ -27,7 +27,7 @@ class PickServerCell: UITableViewCell {
let containerView: UIView = { let containerView: UIView = {
let view = UIView() let view = UIView()
view.layoutMargins = UIEdgeInsets(top: 16, left: 16, bottom: 10, right: 16) view.layoutMargins = UIEdgeInsets(top: 16, left: 16, bottom: 10, right: 16)
view.backgroundColor = Asset.Colors.Background.systemBackground.color view.backgroundColor = Asset.Colors.Background.secondaryGroupedSystemBackground.color
view.translatesAutoresizingMaskIntoConstraints = false view.translatesAutoresizingMaskIntoConstraints = false
return view return view
}() }()

View File

@ -17,7 +17,7 @@ class PickServerSearchCell: UITableViewCell {
private var bgView: UIView = { private var bgView: UIView = {
let view = UIView() let view = UIView()
view.backgroundColor = Asset.Colors.Background.systemBackground.color view.backgroundColor = Asset.Colors.Background.secondaryGroupedSystemBackground.color
view.translatesAutoresizingMaskIntoConstraints = false view.translatesAutoresizingMaskIntoConstraints = false
view.layer.maskedCorners = [ view.layer.maskedCorners = [
.layerMinXMinYCorner, .layerMinXMinYCorner,
@ -30,7 +30,7 @@ class PickServerSearchCell: UITableViewCell {
private var textFieldBgView: UIView = { private var textFieldBgView: UIView = {
let view = UIView() let view = UIView()
view.backgroundColor = Asset.Colors.Background.secondarySystemBackground.color.withAlphaComponent(0.6) view.backgroundColor = Asset.Colors.TextField.background.color
view.translatesAutoresizingMaskIntoConstraints = false view.translatesAutoresizingMaskIntoConstraints = false
view.layer.masksToBounds = true view.layer.masksToBounds = true
view.layer.cornerRadius = 6 view.layer.cornerRadius = 6

View File

@ -48,7 +48,7 @@ extension PickServerCategoryView {
addSubview(bgView) addSubview(bgView)
addSubview(titleLabel) addSubview(titleLabel)
bgView.backgroundColor = Asset.Colors.Background.systemBackground.color bgView.backgroundColor = Asset.Colors.Background.secondaryGroupedSystemBackground.color
NSLayoutConstraint.activate([ NSLayoutConstraint.activate([
bgView.leadingAnchor.constraint(equalTo: self.leadingAnchor), bgView.leadingAnchor.constraint(equalTo: self.leadingAnchor),

View File

@ -32,7 +32,7 @@ extension MastodonRegisterViewController {
} }
children.append(browseAction) children.append(browseAction)
if self.viewModel.avatarImage.value != nil { if self.viewModel.avatarImage.value != nil {
let deleteAction = UIAction(title: L10n.Scene.Register.Input.Avatar.delete, image: UIImage(systemName: "delete.left"), identifier: nil, discoverabilityTitle: nil, attributes: [], state: .off) { [weak self] _ in let deleteAction = UIAction(title: L10n.Scene.Register.Input.Avatar.delete, image: UIImage(systemName: "delete.left"), identifier: nil, discoverabilityTitle: nil, attributes: [.destructive], state: .off) { [weak self] _ in
guard let self = self else { return } guard let self = self else { return }
self.viewModel.avatarImage.value = nil self.viewModel.avatarImage.value = nil
} }

View File

@ -79,9 +79,9 @@ final class MastodonRegisterViewController: UIViewController, NeedsDependency, O
let image = UIImage(systemName: "person.fill.viewfinder", withConfiguration: configuration) let image = UIImage(systemName: "person.fill.viewfinder", withConfiguration: configuration)
button.setImage(image?.withRenderingMode(UIImage.RenderingMode.alwaysTemplate), for: UIControl.State.normal) button.setImage(image?.withRenderingMode(UIImage.RenderingMode.alwaysTemplate), for: UIControl.State.normal)
button.imageView?.tintColor = Asset.Colors.Icon.photo.color button.imageView?.tintColor = Asset.Colors.Label.secondary.color
button.backgroundColor = .white button.backgroundColor = Asset.Colors.Background.secondaryGroupedSystemBackground.color
button.layer.cornerRadius = 45 button.layer.cornerRadius = 10
button.clipsToBounds = true button.clipsToBounds = true
return button return button
@ -93,7 +93,7 @@ final class MastodonRegisterViewController: UIViewController, NeedsDependency, O
let image = Asset.Circles.plusCircleFill.image.withRenderingMode(.alwaysTemplate) let image = Asset.Circles.plusCircleFill.image.withRenderingMode(.alwaysTemplate)
icon.image = image icon.image = image
icon.tintColor = Asset.Colors.Icon.plus.color icon.tintColor = Asset.Colors.Icon.plus.color
icon.backgroundColor = .white icon.backgroundColor = Asset.Colors.Background.systemGroupedBackground.color
return icon return icon
}() }()
@ -109,7 +109,7 @@ final class MastodonRegisterViewController: UIViewController, NeedsDependency, O
textField.autocapitalizationType = .none textField.autocapitalizationType = .none
textField.autocorrectionType = .no textField.autocorrectionType = .no
textField.backgroundColor = .white textField.backgroundColor = Asset.Colors.Background.secondaryGroupedSystemBackground.color
textField.textColor = Asset.Colors.Label.primary.color textField.textColor = Asset.Colors.Label.primary.color
textField.attributedPlaceholder = NSAttributedString(string: L10n.Scene.Register.Input.Username.placeholder, textField.attributedPlaceholder = NSAttributedString(string: L10n.Scene.Register.Input.Username.placeholder,
attributes: [NSAttributedString.Key.foregroundColor: Asset.Colors.Label.secondary.color, attributes: [NSAttributedString.Key.foregroundColor: Asset.Colors.Label.secondary.color,
@ -132,7 +132,7 @@ final class MastodonRegisterViewController: UIViewController, NeedsDependency, O
let textField = UITextField() let textField = UITextField()
textField.autocapitalizationType = .none textField.autocapitalizationType = .none
textField.autocorrectionType = .no textField.autocorrectionType = .no
textField.backgroundColor = .white textField.backgroundColor = Asset.Colors.Background.secondaryGroupedSystemBackground.color
textField.textColor = Asset.Colors.Label.primary.color textField.textColor = Asset.Colors.Label.primary.color
textField.attributedPlaceholder = NSAttributedString(string: L10n.Scene.Register.Input.DisplayName.placeholder, textField.attributedPlaceholder = NSAttributedString(string: L10n.Scene.Register.Input.DisplayName.placeholder,
attributes: [NSAttributedString.Key.foregroundColor: Asset.Colors.Label.secondary.color, attributes: [NSAttributedString.Key.foregroundColor: Asset.Colors.Label.secondary.color,
@ -149,7 +149,7 @@ final class MastodonRegisterViewController: UIViewController, NeedsDependency, O
textField.autocapitalizationType = .none textField.autocapitalizationType = .none
textField.autocorrectionType = .no textField.autocorrectionType = .no
textField.keyboardType = .emailAddress textField.keyboardType = .emailAddress
textField.backgroundColor = .white textField.backgroundColor = Asset.Colors.Background.secondaryGroupedSystemBackground.color
textField.textColor = Asset.Colors.Label.primary.color textField.textColor = Asset.Colors.Label.primary.color
textField.attributedPlaceholder = NSAttributedString(string: L10n.Scene.Register.Input.Email.placeholder, textField.attributedPlaceholder = NSAttributedString(string: L10n.Scene.Register.Input.Email.placeholder,
attributes: [NSAttributedString.Key.foregroundColor: Asset.Colors.Label.secondary.color, attributes: [NSAttributedString.Key.foregroundColor: Asset.Colors.Label.secondary.color,
@ -174,7 +174,7 @@ final class MastodonRegisterViewController: UIViewController, NeedsDependency, O
textField.autocorrectionType = .no textField.autocorrectionType = .no
textField.keyboardType = .asciiCapable textField.keyboardType = .asciiCapable
textField.isSecureTextEntry = true textField.isSecureTextEntry = true
textField.backgroundColor = .white textField.backgroundColor = Asset.Colors.Background.secondaryGroupedSystemBackground.color
textField.textColor = Asset.Colors.Label.primary.color textField.textColor = Asset.Colors.Label.primary.color
textField.attributedPlaceholder = NSAttributedString(string: L10n.Scene.Register.Input.Password.placeholder, textField.attributedPlaceholder = NSAttributedString(string: L10n.Scene.Register.Input.Password.placeholder,
attributes: [NSAttributedString.Key.foregroundColor: Asset.Colors.Label.secondary.color, attributes: [NSAttributedString.Key.foregroundColor: Asset.Colors.Label.secondary.color,
@ -204,7 +204,7 @@ final class MastodonRegisterViewController: UIViewController, NeedsDependency, O
let textField = UITextField() let textField = UITextField()
textField.autocapitalizationType = .none textField.autocapitalizationType = .none
textField.autocorrectionType = .no textField.autocorrectionType = .no
textField.backgroundColor = .white textField.backgroundColor = Asset.Colors.Background.secondaryGroupedSystemBackground.color
textField.textColor = Asset.Colors.Label.primary.color textField.textColor = Asset.Colors.Label.primary.color
textField.attributedPlaceholder = NSAttributedString(string: L10n.Scene.Register.Input.Invite.registrationUserInviteRequest, textField.attributedPlaceholder = NSAttributedString(string: L10n.Scene.Register.Input.Invite.registrationUserInviteRequest,
attributes: [NSAttributedString.Key.foregroundColor: Asset.Colors.Label.secondary.color, attributes: [NSAttributedString.Key.foregroundColor: Asset.Colors.Label.secondary.color,
@ -238,10 +238,6 @@ final class MastodonRegisterViewController: UIViewController, NeedsDependency, O
extension MastodonRegisterViewController { extension MastodonRegisterViewController {
override var preferredStatusBarStyle: UIStatusBarStyle {
return .darkContent
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
@ -336,8 +332,8 @@ extension MastodonRegisterViewController {
]) ])
avatarButton.translatesAutoresizingMaskIntoConstraints = false avatarButton.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([ NSLayoutConstraint.activate([
avatarButton.heightAnchor.constraint(equalToConstant: 90).priority(.defaultHigh), avatarButton.heightAnchor.constraint(equalToConstant: 92).priority(.defaultHigh),
avatarButton.widthAnchor.constraint(equalToConstant: 90).priority(.defaultHigh), avatarButton.widthAnchor.constraint(equalToConstant: 92).priority(.defaultHigh),
avatarButton.centerXAnchor.constraint(equalTo: avatarView.centerXAnchor), avatarButton.centerXAnchor.constraint(equalTo: avatarView.centerXAnchor),
avatarButton.centerYAnchor.constraint(equalTo: avatarView.centerYAnchor), avatarButton.centerYAnchor.constraint(equalTo: avatarView.centerYAnchor),
]) ])
@ -345,8 +341,8 @@ extension MastodonRegisterViewController {
plusIconImageView.translatesAutoresizingMaskIntoConstraints = false plusIconImageView.translatesAutoresizingMaskIntoConstraints = false
avatarView.addSubview(plusIconImageView) avatarView.addSubview(plusIconImageView)
NSLayoutConstraint.activate([ NSLayoutConstraint.activate([
plusIconImageView.trailingAnchor.constraint(equalTo: avatarButton.trailingAnchor), plusIconImageView.centerXAnchor.constraint(equalTo: avatarButton.trailingAnchor),
plusIconImageView.bottomAnchor.constraint(equalTo: avatarButton.bottomAnchor), plusIconImageView.centerYAnchor.constraint(equalTo: avatarButton.bottomAnchor),
]) ])
// textfield // textfield
@ -360,6 +356,14 @@ extension MastodonRegisterViewController {
// password // password
stackView.setCustomSpacing(6, after: passwordTextField) stackView.setCustomSpacing(6, after: passwordTextField)
stackView.setCustomSpacing(32, after: passwordCheckLabel) stackView.setCustomSpacing(32, after: passwordCheckLabel)
//return
if viewModel.approvalRequired {
passwordTextField.returnKeyType = .continue
} else {
passwordTextField.returnKeyType = .done
}
reasonTextField.returnKeyType = .done
// button // button
stackView.addArrangedSubview(buttonContainer) stackView.addArrangedSubview(buttonContainer)
@ -619,6 +623,28 @@ extension MastodonRegisterViewController: UITextFieldDelegate {
} }
} }
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
switch textField {
case usernameTextField:
displayNameTextField.becomeFirstResponder()
case displayNameTextField:
emailTextField.becomeFirstResponder()
case emailTextField:
passwordTextField.becomeFirstResponder()
case passwordTextField:
if viewModel.approvalRequired {
reasonTextField.becomeFirstResponder()
} else {
passwordTextField.resignFirstResponder()
}
case reasonTextField:
reasonTextField.resignFirstResponder()
default:
break
}
return true
}
func showShadowWithColor(color: UIColor, textField: UITextField) { func showShadowWithColor(color: UIColor, textField: UITextField) {
// To apply Shadow // To apply Shadow
textField.layer.shadowOpacity = 1 textField.layer.shadowOpacity = 1

View File

@ -41,13 +41,9 @@ final class MastodonResendEmailViewController: UIViewController, NeedsDependency
extension MastodonResendEmailViewController { extension MastodonResendEmailViewController {
override var preferredStatusBarStyle: UIStatusBarStyle {
return .darkContent
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
setupOnboardingAppearance()
navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(MastodonResendEmailViewController.cancelBarButtonItemPressed(_:))) navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(MastodonResendEmailViewController.cancelBarButtonItemPressed(_:)))
webView.translatesAutoresizingMaskIntoConstraints = false webView.translatesAutoresizingMaskIntoConstraints = false
@ -72,3 +68,6 @@ extension MastodonResendEmailViewController {
dismiss(animated: true, completion: nil) dismiss(animated: true, completion: nil)
} }
} }
// MARK: - OnboardingViewControllerAppearance
extension MastodonResendEmailViewController: OnboardingViewControllerAppearance { }

View File

@ -48,7 +48,7 @@ final class MastodonServerRulesViewController: UIViewController, NeedsDependency
let bottomContainerView: UIView = { let bottomContainerView: UIView = {
let view = UIView() let view = UIView()
view.backgroundColor = Asset.Colors.Background.onboardingBackground.color view.backgroundColor = Asset.Colors.Background.systemGroupedBackground.color
return view return view
}() }()
@ -58,7 +58,8 @@ final class MastodonServerRulesViewController: UIViewController, NeedsDependency
textView.textColor = .label textView.textColor = .label
textView.isSelectable = true textView.isSelectable = true
textView.isEditable = false textView.isEditable = false
textView.backgroundColor = Asset.Colors.Background.onboardingBackground.color textView.isScrollEnabled = false
textView.backgroundColor = Asset.Colors.Background.systemGroupedBackground.color
return textView return textView
}() }()
@ -85,10 +86,6 @@ final class MastodonServerRulesViewController: UIViewController, NeedsDependency
extension MastodonServerRulesViewController { extension MastodonServerRulesViewController {
override var preferredStatusBarStyle: UIStatusBarStyle {
return .darkContent
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
@ -124,7 +121,6 @@ extension MastodonServerRulesViewController {
bottomPromptTextView.frameLayoutGuide.topAnchor.constraint(equalTo: bottomContainerView.topAnchor, constant: 20), bottomPromptTextView.frameLayoutGuide.topAnchor.constraint(equalTo: bottomContainerView.topAnchor, constant: 20),
bottomPromptTextView.frameLayoutGuide.leadingAnchor.constraint(equalTo: bottomContainerView.readableContentGuide.leadingAnchor), bottomPromptTextView.frameLayoutGuide.leadingAnchor.constraint(equalTo: bottomContainerView.readableContentGuide.leadingAnchor),
bottomPromptTextView.frameLayoutGuide.trailingAnchor.constraint(equalTo: bottomContainerView.readableContentGuide.trailingAnchor), bottomPromptTextView.frameLayoutGuide.trailingAnchor.constraint(equalTo: bottomContainerView.readableContentGuide.trailingAnchor),
bottomPromptTextView.frameLayoutGuide.heightAnchor.constraint(equalToConstant: 50),
confirmButton.topAnchor.constraint(equalTo: bottomPromptTextView.frameLayoutGuide.bottomAnchor, constant: 20), confirmButton.topAnchor.constraint(equalTo: bottomPromptTextView.frameLayoutGuide.bottomAnchor, constant: 20),
]) ])

View File

@ -20,8 +20,7 @@ extension OnboardingViewControllerAppearance {
static var viewBottomPaddingHeight: CGFloat { return 11 } static var viewBottomPaddingHeight: CGFloat { return 11 }
func setupOnboardingAppearance() { func setupOnboardingAppearance() {
overrideUserInterfaceStyle = .light view.backgroundColor = Asset.Colors.Background.systemGroupedBackground.color
view.backgroundColor = Asset.Colors.Background.onboardingBackground.color
setupNavigationBarAppearance() setupNavigationBarAppearance()
@ -43,7 +42,7 @@ extension OnboardingViewControllerAppearance {
func setupNavigationBarBackgroundView() { func setupNavigationBarBackgroundView() {
let navigationBarBackgroundView: UIView = { let navigationBarBackgroundView: UIView = {
let view = UIView() let view = UIView()
view.backgroundColor = Asset.Colors.Background.onboardingBackground.color view.backgroundColor = Asset.Colors.Background.systemGroupedBackground.color
return view return view
}() }()

View File

@ -64,10 +64,6 @@ final class WelcomeViewController: UIViewController, NeedsDependency {
extension WelcomeViewController { extension WelcomeViewController {
override var preferredStatusBarStyle: UIStatusBarStyle {
return .darkContent
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()

View File

@ -38,9 +38,8 @@ extension PrimaryActionButton {
private func _init() { private func _init() {
titleLabel?.font = UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 17, weight: .semibold)) titleLabel?.font = UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 17, weight: .semibold))
setTitleColor(.white, for: .normal) setTitleColor(.white, for: .normal)
setBackgroundImage(UIImage.placeholder(color: Asset.Colors.Button.normal.color), for: .normal) setBackgroundImage(UIImage.placeholder(color: Asset.Colors.brandBlue.color), for: .normal)
setBackgroundImage(UIImage.placeholder(color: Asset.Colors.Button.normal.color.withAlphaComponent(0.5)), for: .highlighted) setupButtonBackground()
setBackgroundImage(UIImage.placeholder(color: Asset.Colors.Button.disabled.color), for: .disabled)
applyCornerRadius(radius: 10) applyCornerRadius(radius: 10)
} }
@ -68,4 +67,21 @@ extension PrimaryActionButton {
isEnabled = true isEnabled = true
self.setTitle(originalButtonTitle, for: .disabled) self.setTitle(originalButtonTitle, for: .disabled)
} }
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
setupButtonBackground()
}
func setupButtonBackground() {
if UIScreen.main.traitCollection.userInterfaceStyle == .light {
setTitleColor(.white, for: .disabled)
setBackgroundImage(UIImage.placeholder(color: Asset.Colors.Button.normal.color.withAlphaComponent(0.5)), for: .highlighted)
setBackgroundImage(UIImage.placeholder(color: Asset.Colors.Button.disabled.color), for: .disabled)
} else {
setTitleColor(UIColor.white.withAlphaComponent(0.5), for: .disabled)
setBackgroundImage(UIImage.placeholder(color: Asset.Colors.brandBlue.color.withAlphaComponent(0.5)), for: .highlighted)
setBackgroundImage(UIImage.placeholder(color: Asset.Colors.brandBlue.color.withAlphaComponent(0.5)), for: .disabled)
}
}
} }