From 45fc351565dad670f36930c68d8823a072231fdd Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Sun, 9 Nov 2014 19:05:55 -0600 Subject: [PATCH 01/16] Adjusted widths on username/view # elements in website galleries --- sass/_project-sass/_project-Website-Gallery.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sass/_project-sass/_project-Website-Gallery.scss b/sass/_project-sass/_project-Website-Gallery.scss index 740c76da..af76366b 100644 --- a/sass/_project-sass/_project-Website-Gallery.scss +++ b/sass/_project-sass/_project-Website-Gallery.scss @@ -29,12 +29,12 @@ .username { float: left; overflow: hidden; - width: 70%; + width: 63%; } .site-stats { float: right; overflow: hidden; - width: 28%; + width: 35%; text-align: right; } .site-tags { From 576561956e584954e08cbfa8c2cdd8969fe5178a Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Sun, 9 Nov 2014 19:33:17 -0600 Subject: [PATCH 02/16] Improvements to format_large_number --- ext/numeric.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ext/numeric.rb b/ext/numeric.rb index c433c91b..99ab1f6f 100644 --- a/ext/numeric.rb +++ b/ext/numeric.rb @@ -21,13 +21,15 @@ class Numeric end end - def format_large_numbers + def format_large_number if self > 999999999 - return sprintf "%.2fB", (self/1000000000.0) + return sprintf "%.1fB", (self/1000000000.0) elsif self > 999999 - return sprintf "%.2fM", (self/1000000.0) + return sprintf "%.1fM", (self/1000000.0) + elsif self > 9999 + return sprintf "%.1fK", (self/1000.0) elsif self > 999 - return sprintf "%.2fK", (self/1000.0) + return self.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse else return self end From b7cc13b9c61861f3d95cffc62e0cd75cdee9b6b2 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Sun, 9 Nov 2014 20:01:07 -0600 Subject: [PATCH 03/16] format_large_number now removes trailing zero --- ext/numeric.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/numeric.rb b/ext/numeric.rb index 99ab1f6f..ee38d540 100644 --- a/ext/numeric.rb +++ b/ext/numeric.rb @@ -23,11 +23,11 @@ class Numeric def format_large_number if self > 999999999 - return sprintf "%.1fB", (self/1000000000.0) + return sprintf "%.3gB", (self/1000000000.0) elsif self > 999999 - return sprintf "%.1fM", (self/1000000.0) + return sprintf "%.3gM", (self/1000000.0) elsif self > 9999 - return sprintf "%.1fK", (self/1000.0) + return sprintf "%.3gK", (self/1000.0) elsif self > 999 return self.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse else From 0b22717fc17ca2487d0f3860ceea2599f654fed7 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Sun, 9 Nov 2014 21:39:40 -0600 Subject: [PATCH 04/16] Improved format_large_number that rounds to one decimal place but doesn't include tenths place if it's a zero --- ext/numeric.rb | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/ext/numeric.rb b/ext/numeric.rb index ee38d540..2dc74eef 100644 --- a/ext/numeric.rb +++ b/ext/numeric.rb @@ -22,16 +22,32 @@ class Numeric end def format_large_number - if self > 999999999 - return sprintf "%.3gB", (self/1000000000.0) - elsif self > 999999 - return sprintf "%.3gM", (self/1000000.0) - elsif self > 9999 - return sprintf "%.3gK", (self/1000.0) - elsif self > 999 - return self.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse + if self > 9999 + if self > 999999999 + unit_char = 'B' #billion + unit_amount = 1000000000.0 + elsif self > 999999 + unit_char = 'M' #million + unit_amount = 1000000.0 + elsif self > 9999 + unit_char = 'K' #thousand + unit_amount = 1000.0 + end + + self_divided = self.to_f / unit_amount + self_rounded = self_divided.round(1) + + if self_rounded.denominator == 1 + return sprintf ("%.0f" + unit_char), self_divided + else + return sprintf ("%.1f" + unit_char), self_divided + end else - return self + if self > 999 + return self.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse + else + return self + end end end From f3ee315336d8deed956099b4d69f724d9c975b5d Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Sun, 9 Nov 2014 21:45:41 -0600 Subject: [PATCH 05/16] Removed random whitespace --- views/home.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/home.erb b/views/home.erb index 5197f1fc..7056bec9 100644 --- a/views/home.erb +++ b/views/home.erb @@ -62,7 +62,7 @@
- <%= suggested_site .username %> + <%= suggested_site.username %>
From 5dcac62bf29fb379f8a4c9a31afc051a5d5975c5 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Sun, 9 Nov 2014 22:46:11 -0600 Subject: [PATCH 06/16] Style improvements to profile header --- sass/_project-sass/_project-Main.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 00ec5ac1..6f1f0c54 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -721,14 +721,14 @@ a.tag:hover { margin-left: 0; } .interior .header-Outro .stats { - margin-bottom: 1.2em; + margin-bottom: 1.3em; float: left; width: 100%; - margin-top: 2em; + margin-top: 1.9em; } .interior .header-Outro .stats strong { font-size: 1.5em; - font-weight: bold; + font-weight: normal; color: #DAEEA5; } .interior .header-Outro .stats span { @@ -739,8 +739,9 @@ a.tag:hover { } .interior .header-Outro .stats .stat { float: left; - width: 90px; text-align: center; + margin-right: 28px; + color: #84997E; } .interior .header-Outro .stats .stat.tips { width: 60px; @@ -850,6 +851,7 @@ a.tag:hover { .title-with-badge { float: left; width: 100%; + margin-bottom: 3px; } .title-with-badge span { float: left; From d7ec37b13bdd3333bcc9062da8ed5bf9b452e51f Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Sun, 9 Nov 2014 22:49:53 -0600 Subject: [PATCH 07/16] Added format_large_number to hit/view/follower counts, removed hits_english/views_english --- models/site.rb | 8 -------- views/browse.erb | 4 ++-- views/home.erb | 8 ++++---- views/site.erb | 10 +++++----- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/models/site.rb b/models/site.rb index 3c9e1dd9..5363623e 100644 --- a/models/site.rb +++ b/models/site.rb @@ -912,14 +912,6 @@ class Site < Sequel::Model end end - def hits_english - values[:hits].to_s.reverse.gsub(/...(?=.)/,'\&,').reverse - end - - def views_english - values[:views].to_s.reverse.gsub(/...(?=.)/,'\&,').reverse - end - def screenshots_delete(path) SCREENSHOT_RESOLUTIONS.each do |res| begin diff --git a/views/browse.erb b/views/browse.erb index 2061152b..4363a15e 100644 --- a/views/browse.erb +++ b/views/browse.erb @@ -80,9 +80,9 @@
<% if params[:sort_by] == 'hits' %> - <%= site.hits %> hit<%= site.hits == 1 ? '' : 's' %> + <%= site.hits.format_large_number %> hit<%= site.hits == 1 ? '' : 's' %> <% else %> - <%= site.views %> view<%= site.views == 1 ? '' : 's' %> + <%= site.views.format_large_number %> view<%= site.views == 1 ? '' : 's' %> <% end %>
diff --git a/views/home.erb b/views/home.erb index 7056bec9..87a82cbc 100644 --- a/views/home.erb +++ b/views/home.erb @@ -67,7 +67,7 @@
- <%= suggested_site.views %> view<%= suggested_site.views == 1 ? '' : 's' %> + <%= suggested_site.views.format_large_number %> view<%= suggested_site.views == 1 ? '' : 's' %>
@@ -97,9 +97,9 @@ <% end %>
-
<%= site.views_english %> unique views
-
<%= site.hits_english %> hits
-
<%= site.follows_dataset.count %> followers
+
<%= site.views.format_large_number %> unique views
+
<%= site.hits.format_large_number %> hits
+
<%= site.follows_dataset.count.format_large_number %> followers
diff --git a/views/site.erb b/views/site.erb index 34840dee..944ab6b1 100644 --- a/views/site.erb +++ b/views/site.erb @@ -22,9 +22,9 @@

<%= site.title %> <% if site.supporter? %> <% end %>

<%= site.host %>

-
<%= site.views_english %> views
-
<%= site.hits_english %> hits
-
<%= site.follows_dataset.count %> followers
+
<%= site.views.format_large_number %> views
+
<%= site.hits.format_large_number %> hits
+
<%= site.follows_dataset.count.format_large_number %> followers
@@ -107,8 +107,8 @@ <% end %>
-
Number of updates<%= site.changed_count %>
-
Created<%= site.created_at.strftime('%B %-d, %Y') %>
+
Number of updates<%= site.changed_count.format_large_number %>
+
Created<%= site.created_at.strftime('%b %-d, %Y') %>
<%== erb :'_follows', layout: false, locals: {site: site, is_current_site: site == current_site} %> From be77ae26e6af60b710d7e3d6b44466a0e2cb7f7e Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Sun, 9 Nov 2014 23:10:38 -0600 Subject: [PATCH 08/16] Added high-res supporter badge, adjusted styles --- public/img/supporter.png | Bin 3052 -> 7645 bytes sass/_project-sass/_project-Main.scss | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/public/img/supporter.png b/public/img/supporter.png index a2d0f47bc2e4d61dff0fb9336d602dc8a1c80966..796f3b4cc1ed3c8a713e9550ea4f06d6b7c565f1 100644 GIT binary patch literal 7645 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 Dt^);h delta 2977 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 Date: Sun, 9 Nov 2014 23:17:41 -0600 Subject: [PATCH 09/16] Fixed supporter badge positioning next to long site titles --- sass/_project-sass/_project-Main.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 5312a1e2..e62afc23 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -846,7 +846,6 @@ a.tag:hover { height: 24px; background-size: 99px; display: inline-block; - margin-top: 7px; } .title-with-badge { float: left; @@ -854,8 +853,7 @@ a.tag:hover { margin-bottom: 3px; } .title-with-badge span { - float: left; - margin-right: 10px; + margin-right: 5px; } .section { padding: 55px 8%; From a829c064e7480aa381680b0cb958e24ae2a07019 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 10 Nov 2014 00:13:43 -0600 Subject: [PATCH 10/16] First attempt at adding some embellishment to Support Us link --- sass/_project-sass/_project-Header.scss | 27 ++++++++++++++++++++++++- views/_header.erb | 2 +- views/index.erb | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/sass/_project-sass/_project-Header.scss b/sass/_project-sass/_project-Header.scss index 1f07dcc9..11f7da92 100644 --- a/sass/_project-sass/_project-Header.scss +++ b/sass/_project-sass/_project-Header.scss @@ -258,8 +258,33 @@ @media (max-device-width:480px), screen and (max-width:800px){ display:block; } + + >.fa-heart { + vertical-align: .5em; + margin-left: .3em; + font-size: 9px; + position: relative; + color: rgba(255, 255, 255, 0.4); + + >.fa-heart { + display:none; + } + } - &:hover{background:#528995; text-decoration:underline} + &:hover{ + background:#528995; text-decoration:underline; + >.fa-heart { + color: rgba(255, 255, 255, 1); + >.fa-heart { + color: $c-Brand-1; + position: absolute; + left: 2px; + top: .25em; + font-size: 7px; + display: inline; + } + } + } &.selected, &:active{background:#528995; text-decoration:underline} } diff --git a/views/_header.erb b/views/_header.erb index a1f51821..61fa7a08 100644 --- a/views/_header.erb +++ b/views/_header.erb @@ -20,7 +20,7 @@ API
  • - Support Us + Support Us
    • diff --git a/views/index.erb b/views/index.erb index 311d6cc1..7100e34a 100644 --- a/views/index.erb +++ b/views/index.erb @@ -65,7 +65,7 @@ API
  • - Support Us + Support Us
    • From c2b661ae0cc67faaaf027087561e07383ac84bf6 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 10 Nov 2014 13:16:49 -0600 Subject: [PATCH 11/16] Adjustments to Support Us heart --- sass/_project-sass/_project-Header.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sass/_project-sass/_project-Header.scss b/sass/_project-sass/_project-Header.scss index 11f7da92..e4450bea 100644 --- a/sass/_project-sass/_project-Header.scss +++ b/sass/_project-sass/_project-Header.scss @@ -278,9 +278,9 @@ >.fa-heart { color: $c-Brand-1; position: absolute; - left: 2px; - top: .25em; - font-size: 7px; + left: 1.6pt; + top: 1.2pt; + font-size: 5pt; display: inline; } } From 1c03e2bdfe61038f88e648aeb6c2996b844a537c Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 10 Nov 2014 13:17:13 -0600 Subject: [PATCH 12/16] Removed titles from navigation links - they seem redundant and distracting --- views/_footer.erb | 14 +++++++------- views/_header.erb | 14 +++++++------- views/index.erb | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/views/_footer.erb b/views/_footer.erb index abfb6597..f2988666 100644 --- a/views/_footer.erb +++ b/views/_footer.erb @@ -8,13 +8,13 @@ diff --git a/views/_header.erb b/views/_header.erb index 61fa7a08..6e8e609a 100644 --- a/views/_header.erb +++ b/views/_header.erb @@ -8,29 +8,29 @@
      <% if !signed_in? %>
    • - Sign up for Free + Sign up for Free
    • - +
      • <% else %>
    • diff --git a/views/index.erb b/views/index.erb index 7100e34a..45faec32 100644 --- a/views/index.erb +++ b/views/index.erb @@ -50,22 +50,22 @@ @@ -73,7 +73,7 @@ <% if !signed_in? %>
    • - +
      • <% else %>
    • From e7955b77dc517b37d24d4bb5cf35dbc68d662f94 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 10 Nov 2014 13:37:23 -0600 Subject: [PATCH 13/16] Link commenter icons to their profile --- views/_news.erb | 2 +- views/_news_profile_comment.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/views/_news.erb b/views/_news.erb index ab64dbb9..f0080ec1 100644 --- a/views/_news.erb +++ b/views/_news.erb @@ -90,7 +90,7 @@ <% event.comments.each do |comment| %> <% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username, :stripe_customer_id).first %>
      - + <% if comment_actioning_site.supporter? %><% end %><%= comment_actioning_site.username %> <%= comment.created_at.ago %> diff --git a/views/_news_profile_comment.erb b/views/_news_profile_comment.erb index 33040be9..845448ec 100644 --- a/views/_news_profile_comment.erb +++ b/views/_news_profile_comment.erb @@ -2,7 +2,7 @@ <% site = profile_comment.site_dataset.select(:id, :username, :stripe_customer_id).first %>
      -
      + <% if current_site && current_site.id == actioning_site.id %> You From b636eedbccacadd720997fc3bb7ddc1e420c60a5 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 10 Nov 2014 14:48:30 -0600 Subject: [PATCH 14/16] Added follow button behavior from site profile to surf bar --- views/surf.erb | 55 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/views/surf.erb b/views/surf.erb index fc6bcd3a..bb2be59b 100644 --- a/views/surf.erb +++ b/views/surf.erb @@ -137,6 +137,37 @@ display:none!important; visibility:hidden } + #followLink .follow { + display: inline; + } + #followLink .following { + display: none; + } + #followLink .unfollow { + display: none; + } + #followLink.is-following { + width: 6em; + display: block; + } + #followLink.is-following .follow { + display: none; + } + #followLink.is-following .following { + display: inline; + } + #followLink.is-following .unfollow { + display: none; + } + #followLink.is-following.unfollow .follow { + display: none; + } + #followLink.is-following.unfollow .following { + display: none; + } + #followLink.is-following.unfollow .unfollow { + display: inline; + } @@ -182,12 +213,10 @@ <% if current_site && current_site != @site %>
    • - - <% if current_site.is_following? @site %> - Unfollow - <% else %> - Follow - <% end %> + + Unfollow + Following +
      • <% end %> @@ -230,15 +259,25 @@ e.target.form.submit() }) + var link = $('a#followLink'); + function toggleFollow(id) { $.post('/site/'+id+'/toggle_follow', {csrf_token: '<%= csrf_token %>'}, function(res) { if(res.result == 'followed') - $('#followLink').html(' Unfollow') + link.addClass('is-following') if(res.result == 'unfollowed') - $('#followLink').html(' Follow') + link.removeClass('is-following') }) } + + link.hover(function() { + if (link.hasClass('is-following')) { + link.addClass('unfollow'); + } + }, function() { + link.removeClass('unfollow'); + }); \ No newline at end of file From b85e8ceb9e0640e01c6694d78b962b020268ff43 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 10 Nov 2014 20:02:27 -0600 Subject: [PATCH 15/16] Misc changes to brand assets --- public/img/neocitieslogo.png | Bin 0 -> 39344 bytes public/img/neocitieslogo.svg | 1607 ++++++++++++++++++++++++++---- public/img/neocitieslogotext.svg | 1477 --------------------------- views/press.erb | 8 +- 4 files changed, 1390 insertions(+), 1702 deletions(-) create mode 100644 public/img/neocitieslogo.png delete mode 100644 public/img/neocitieslogotext.svg diff --git a/public/img/neocitieslogo.png b/public/img/neocitieslogo.png new file mode 100644 index 0000000000000000000000000000000000000000..0333a272a521e27a2a6fc2ecdcaae8d25aa70e56 GIT binary patch literal 39344 zcmeENWm8*Sv<8a1Q#^#=THH0byHi{XMM{f1#VxoM2<~2>IECT`3PB4LinK^^w|n0E z8}7%OnG7?B%;ei4I)3ZHsgT{$P11 zn|LE35m^8CMy`~ua0V_?zEd!Mr}x(3-3Mzgdn8%Aw>I`56*p@~dtG~LJ3r4cdkG|@ z97z?ZtiJEcVGvd}>F`?c)H=>Y(?k%rFnc479O_pFWReJ){fZD-=xNLi8d(goLTn5X zyogBKmQX4|Q9p)ghfu{v`?UXsQI@>yzW^O8>t*|foZIVFbskAc0|Y`+l3%jrQc6p@ zOI&z?4Qo2emLV(QMO5~9Gh<27(5WXz4H}W z9I=&SKQmPYE-QEJEgaAAAMPDW&yIAD*m2LKC2n|3L7J5R_n(dic6_aJteSlrN0D2_ z51IiD8#3IS@YIx)Auy5AbcK=?f=d;bu3+U92NsQ3TnnUa>q~20#HW*3>Ir_lThr6k z^?D5Mt7vV#SpA4cU2mNd%X8ADRZW3~73-UglxU`FrH228Z9KDj^~XCiF-QJht$RsC zW1046yR~v@x}y)jUv-`OQ#Dwxe0EzED-i$iFWIu;Lt!CG;q-_7(NxBgjOzvbH*M)$ zj2@4=K8ws_WqUjfWbu)K(rEL;enArl)U@xGtrSwN%=U zB$;8ZzLrt0tcu=sJmp{4;_RkV%YYNBTU&1y9UdNfR#jE~hQ2RNnHVDHGUdd{k1(n* z4g7Mj!}vphnITpIjIS=ZqPlv1)V{I%{?Cjx)YNoECW>CMJjr)|W-8KMMZWKA z63~jh)2cD7vz#M};gR8!da+3e*0A-GnNS05%E?s;)#ZzNJDAs*wtZtGdG0r+DS`)M zlk$lrZjkZa8SBXPrm<+bbMo*+W3yXT((>Z_J0CK|Gqns5C3e*JGP z;C0vgqjk&_m5e0g1on?g<-o2XCSoEhd3=3dSV}=b@k}Qa+&7_PU~pL{#}_hk`gHP@ zAd79}6XlY?>&V^d;#-f4UTOl{7Jo^>zU22@bEICqb5-Y$z^59Fu9o$eso2dV?Q7(@ zZ!CYHY~(>p`xNBlz>1~t53Dtj%>mc{3fa;wg`Y&C!{`>=6Dm7Q=2O_Tkz*{vw}`xR>*h#wBW31Lkia-uiEug_@LORp7-gFa!hh)>Mc~N*#^iIG^PJ+^7TP$pr>wH_PusNg zbKud*=GW`gUzq&##nHkT7G_bU?qlD-TSEMg>N|I-yzVakraZIlN11yLla=3VCtYuh zU$1F=SBf!UH&gia!EG*@fyE!QS;+(U<+BpUh4W-P%>Eq&GO0gaZ_&lAXLvwwVzFr( zl}L73sZ)~R2bpx6DUyB4;di_{KR^GiIF>K|!95W!5v=xI$pV2_iB$4hvCn=mn(<4B zx%|4|*GsbDytlo6@n<<#+uhS;SXl3OU735JMqKa=@CAZ_Pw4IX&szWx`Xu}>{_x=7 z;4};!18C8mkbS>y9wJ$0lNyt&db=n6oFn;WsgV+RT^ld|?G3sgElHMAwG6)9X~gFi z7B;eowJo#k3w{J4&Ve%+Lx@t(4I2*0% zpZJFRVgB;Y)xlxcI5jAVUfS}HSX^~xTwL7OzkmPAr@x-?sV;+=k9wanH@a*xT@k}; zhChEeUjHX5D(dI#>|8mrASo)^NzGA#*{K&#&P65UxizE*;EZjhQI#pgB|-Jo$`k+L zc9~4Ej9W}~nv>gF*9W5@l4*%^b^UZgxxkRSzZJl?`4#pVSwUO6$YDP#J)M(eEqS)k zru+hWdb?LBT^U&ZLiBj@ZSfmClo2Dd_Wgy1RuYShik`~_GY!o`sh|q@B%EU}YUQ{)bCi0z{;cvFd z@sg2|VSrWGmrg`=0?)=+FbDsXzHu9kVtu92W(Vnqj#d-b5sx?7js#czOf%42cT_0r zeF<{rB5HI0<-cF@57Ma&Nw>%;*ZpBsYdnj}Ate4Hmi#FflX_A$6+%TfD98jX-1zwT zT;J1W0}oDRW@Z@HE0)F|LYk4EL;`mcHT^QQzkiYpP%0hV$?$9y^x)EwtMKd}GG3Hf zV1pS$h^G$8(naYtHL=xScXoDSDX|N*P>%9b^-{L{;c*Lavf~fwnY7z~mQjb_-26^< zMAgR$lr=S!(r6n>6IB;q0A+annJJbsFfbs}+BfK}q3ukGS;@AsNf>cuXOLw|2W5mu zcbArKpL#I&duY7woci$?!Cgn)Ivg>kF2FF$UX%h&vYvJ8e1b9c=zCcc6-V*@{W|Wb zt%RHOut0+#Cg>&4JSIfbJx<8nnve2s$7iLeBfGs@o$5QAE_mQ)X}#DGgQwn!nyE5!m@sj474E^{@cDem zOC4{xBKs0P&!lZNImgIn|I2;0?QX``4W|2PI7Bv85Rp8I`oL&Sic5j7&Gr-Six$)5 z$juAtHaYH0Z}m4P1nR^LJU-;Tw&MIc7Jc#cVCoQf(?u7HFM^DMVnYu&Xrqq=5>bk+&VKfV^p#Cp+h7zY&@Ye9k|30K zXZz@g!59j+DN4uglxJefyKifP_1othdtNbQ-=6QK0Tq_r`_?zv-|klONZxYeSx>Zc zd%$geI)+)@(7=F^iQDSui8L6@s~~Uz zIP+ai-#h*NQTAcObA&bzWwAlRLxaO7uXi)owcZhyFVBRkfui!Z_txRPg2HfIZEdZe zp$b|AZp5F@tL`o8?7)^A!%*Y)%-0XS^Uw&i-=)Wxo8=mGM0Yh81mPB@{*(B`mucR9?-)pTk+Wlr-OvF&H=< z^XcMpFq%Gilm) z7nLIqg_SPO%gsA60}&XDj1*^*38_}@2mHjkD^J^FY3&PjW*?gV;Cr}vB-ctDnD&T~ z3=i&q{q32j3hYwr&o+AW>tq~;+x-{zWvxAmth{KGxq=f5$g*5k#2=l9#3Bd(COospNe97O+G1I)gL)e=zlzjC2QJ6`i4!3ObE^v|H3rp z>Za-9OQ0N6W(qC1;dlJrE$29>Qmmfjo{d|z+n`sWiPcWu-xGS)cwd{h8OW}7d1;dx ze-O9>fT@!MZ*nuSyT_W(VqLqNpkS1RLislkTnR@WBoyavd zCH)rkK>IbI*&x1hdJi7YeTRnS_GZ}CbSHM8g|0bUSJ^%v4zVN^4BE7m(OC&o=8gRK zGEIfXKp<1c8m2CXP64<2)!1rtM~vrfkDSKA?5Tqx$?QouIZ+dWt0T^9uR*suuR}sL zX`!uxV=4aabrnDS+hnLWQKEWFcvIG13dP&Ewtx9+&f`b_>|M_sr$x>D2G;NO=>P`( z1N6HRzq9=%5u#KfdYC;|MT^t_JgZT6_JQp^g|?XB;P6)h>A*dJ2lO)TF&?O@IF(wU zbt?H!ak6ZRT}H^Z4@Y{5*RWojPDYjhFth+;C4QrUyn>5vqa-{5@UvH6+mkcOwXru^Qh%r^q&78jbm^yig z$b>_Babj~hWfV38{4|5g&v2mS%ZZS=nJ=q$m@}Gz}V0_W5tSG5qc~~E`@??jPE;jY!f}-7;qCRsd4q~cqm=pR@Guz^EwKkZ z7?BCdMiu(DqWwGFcHI#JZ5z^|KQ$&>ZaCcC%a*RG!# zSz;`3UNmwd{E9FMfK?+xb)WR_NwngT8F9N>etQKUI78SB*JJACFg*p%bQ`xuA`jDJ z}O2qLQxS#qKzK+^Ey~ZEkP?Ix02sG~{lJHF$D3Z-O7zZ1ZNKU;&+ZjBI7m?+@ z!B62E&B^Mh8c|eeyU4rjq1v%mYrC+LCdcHWkew^nXaF4^-aAFo=^ccu`TkDiVFs9c z>>-ls@L?xL)z5q~^@sbK@$6#?&!1VDnVH%#UyXxSoQS>A#()JgDb;nu)=pQQzB*d% zqfpTufW~Kho=Y_`oH777VL60_**{ZtD>a^^TqK2GS$$pt{W5%JbGatT^r@Z*U*yCZ zKaby0lZE&v=Y+ft&ydwwY`Uq67*MT6t*xz_a?{f{r{&8R0=mff9x)1|`0u4?mbG#k z5}98u$`Y$hfiqm9%PMu7NN&*zU(ifvJC#@@MF~^RjSj0+^ip;@;Rms(d*=EjP!yD7 zjBjqVy(=s`{zX<6X`(DpxN~>VKrcJ_$eH?n*GT$VBUgZ^8WILVYx&7ZUL_KiNG5tBhnqHo_8UB$t-q5)7s1AjvR0PYd#sZ^QDGI zDu{wh43FqNc;9}xg2kXuO{ePS1Htx<33O6a29Pq)iGn*`#rAJ2ANcPtx4ABY6cq3X zO|)|mRsrx}@zqkW-1zv*%d{CxUTM#!w+g_I1f>W$ zEr%1KtMXY!Kr`XRWmm57TPZ`kAHp2%;VE0OK4vRYyhJuCs;Yd%Sc!pU=ayiXQaRk+ zD2T$3y`NqaTyjB7+ECq6n|gG0r_}wdEdh^&)6Sc#Zw#p+L~;OtT~9P;hbiVE)_4zTsGa`1dKX$vo?B-nU}&#FIEVlWA* z#Dad2FaeS|#FVjb#~x`2Z1F3}RMwXw9Ci9GQGantiH~9$JVK$WrgjG1Y4PvfPu}K` zeMaq!xiKevKY7*?v)fXMnvo@(05?t;X97pUA8920FFfq64U(^sTR>##&O{7k{4p1< z*7L-3_lD+b+%V&xvPceB4#`nL#3iw^0nCENmcZS^=^+3@*+%sp2$ll(~sC ze$?GU8=b*mquSIr=1nwDz{>OY>U0>_RO-|6KFmYVyy)z{8^h{daWdd|W24jOy4=hb zfsR+L_2($g+3mxTdVcF^Mk@fo-ShMF$lWUI>Qxc?UX*Qphy4l0E{pYRLq&1|j=cvH zyA_17POK#B$K8v@1Sy5ZcHuNvd*2K4YEs6h95C33k!>Lvz9$tiwTGK&GH)q z_?5SmY(x`ozI~tmG5rohdk%L4i>d7R0Oe9&pT^YwkIG_?Xu{D?M3#N4ZlxQ!#zMyD?TC5Bc_s~D6Mp<@pH?d8x6UF?c7Qhc7T z(le~Sgs=U}Y3RM%j|EhadQkDs2FF+w@rfyZw3A_{XRWg+KbutHap=hJsu8Le%gb+C z7#`RQg}UY!1Pi?VrElk)zewBfPUe(He)iZL97|)?xHG@Kq!E2B)W_-3Gp_707WgO_ zFWRI$Ol%TP^eV&;bu2>L?v-1iO33ZR>t<>}7Xc$Dggb*4(|Y~|9LeOW!&7b4F1g%N zP%Y7p8##}Ts9{s=fx&eX|zG=u)Vt4g%K>1e)LX3 zK_RU93%f4!eYkuy{!!n<*#vB4vP9 zNiFo=0~*-A6aYsA8b*J|t%xscAaPp5xPRngcdZ!GNa*(vsNM!UYkPg{vSH4}(L!yO>k3k@oIZsWqcm37~Nn_gw{NDvn5^l)P0o zO<-O8b<7=pZ?c`kr8a2eAFhNM$!9+*Ajuh| zdKjf?>nYDW_m{>c!5zLkkpqyn>jto}Z=vJLOcbV6)M`i6V-Z<6nePA+<9XihyYn2q z=<@RPz@gkY9nB5{I~9`l=dvj^j_I4K0#lat*N`wKfw>^f_9&WQ!`2K;DtV6dxZ`n$)n~ zhj*H^I6V554w_jd)~!Ldt|vLSU;Y6KVND}X=y6Dgt=`*N*#@i7ygG46nf(e)Ot%;@3XfVt z*XRXY9Q8R~o=)#Ks6iZtL?^{Rloj+GEU`NQWQvB$ISCv4#VBQK{A-jwII4d6PFZ_M zi(iEX-wK5U`GGw)6N$1}*MNC^?EFeeqFPN01j0YM_C-#jkOICq^5EkybR8cI{xn)I z*-sOIu>Dl~AePWbZFb9==A?{cW3R4DhBIDuqCTjZJ3xr)vGO+L6qc5jRwm9OmlFa| zkcA!y`QCioX?b*g%8R3*L?H{?RlP`e7w8M>w$lpQY_i1~IwX@ZtRtf^RoMk`t_dlc zA{cKBqa_xU)Y!x7D?hmU>JX*|NYBH-8v2z2$6t%G(^la+=QqA+zx9ykpz`0Jj4E(C zIW!kg55BP-fWzatzhL4&JiBzO-6RE6852ip&$|JKw0X4T12s6+*jT~3I&qtw@eCGakLM2>RS?SH27C?orABLx z_3-$rpQ84si|J3$g?#biUPoVth{}|djblf$yfQX&BbnW%NG)!c%!cM_P&Xn~Ii`WO ze<;f9dXyp5f8ZAaZUMShP}^jIW8o5MRU$h?>ldkO?>@~d^&l`s)jz@X|AczU(~7nb zKl&OrVG_IHqnDPIwPgcN1nst*rkann3h~MalaslFy?vY4*29%iMkgl8!HZOV z!e-1aN%((BdTSmhF9}MP_oJlVtjX}gj0YLB_c1!EtK<9_r)UnF zP~U9FHnT@dmyIN%WvajC^>dEYC80fS0#n>PO^UJZ&vtt6<-I6{8*#P5cvkXvPyKr) zZ}Fa#Z&;i~esLKIbI44SWqK{^dJ1vwv^q|IvK9L=bDs|QX!T(ba>sd`zZ-qej;D&8 z+8m3x-!)^XkwaATtZxTIT6J*jF#fjHiKJPK!FAJb_K zl*svoE2}ndB~?P8nUZq7#8Mxhrnr6iMW3!X>mUnJgAD5_*#~zDe5Q|DD(A(@(34(? zITI!ia>6wyCR5#@ z44OE0)=H9CwP5-*P1mVxAVd-^1YR?>SA-7qONTkJXJ`DZx8Ze;O^I{3Qk`EIukTg* z&@LbtYvQ>reKyM2H*N77_6;N7&{^gqH4EqgOwgReg;3@c*lw#YgH8RMts5=Rp-B6R zb3RHBKgRzw zAq0(~xq0{6zgN#%mfSfr4g9wV1uo^iZn)Dc?U8hUcRrj; zW(^VdhFASlYLFP+I5lLE$lGt$(yHF&;Rvm!oNbZvJG~M@Kwn5tr3rt2m+j^lFTK_Cl{j2Hakbh*Z$Lz*R7z7m_|@YMb7yr48mwi86nW8 zV7FS~Xn748qLIfB8$s>Ss75q1HRL`1uX6kBIz02MNq^&A(MkvBcggXk^-e#tNZ2F6 zDVI9&JNL%F$=ba*Uk?3lVtqu7%6}ugYQQ2oUNwS($@1+wK4o03Wu+!nh4{3@6#B|~ zFwzxs4VQf0`Rr$>_wZ(dlFqi^gbtae;TPYfUZ;wwC>#oMLVw?;9D0R2W8$bc3xIRX z#%XhV?KwiAdX4~uNRs6zCS+e4`Ur7b?a~jWche;*=VVIX8l<+x%}zFr&f4iCS61!e8m0p7CrZgrgowYwC~$vz7UIG9-b6#>T( zG4}u{4j2DI`R+BO3X2;p*s+h>ogpm*uz5MZO(vREmGa-yhy+RA?4F^{*hm z8FSzY-=rAWrso1VAwAJ%Zw-!R4U}%$nc1qazv~~dzwmZ$n0=yXZmdjG$Lm^XS6VP- z7RPJpE_rweWT?0T{9W?BogFUSV9AO%WZQC5(OSY%dNZ83K^DePA>R|L{in^8=;I;w zg^-Z!LvaPIIMOjQtlT#epK4I{KGsPz7T`S0TQ*?lcP(l}GOD$kMiidr3d?Xl0ZnUA zJt2-a25)o@5e_lqCPgf{0NRUZH4)U3+t*fVN?;oi!BH2!sv-#uou+nEG#6=w2Q@h1 z5j>U#l#-$-V4B9?bxnTleAXQ_$&Tgpib0MO@cBB@&6V|qg!-%LDgZ8Y7p}l5p|5|- zS!m{I!jz_u#9>fCKqqliDGxM7O ztL?87Q#3~XmpT?r;Uw7TB*b1yhlZMpug0LvWQ2Rd;;J=d=%c983a$miRHFnan?(yW zqu;P+PX>qI_FNh=&=19uu$)l~z42{#XL?<%#~Dofw-oU9+!Uj>33uAx(yN~7T@$cK zJTMtHS}*D}pDPL7-al@gKmI6Fqwo5iBrb&hy+-}Rrxn9;J$B12cx`|R=Vsp5i&)bt zs?G<%ZPsEVczj+Gj2_qvdvl+y6&%*g*J4D=grTXw^eNPet_60=om)YyRf>W@J`;Iv znfEGu*)D(3%;qKSyUWY53r-%HTeKptp0C@ki7jhvJQ@3zNd0R8kO_Cqe4c+`e;$ntC?h%5yYyleIS{NiWnE|P|y zOP@=)s(|jSx+^?`$`?^uH~$ZONXL1{%3cUp@3rF&d^sTC(Vt}$TXWff|2Xv6N5;Pd zC^43d1DgJY?!mKZn6p)+M%n!kpx0xM^pZEot8CuC6XrR5Icsg4bNUP2X7&Z;(`b}z z4`23vEff|@jAVG89r!y{-|8C*8(jC@Bl7F&%LT$$d!?@-bRb=9%w8%>ge^{xshpRQ zllO`>T6fdvU@UPHTE7;Py*bIt`8X%Y%lUCU;h!gOiT7V)nRb84&=yeM>+$(xByTE8 zVS7%yk;IO!R6z zL~~->iWQZ8DtC-RV|1!c+03EoQ)ww=cPJjK(7@+mG)MPGwYTEJ#YOuoq?J0&W><9NYj!YXY2c-yQzDC6kqNvw>WML@<+?km1q)A(2yVf;pLc_ zw3D!pGGO!f!mOf-(w}5@gys!5XP53WBBw(2Vx3AopB%-;Tr*Vm5vt6cVSNSPl*GRq z$+3xeXa?cq;HSeLv9XpJ=zr=}&fHEURrLx@;eH(D!>BKoIxJj(FfbkK@`U1e5y!di(bQ!2h_p zH*IsVfEHvQEEIBt_SLECy%2#SL5F9wD&z8p~Q7gjDU#gJyTmg*)OCveppLr zi)$U_U4s0;!N&e~xKOtmF-dkJypaNAPQ3as(I9Ke+?9m9n@pdj?RFzG2bp=7e*2|; zHoTM4i9t1}C>D~T0;MRkB|9O-UEV&^?B&WQj=E*mvy(5_*nItnCntrKJn}-ROvx%Mdw(`=r9pe29T+Oo&Fx_bJu3g{j1hsm|y{p)#r?@GL=9d zhS}(IF)=Y6H%?lwyzpIhdl<5sKbLdprbeoGG&m2oT3IdTmO%xV<3n|F6vF-svz*o^ zYpZ}@$|+dn*v4+IW)^Q5*aGg$srXsv6-LhFGfCB7#@X|BrbrkUo6Q<=WRkFGN))7} zc}u#|k8*Wht+;k>MC51g`naYFiJFwUY0?T}CoJYJx%|!CnaJXK35f80C_}P(9AqE8 z=Sh+l6Su*!!=m2Vy(P4xXa(UvJ{+wGRt4Q(UGuVZ!oi5n5wES9W-)#fu9tt&5njK& zyK;ibL=LWdR`p`^i%3%}ru8^tki37GG_aA(dNITMq2a93>K_G^jyf}JW1hFaQwfS# zf%6*Q_0^5z0jD{!=@G}!Sv*pclLK6}AZIjWPD2=B_W8{+`MQ)xpVJc=`48B1JlL}D zz9-YxDB1ere%lpg5<#UPsN>`k*9i18g{&I2!*9bs!4S2k}eBL>NdT*VF z4%`CWiEZ%U^y9rqmOeBiE(Qx1jjI4eM)*?Ba&x5f>Vr5fBiW70ZcN590!;gkaIayT=@YXIU_OH^)3LKkq@MD0uev8^Aw$|-V?F$2g3Vy9vA zI)2Z8o=b&hSf8i;is5zZzln(-ZwIs+QSX;^-DP@+tP8;iZFaY`A;k>Ta4uSo(~C7AL8Hf-I{fkHJ+v%qNb0XEt8{ z5F9RtpibAnQVbhF3W2z`O3?jh$LxOsIRo+G&jn`d8*ZWU^77B`RO_;3TfgUg1dOuY zS02CmjeNF?5ok4lf^K$!A5eld>9Y+cQ?pBtFSpbW__O#rmMcq&$j!{+O!Ghl=dApS)5eX$9k>ewgjPjWbq-&Y0EN=1dwtsTO zT=!!Lz7KVp=Hh{_ofVzmC$2i(>cSIr42%mTHjxy7XvfpYBXIE&;CQ{RFQFDFhN9rsJoP04+;Jm-o z@LC!Y7F1=#zC_Mr8K`4uX!v?z?-xl)B7dd(IyjbW*eOas6cEj(Ogg=GbY3+5i6H1E z_44d_t&lsIFC0NMINHBR2ea()?=iQu3?ABNACD2ONm4x8PRZ+^Fq%~@i?=!Jel%|j zN5FHiaP19#-6+X7p*7I9D6oS_NPj?w9WrAle#m=Vv7XXB#!1iY3$T33*Axuy|LJXS zJIB7<-Ayb>CEzp@iF(~-)DE-&N$vdKCnq~w8$WQO*Rf_$So&^i@jFc3WJWF^&84Yj z3_J{j$rgzLyKppn$mue$8;EM{()-dY+7a=+_mc@mVt%O1?zgmwjyKhzpkg>tH*jDU z%l0RRxh`cju!_T9@yJQN5&9{Q8snwp?$PCS`Xj?*j{k+#>>% zyYcw%0~cTgPpYfS7U9<2)GV;gu|paAH9tvoUO(L*7oGyCJi`Oq2BO%e;l_1Nhl`#L zF*aRdwe8W!g~GC2D|g_=cmTi_@;16eX^V1Dl5Oip{if!XC*77<=C7sAAu*$@s%AGY z7j;C+H9xw2GAPmf@af8$jfAfIeu_o@#ss45!$!T^0&+4PpPYOn7Ib%!Z7!4|9#)bHbsmgX#-&l@6Am*pw}wsj6Pb8s z?e3B_c^DT%)({GywObi9AXdX;AR{06W5lu!n87q+fj7K!?%~_K(3~ONwxW$5J!alS zNJq_Rm0P&FrKG#W24up8NV$^aMkD1of>>mh`;gTjJ}Ll__V$cSF#12k@KMkv=aua@ z9$j7C>{Kq+4Y?YRFh^5p(=U_H5kG$XX!+(B8kyT8koK}JI>@|=OocPmh&y=gtA3sN z?)QRwl(!gQ%?ITw^20O=5NOMa0Gwzah#_7LvJJ^4Kx5|Nz((8O9-}rh%=?mmkp~So z))h+xLAWN)BnRZ=R(~#7%;Oh<{7i1)_z#MSRF|Nz?QMXm<2RQW`qsfBlANP^zIdsq zs3_u~PbJ$3#LjvdVWyThQfaXU6PwoQKL%|MMn!*qyU`od#wdcyqLE8Vf*4$_a1vI2 z#7?HL#09-sN+Lkhu{bDyuaCe2Cz|U#c5ZQ=7A#q7a))a^oHLI_Y{M|xtLz%wN(wjR z@4nw@)_o+L{>6n-OX~S>Uie%KQv;fv97$FyQ(K=n(#r-A5>viUv^)MxG_g^N)m+xW zL8yw2C&t)}sGqsmLb6%AK<>5z3-P!z8v zDy&kp7La(?cmPk5uKT(%294c(sC9xbqPPM^`QO9Ni~LL_L>!yN_jZV>3IJS*3xb%_ zfwM$<>8A-GhWF}ga%y6-OO*r&vJ^{YLyu-UrJEsV*vv$dt;nt^;2kbchmH2#S6EQo zwx0bv9aHZX<8Jlv5Y5#?UouY6>rzHkM!Zjj3iC7zr7CINK=AB2ze-5Nfmi1l`z^8) zx_tu0!7h>^USlM0n2Jqok{1I+z=Y3fxY=$DR^clirZQP8!z35+wZPmLKcGgGW8d>x zP=X1qg(8sEV|2u9)e?B-4n46fHI!-Fbr-Kp3PQx(F;qUi7(xMLt@f4{dL0|){P(R0W>wJ;-n z8ezj-qB8?yMr4d1F1JveOU1Ch;t#<& zJpB`3P3AC`!pi527LzZFA4l7tgVRFsz{vt`f(+Jg${ z{J?MO?*ms4eT~KJdVad^W4eHG`U?^-N@e6~atfUBx~qJdlD}QEwJu@HPRW?S;pz66 zsh!99qMn;GWc4;gb4I8ESx2cBc4J6;1$<|ia*Yf(_M{~c93|y%p_tTi>Iwu>TKgXl zFn_e+=&E8?bgt%H=X*t5%<4thjU6D(Bi3!MaTM60{ z=&+gVS}h?$oCBW~S5BKVZ8~1bfl7vGARHJtdkBHThqPhl?_dM>#=T_X_yO7dy=%@~ z50nlK(+-xTdMy;`>kWI4MV~Q3RS2o;e=`xhX`y|&DS4GKbFWLo7rnFWgnUSTGMMz0 ziF`e~$p&4%muw=pU*6t+$K*xo%X^{Oc{THz3@9^sa_rcI$SsSWvb-yQ{+qMhCvP@f zFIB#5M8etP2Ou>X;&XMlT;Ra`iXVZJ5bU1(*M<67=>^YjXkcv*Q?w-Cp3b**Y;798 z1qU9>Rr8yA?agKU&Ku1`Qh)lXX`5)s*7CbiwRGGpW8dIhx&l|MK~Cn7!xXS(`;6BiEj04@!*G>qJ)HmpWEBpLTqeobs2@7VV0|Ob$dej?%0~Z;7|h_ zE9;H#$*%zn*8K>U5a<2TufA^)K#C(182Y*(U?!;ki`E|*bND7Z(>PSuI;X$(%B0B! zCE~B`>`~_{u09lylWZx4_^3ihN$GoetvI0TiTLjF?&Vd1l&3AcCb+A28g5{TEOURhKlV7a2k@bf&d3)+OPOH-7q)Fg+`cp zOp0ZCQj;CN_+18-;Tthb@gz{j?LekBsWT}O$n&kFTuAk)RlMbgzh1A-30 zW&j=f3yj?r)IU7+0e#4>r~cepONg zI|JjQAO8KM2f_pIS<{|HglRkEH2d}e@~=1kD%j`Z&+KwT_n9g^O_!WhPd<&6BK^Rd zBrIGVD?^&x(Rzy0n#yt>g|edFEVDplG;;ZON0AqIn*Ru?BYkqyO3Sm*wM@r-P_Xh+ zaSZQbWjOunmg4cc7)B)8Y|G??Cp>}sBId1`Q{A9`P72^tf$C+iXThsU?VIW5J3N0= z_^A$ZIjyw*75x1zv1|7uwfnCXheLeclz0a|Pj+nF(r{*T2amMB9OnIzPE7t&AKtax z$mr{<4LAL|{+%0UuKfnK^ERwGmPz|m)-9`!)6k0y=DNmPcW2Vl95d=VHQgW0wt_u5 z-$O!V4UXGM(~`Q)j1>EaWi5Wr)YK899`|!L;rUw?}Ew{j89#|4S?EFGs4j$FKaIKx!QfsgxCOl&Ym0r$3NN z_0f(@)}c;m4}v=OaOFzjmR~59oZINu@|J|3unZlw);pKjj%>&^9EOuevDJzGH}E`}X?hui&XMse{xTsjHkwUZAWP3Nbm96DCU zov|s{hCkd{GVXH57Nqq!MByW-h{1`Wkw{#dujH;|F}A-%e>x)(6+2VH$(;QRH9u

      Cq}6>5*ss;Jc!SAq4vCH@~8QwKDj%$aCa|cHQh>d8S-=(lKL2 zo?Och1*QyQDRgHWQtF@qJ3`9wH?J71`P%j@82q^0nVlq6zUCyybR~+%jVWQzHrDfC zV%oo(>BrlBRS||(;DnD0rncTf>r|)Xc+Uxr?*Auy0a@uDGX)q&vn>G6IH7;~-7T|Q}y*2Df8cPBeP(fc8wdOLNM z(>N6*`UV)hihN)Pk+G7s@ZB^Pj*wI#3BTqJ?#2v^F$|lWw{LCLPBor0^Hu)$leN!V58uOL4u`U<`0&xSGdq3(9&ZlO`uJG(qom!G9z`l-HkZEp^omuQ-#;w%>_7!vio)v z>DI#HSP#W+DL9Rbq_W?i=}wL-XNxk{A?+f!$dXUbzV-+$amb-;bt-py(Mw6FUgt>< zyReQ|R?T`fS)X<)!+SC&G1QU7o6`g*KkBbyww`oU>gSwd+uLHnGN$MJ6f<0@KVJxB zKLcLXxevv+O(xeHMF1Uus$zf=aJ=+ltjEEz0$z}Cp=k>OpyKWlu z8LilA@aRRRpm}f}S0sf4JV?ily9Jg)>B=`|K*Elds%vOodJ}UeHESS@yBI1`y>}F!fp)EJ1Uu z)bf3wtpyt+78F)IU!8aFDfR>f z?(RVHDr2xZZ#Cr`;BdP>$-m6bf2ER_stSa3M@z@_lz}j545f;7$oodCO>eu2Oq6E3 z)BoYwqY+fTADSt zXUol>23cAakz;Uu+WwiMf~A&ApZohRl2Srb=RWx(7)B<6aQ3IHT}34&>~wCEfS6FZ zu>IYpP+J*F=YB$B)F$9m{|9{S51hxy8QFSG+PI#pHx#^XS}*iiZeg~0Tg>0845%_+ z?P7waCwja4xO>Wi$v?6zEM$q1o%_XX`EZ4Z z7-AQkMZZ_f38N}%M8`qT`c|2xgQq3qpi9MOAQV_$roD+{$oW6+KgI-jr<`hl|iw4g_PW&BSX zx{W_wimj&~;jvJ*@t0p_CpEY}AI8~0+4@C55lP94s?PiGG2l9p;2nPC?(=?mn2)ZE91RByq z!rxAe#Gxn_NY6;*H^U-f6$W1z=S9@p@j}rzl_>IJk{c@{Oejj9r8w;i9{T31e!dXe zF|1^Rz6`SZ6!74n$2f~)jS5T?hCx!rwSMfF+J3xL#L?Dh^v$b2hq5`&sP<+Nd7h~YE#qh>KVd*aa+`|nF%)QbBWXDSNzd(op-W2#T zF{@@T$^_rDi+`1qM-seo;dGpob z+bKq&{%O^}#4?@r+HjT55_X8JcCR0?LWcJ2;5m(k>+;zR>u&1H6ZO|un8A7hYQ9eU zQ2zTi`&CuM4ln!oHOP1&v?jxJyAE&&N@dBHkGFX-#IHj7so;={HF^n zvaiG_&wIF0A{hzaP;qI_oBtXX>$n`$35I&j$EZ_}XONEct!{1H!U2MzQZ0s`FmhFv zNySW^0opm+)oohw{?lAP~$%;+3R|&n95-cUj~#B-^PuG-Mx21G%5My zUTGvJ{&1Jp>Ov>#)E??cEhr{8)j3#d_)_ksm#eZb!eqXSxpS6asz!lQ46m9VGWZ|> zjlpn7Vphvpk&*Ui&&iVGa&lWe47_@Gw8*pYCnWTYvu?b;8L8n3GQo2D(g7Z3GPNJX zuslrn5*1?e){P;fT!)VIDOC0!(?}-=BYRr`dZg)T(B>!)>7Mv8w7&43(s?)mDt`*&FVW%}%sr)T44 z85rZks6^p6X=%%w-M)NLDYU?I+A{V&~PxQeXpb?705 zH3?T@j61TEcg-ewS6FjV^E9a0%+c9zzeJ{foUWTpe;ub}N}{xB3Wi0SRgGgSZk>-d;~Zr}5bm!rJwiVlpRKh{oXGre`yFqclM-*!OVKAgAhT|fgq=f{(OK#7M#TwACV_pXjjvDXh@d04 zc0ikEqZlH__nB76S{jqF)Pna%$UbU{GN}RQ%B%Kd$E`t?YzllBjG!9>$h3%8F8n=A z6G|C#70{ens%g_{w&-W?XO8QRW!Qev)ojeGsSR37$_@uPqG%y=6FPWRoincH4m+tG zcqg@P2m98%qQA!MlYXiMwR2@2X&jdA4bmF-sa{lPx8C|16=*dUR8SkqnDDiLd)Hix zO_nWfuRJ9$Y7p4TjDG*AbtT%R%gU~t?$?3eNg^lK+Ekv6qZP}s$OT4IAr}P48UTc#D}v!?!2VBM}^nzo~15&Gpyd0lp+Y5Sq( zgH3>v{kq?k0tZbRCI@j|TU9xvVZekaobsw5e=wliq(;L_-7Ivtw6>IR{6=)+-1|uN z8u8X<;AiX$c4by+7wdkcbCUW~Z^!V$X=l`;zARfwHVl>6@P1`O=c+8OVd{gYvdA+% z3}qKu(|@S7qB67I)JWMoCVg=)km)r1OxCsbcCJ+Y;B+yw<2RCa^e#rq1p3C3%99;E z?n-=Y?iILJ-3pkG4~k!j6P?M+&u^wpQ_O_J%mTRTPS8py==$PFsC2C{POl1$mq5t9 zC1j{lhkywurFXpw{zYuy7@y2;Ac>`@&j;-^%i})L-5kBUYL;#r!Q8N%96uH{Y}dW; zUEIWHpYiqBF=({20wT-1<$I!7V|F`8XwxL|uq%$EN(>2CaegrkYznfG4EqQo_ab+s z&YW(ArClx*xo*`$qODai-qv$m$Q@;!%A;z#3Qlyi3|{#K>9-13*bN`HvXWVH?7Zje zaZb$53TUCAHgjCcL_cw_o4AWI9;WN z?PG)gbh87i%Mp!P(~}XhX3&tAKe}UCL(;rMhFa=_?dx9A$`0Gby+nvYqw%IUoWY8R2{S7XVDB&;|A4W<_rE`8l@hCxpv=P>${;PA?-ro+ELdWG)d zW^^*8hRH+}N8TQqpXyjO2AO(7N)bu#v4%CxRQONI@^F%I{-i~q0i)0V?NAG-4hhjkbb=AkiQqNaP6vzT>0w$MI9|iK4wuvKuI{g%i!VZ~e!64!+XayDex7e4l#Tq0`UH#(@@v zdN~@>@$5v0pq85is{d&*Txf;3a@!%Y@U~&*lQc42&{1_>A|tMEtC1;0$^E;G5kPCG zW?-!6N_mLKYC(UdRd}$y(=WSr%nGr+ia|`5UpbX=&{B*o9&AY#MGi>Ik}CfB`}x9X zTwx&6qrW5K#k2*kmcUEGk33t(kB_08yM%AePfv{5Sy+T@o20kR=F2@fp5u(0fi^}- zE{3vL&Mz!Fu~1IWfG6`h?C8h%1|{wggY^RKWI1-&%zgo*h1WEUCRJX54tpW!c^s0z zWGviD`2)n}xxu?{ZxD~j8!%*L6Kh8OO{ucdXm}i%@?Wp9u`wl#_HPWahJ^ZcEu40F z`iiSSOAH6}F5~Jl^!z9e_r<`q$7la_2ME+!mIU}x^-rVuz{1WKB2s`uhoW)^+&Gvl zg|7}C|4J5b0zEe?&5oyUoZHg#tOo@xnN*ouXRHCaFn3v|Nn&XriR}sPH>T$dCab_Y zurb08EhxIchItvMu)wr)TaWfyQ9*urBOD!*6jK_WD~7yExspi45TUZ#qpoSqB_*d2~ z%oqu8RI`QZBCn(xqPkv$e}3ir{X+05=I0^dsDVfg$_zhKsEjyHpC&OG9f%JXKaq2A(aizVjRetyEu;P<HV!q*q&`sLF`lJ zxu~mff$`g?CKOdz2(pvxrIBJ+EV>=TZ@c1#L$6L&eUE=L{VFzyF&j>To0}4zvnQ_x zdO7n}>|xLU*XdVxV=6(rZOetSgFPnljBCwcOiAZRuf>!NtxY?3&3c;}iPHXjAtdTc z{%yIt9On6mZh!3vlpJcO%YYWWLk>dJd`WNPv!0h5E5x`Mv9GTYL_^S1*z?y_5g=1W z&}2SQ{HhI`mg3uAM9_BjJBvDV20lIAGV&R6}d^;~fY=tJ}xa+ps zvOj`=J6p)rJlANR&R%n{U*;S{%Te?P1Mv6+7^|zh3K`A^EBMWpOc}aPn?3N-L)h(i8m7cUG)~#KHN=3e zEEB8s2+`oy1U{BrY$p0DQ${A{A4TuZcYYBVUURT#y8YQpr1_6V zJJe8PHWM{2fpXH~A;z_1%mhO>)2~E{(8ZbmobU2uX`HR&K~i>UixEDi4ZC6lvvQ_1 zki;1tIBL|TDF8{0UH@Kg))gevc&NUgeoZ|wIx=GS)+Vp7iGw^T=8WSc(2uzEg+u>F zn0JZri%M}$`4Zyy|6UW@=`n0&Ezpw(jJJ{KKYxMWt(h!%c{?0RV0l3j?r@BZji1q( ztvE^iv^wm2D$%DphByMj`;OQw|M)Dk#3H48f00U*keAUQ*Rp-UmTB!N~YT<%^L zrhqD`6+0|j4+3M{pg)yZplQB0YWJw>1P<6+VgXORq7j%TiJT^M9L~~eUZPWLUh;d& z-rQQ2dL~{}3bX$bjRKAbtU%d*!FrKg z@!p?6?b3ap9LimASD5K4`ps3M4lb##(O!gfj(?Uz_xTf&bT1tN)1S9BojPPS*nLcp zCkK|Z&mFPw`_b2yx5=Jy#%sezs6DJb2lEOIA6ZX zn~wq2bX}RY$Y!mnCfrdKPpb*A+CB$dZ-h5p1`Uv7z?MO{`4n3^Xor?k8-iD@VQ12_OxZ6(g2bSY%KTv|7E@i$V>2JhGAS{nF8~qJ=P(?vFA-d7<>`?pugD zeL9m$R_Vpq_y;M*A3SGZPSV*4Mgy5>Ze=s~l^XIl?;aoSO>zXCSNYiw7%AO?Sd|#a zV}9}LeDc7AmdCur4>m-&BM#Ae5f>ks4cY@6vtU=QB{?SbMJnk}jN&`QcPqi$USC-$v#|nPEz8js!jrxF-(XsO6-CI=Jt&GY>6m&FPa{fbLqkgUs9FiCl zn$)lU5;Mp$oibcpWW12Rlcp&U&@JQHiJXjfqy#yiSH2>qYtl;zxVbx5*}lJel({_m zDHBHmO^O=Dy0|zxau`x;a^H;}_C2oR^KaoPGkG@+qhqhsiK1hDxLtef0y$1`^9X5m zs(+eRR#u-2X7|^1Cfivcbrw^=Pq9=7M=c1b*7uXg_~I^0V#zt=m8p1YN-eD$c$ozA-$oRloJ^ zb$GA)Cq*vV2(vL#UQ78xFsSEJQ&S^}y6^wsd$W`NRYWMI@AyX*1)1;}`H*xff!Gs? z_$3;2;iyW|eCdaiaEZG=Bh0xgb~Mm?f$v4$XCP?IYYGDG@k^N~M?xC&`XtZvuMM-ytw60*!e_OvTh}lb(6SkI-|cW8YwA?NKBDUeItqB_oPk8b%J(m7)MMKC zUuoYa4EE>8&P8x*O%y|f3dF5V6C_>5FJ7e3g=x(9q0atLz~R}IGIQ!_w7kAx)+S)sqA)yh*~P3^7 zrVh+!KB?e-1z6JG!NQCnDsDmU0h_6@^MtpJ4)*!-(=>^|KSR** z$6sZDhBYqC=#NRI% zi@@vr{W$S)HL=tF#r@eY&I?s>cW9f{UDY%sFbLNglof%rZU3qBnW{_Tc^L0E zH+{Ouv%odAmv_F1gTn?5Zd_K}0>qsuAq9v$ zY^=+RSlA$6`QzGuv|U{$Mn=p9?c?QU?pBbnj+B-^=;7k#ZhmJP{*0O~YzRB#2P7O> z<=)|ETi6X1jvNl}^d9jJW#G-}5OsGe@H4s*W>L$&lMONEN~Mbb0@x)_Wn}3G_-X8a zmseB=E7lY941Voy&Y`u^4oF(2nb2OkO4HqC#v1we=s=^!Whf1OSi^E#{_L3ytPdIj zv~1XP7vOoGu>BB1fz84ppGQb%b_OQ;!!N_0Jp6~N`eQwX7lFIWY3~#zr$v6MlaR)k zTb39hzsD)$r5bC^k35O2sJKnaBX|L*Z}!0AYLf8H?-e~^L3`2Az)*@M4Pj>u%tVR9 z0?-kRsC@SFcY(3WVM*=9N#i`dPD%m0Jo7zgkIXFfb`rKSGO0_!c0p-GP0GkN9-(1j zM1m=EK>6kQMmTksEjZ%X2?`Fo*LA_}A|xAr^_C^PdxzQFy)_9c96k*hPdk-A1S9Vb z2NCVqtE-AK?rlkZegcHu+w~=zT%%@C1o{70fBXNJcg$cl*!~`o(Jf0)`}s**XpZki zRNlfj7uBMXObC&H*4X<6BSFjga&3u3Qxhc!W)&^;iisyaI)03Fphz%s|M^Y%6ihGE zNX+p^BQr57kw-S$Fsdazp~A05zDGgN)ya!y_4 zH`>)pFMo?8g0WJE@wU^tX-AT9>~& z5cjIWKMA~j*%KK8(ge1-WMGH@3poGOPATk45Ez}B^sfheH)r9%#L*2?=adsDO^T8J z_L&;M55D|PQZnsR_t%@|mPF7FJu%esM5dp!He)l3muV z=R~~u>C}@5lu$xD36wi#fR$eQ@g+CF=j*|IMLdPFSv>1jRdgn%GDGmUsI@+Yyax)! zi*H&iS-F`{U%AOj=YcUqJYbyROtV58@V8qSN#e)iCuC^TiJ!L?k}HCN8^b-WPd47C`WseO=5Z;g zsnsk1JFj>^_ZqT$!DkGf?}`v2SPN!3;WRVRt9)h9JH-}gDdI4ZKLRxFP&EiDc&*6t zV5h#QuRrr7xAoC^_=9rr2yfMq8(`7@_a8C+v)jeIZa2jn&cXf>wj`QX&Kw~j@xs|v zQpU6rO|JcakN&3vBwG-@dx?$8j;e&QBjG^0pKUwBZkx$}+K2eN2S%}K%F7SN0bWGc z%ErbM7|%U+f!DHax-C+_q=kX>Dmn7wGl@GF*oQZhNpHd%M3w+*-!qxJZLffKqa0H4 z%jnAnySVhIPD~zmoMOc=u$}S=L`IfFVH=&Z1+eJwksE7MAM@#^&=Z8$=Js_G%XX5( zi?Cu1Vr9h|57sTdT;;rXe!kWY(gK z)GV?>hkA_)P)Ks|qwpm~>w13PY9fOtjm5|7XqY%h&utg3VnW{)g4yID5r|_MfNo{Y z0E`O%Uj64k^1wr>AZT#AqX`mjc-)gG3kao&{_9+)86=?7!+;q)c)F>tzt5gCEXhF3 z#8l~%ui@(7H^JX5!vc~gcWYcmZDN3e#$&#BXu-e4GUSuFB&||JOrYFW#{_wg`e`8U zW?DMY+Y7KDL;tZ97ZuGJHCRt@zk{Y*e(e)h5ajmVlzr0w*__ANP=B+iE7i5USGMG8 z#MWTu{%URQLAU##_7$*(?+O5e)+Y!fJ>Bm*#Sk~wf|3k*QHzR6Kf$LV>g)~b$tgJU zkZ7dR3Ajq-Q|i$ykc+Oy&FF}+CgsL-YSDGfS_0)kh;{J?(;vL;ximAj6};rOiDo{v z`nJnF;j9aP5O~i;#utz3s#y&uGmPlSD?&+e9q)ahZ!Rt0h0dFa` z417RDiIH!L7{WBoh6^tGD@D$KVkJa3F=CB;xR#>I++ck7dLPP?dO2JlqvJz&JS9M+r*>d6Dn<6oxRQMPw_O&=wMdr<^HScUW{f9+F z?lcW$tdNV*g~U(OJ_2}(Umft)b0Zzd8r&S{_8BARU%zJ}qjuc!ySqNUi6s{xAHOv= zq*(2&BP^i6%{CDJc&+w_-{0iiw|hq}A`)$u!>H}=ACM2TNLEFp94ebv=5V@(c(L^t z&3~IVF}3Ju22NPvYfT*FvM9r0ks78VP%;(d%Y;At0pC}ker8eYC~7h`aj;$y=^Z^# zslq->Mp9;S8eq3PKv`HSpG=G@+a@=z;^cRteM3WIih`%W7d{*hxYnUnO&1lU?$#k~ zb!~--v6Q53jb6apy-qi$kf)78Q9OD038NmI3t8p5%dp!)1Mb1A`PVu$eosw)mIE+&Y#_lI4nQm-VBUC~e86asP8&uZL{S!FS)*Y)jP(e?E zQ?fnrNl+J;j8~RE9j_xKXbCf9xbmG?((`46BZ&vn&S%e6*yW$4uNTdxk|9rGih{Zk z6XO#7_Uumx5i<^~SugN@d13Z?Bq@6wEuMze6Mp~HW;^0xj8^7_%WhSeq|V$%Krc6^ zq^9N!QeG1&h)+4xbJ#?vY$7KSFs(2FaN7$LL}NsYYDB&^&o{EIiTfRE&$#sBLpjbb zZpV|ovEf@{H&&m`NakNrbK`xZ*w2!|PjwuQXs{30CLmL{PG)+XoLfUO|3-Kq8_|!2 zuM>&;@?F)U8C}-u=2IYHYkep4Z9=_c^2IIT+B%jSaMI#}5TB>(sS}{AGvwOocHwbL4+SN8hChH&6>Qevn79 z78J6nv-^ob#Ol&hRleO5guMLHVew=D{1xAx}3ZF<+8);Aml{WD;%2i|t@ar$d61}aE2^V30!i88fz1-T_V9MSLL ztXs~AZ#zE_Z)>Q)Kk%+01Rqxh#7KEEyVsX$-3?_AB4HFXq*Yhpve%Lf01VmQ^@h0T zI|%Bu7p1fhOPxCxHSgeu%=QLOta@4$d3ck;C&Y?8oDxWv=V5Xt}{JcW-B%4 z`YeLDgjl#6gp#+}w|Nr{BQQi??_GS|tY@)OM2eBR8G{%j)t*?u~ljUqKF;G12d zB;zXs`HON$JYwEOMrkpIb;GP`+=P|zc`oYwEXD{A{ zPT24IjY`v^Hd&fu9I<#>Y8u)ge{6!x#q18^?G05*PmWv54TTf=UriRK1 z9UQ{E$*>0CPDZ{}Gm?^nl}=d_VQC4vMh$8~-;hF3n_)}df$-;_Fb_M*^AnY%;i(#g z4wVPXKL1#22(XrHL)exiC1oYx|JBFW;69&glnOyx*@g(!*Xaw6iG1(-2#S!y8cuq^ zX4E%a!N6yqi{{m9<7(vB`Ot8`SZ8sYGSCaIVOpGXDDAskOm0g!^^Fw+WzFQB6$2AD zCZ|XlH&VsJpYxl(ti2UkjtI1h73ina?Ncv|{BS69urJ+4L>Su|Vjyzk*FL&BVOWHp zNODG7H>hvaz^LmUAp8{9v-?Bsp&xPFf)w6vvvl!kHdZPLeY1%_R3YDBqS+)jmCzZR z01(ynebDLdAOZcRje(Q1%A=zc-|A_7O-Dz^e_y%2N%P0@$Y7n)S8%0c^F1iUGHP9#fyLCOseCfriNU9Gs=R zFvhaGCS!vwGt(XoYS6OVTB*NRC{V^vy@@uz{5fiVXb^W3ZAF+Y4kaPPaUPJwsZjX- zc=un`UG`tqeHlZ>mji2tt&&*qLiaCXzikXCrF|4SS06;}%5afKwG7TCYL6|Dl+^Ev zDiJ$sq-;{;`j0sJ@fBcBnTTI5S}eQ%1n1hI)PZHUOCeAVl*JOpo2OoP|ItQQKz%vr z64e**{Dpw6HM)c`Hy0Pz&kpZ%<2xgNO=MNA4m5KBDtQ~ZZhFc0P{OH!ff-j%N1U9N z2rnmJvt?^!(&}f8b^5)-3`*JFhv5LH*Cu z2|-Fhc~ZT%=h=1}BZFBMgJ|X$GOC(PozW0Cy^O4^QAV)) zOKG(HSq#~i|DxP43e?J#>GF%OX5Ssaw7EcxnsT-qK-y$62FKTsR=jte=Z3l2f7SfA z0|4wGp?_X;Po%KVPsc<;C~E<&%39$BE;i+L)SM-$$#`* zVw6Ij@iZO^WOTv9)a^=Gxp&{^l#NgEINo5qa#-SaF>WmJA^XqP&Q4Fib>@0ge|j5)~M)>eblNgfzH01PZy|s~5L#%(KruMMmog z;?Qs44(>*Mz~k%5xe({-M*O;IIJF+)4X@l+nbsn=alx8Yd z;?d)){|R}DRHhlC`d(}ZKA+B`bGM6=`-K(lK0uKSE4Y}8AEse_9p{b%F~6I1i(@+{ zpQBJotsQp@{dUhGS8ysy0D&saYqaj~*V6S~K5F&ecSoe=m6qBHZhVo;$h2py>nG^F zCPkjE;A`-*v;ME@d}Rz0X%5!ng!^1z>5oH}H_ymhBc*%M)(c2~vN3ZB2?4wIVmf$d z4&>eigFmmb#+>6-fQ?zzZ_xV!bsyjw$c8s4ZDzhC_6dUqK_jB4C71W>Rhs(n&~@kF zJ(v|ZLb7cV)1;={W{CQn>0n0BbpiUBu*IaB0V;IVi7t*2qBS}aLDqW~? z&xF0!QqQGeZnmaOU+486S;$typzYm$KB!d#^OxcfR9qY8U|CPO;xv7l{eV|o!K5BL zjNQ5YcT-);t-4)?1G{{wM4$Xi{#oQ`F*w8D$0bpsz0%S4$46_zKB#0KenML<=7Zk9 z0w|LGtEy7?%Ze@xByE?ku_`9U*otoweB!X*gzCr&aYp3Pz~;aK(V;~_GOIbNz<+~6 z%aF-=p1YPok>mZV^-8>fAyc6%*Zr3=Z{|v7tNZbJXLsi}*$-Hp{R&MQ{iao;Y^Mn# zI+ovGXr!`Qd(vY|sn5T0sUMuQB!+qfwYnQe+flHeR}yJ2(&t;$ZSU?tH@_$fg*5(1tISM2SQ^RGa(w^u zB-KC}k1jeoOVG4cOj}FKGIMPB6zV|&ODegwoMKW`$875*9M+H2GHk(yn61dM$rEh%DgJ+ew?6y(WdJ~eQyI6oY*2+o%X>h)hkgE5&-bub3>bCP zzEHZXb=NKXQ2~d%&^NkE*>&YESxqlq2cYcZJyF$WQ%`SKqNs$EfxC` zKd7WN3GvzQZN^I;d)qYzR*gY^$JByWkxSi>xNJ~*%#{Srp*<(SWWend2H6S#L#OVa zV9I;zL9u{oZoDKEyGrilf3aJ-AeQe**WO-PZMtMXjeCu*y7~#Smbe04wJ@I;P75|V zEgJo82SGlSuc?ZP&zMkPrS0@!hv)@WaWGAej*3v#j(Qs07f!aIH0i(lnMcrRS6%tI zJ>3$4#piVDI@TvI-t_*b>8F>D`t<&5cmv`d4DF&geS}MxC2edMEKsN#czHi98@8rg zOw|X&c6dJtFHg$-CJaFTF<-UU_LY~H*NLDyM|-m%s`px%gK|E#K#dm7IC-~%gQ;Ob zu);$ZGjg;ll?7Y*gzpGI7lY=Lg%TWh@wTv|yy6?Ugd3RQPxO+yg}IguGCku~5w0Qo z-z~kxa)MpA2CLL78D$Sfaz)bELm4AsFykJr>O|h4eZc$r-J@`E3n$UYsk#5;afx6} zHR>)v=BClX#+ssjN^!9257b z&drSQz*4Ucxn0rb5K-%)3eOCiF@vY-trAWXjLp=XMMJ;z;$vU@JKJ{wJJF7S+->|q z?{&m@yYg4_GBhrp`R%TRO;CK6Tr@4`#nr|fFLWsWmTeD{6T}6-$m#`6+cAPK=IUCl z+&eE>+mQ0vDXptH*n{#>4CN`Y*kK*zmoaY~fVOQHY*)STRA*9`TCSmSk& z=WmPIFr%wQD?zvRu{NUDst)o|`+aL1gkYjdmewJaj5_kmymatb$iIy{4{%x zm%Sl708;OM4jN69x6B+K8O2a$zK(D3`C}LV5LIazu;jCvhyzmR&60TIrP~f$<$_b~ zZ;b>Pelk){eSWA}qO7-d;WK66$dZ)f!ok&seKF-!Bjt+yE&31lbM?qM{Y;6#2RdwQ zxJPq2R~!w;yu5th;P8L;wpUdzdt6aIa}CM(@Ruivew(zP=FIj5UX;HJAUQKSo zusQY$tO&Wvp+LRO-XSm&p9SX*x@e>vLoT3ri)uZdK`_q3HwN7bFtKu~5sHWWlI*N5 zJwZ*XwngL0s0Z=5ZX>tAvM6IB0W;)2ji62Gq$TnW=kJwEzjYofiC(Ygz4BzQj#>nJ zOiFUWY7oR{1{T(&Z$d7mgBQ|@srVZd!fxA0?P!%9PhM-_jFT91$d8eX;|;2biISii z8HZsz(OxYiZ;Ia}8kt;mdVfHh6tShyG`nutYx~`@u?>2HC|M5fPju&4f!V)n8CRn4Yl21E#(I z_Cd>qUGE>;%*sRqP=6&A-^`S<8E5vU*Kc=Sd&pS#t_nbY*BYN zH=X}H5X=gnt@esf{xNEQN-v^^?5Y`Zq_6+COX#?q@_yBM72&SUDE78*#k5*yUUtm=MTT+jg&Vk9Bmw;+z{Azm^)XA}t+CU4sovlI zLUDwcVp`G8+2b?KO336hg|17b5w;sbqkR`Pwi|8K2o7R`2b{Jgr>Ad=*UP@-{9_LL zuA4b8nmKR}K88JpD`j~$!gl0bnSiH#xCF-$PFVw;YT9{8J?+rQW>>PT-#Cast-qV-0305nFp3uea3`g6+7)g=~ug}*$GSN+w&p*?OUBJqel z?KB$gj2kAc?Md-QL!v7n`mhjY!FKczC9B0{+~L)xTLT=WE2t$=Ra#}&SOn%AbvZ5t z7n=ZVpH@6jkgUj_L-V80&DvSxx0vX3L|$MD%MmNF_ySeX-L*cqHS9}o98tXZzrD4n z=xDV?#|ZZM_sp>e<}KsbP&M_9Bkq8j#HJj*TGL)b4MEA&Wz@|1`aDU(1bUZ~_w~L> zpKDKWd_^0K!?-1y6@QOoFyV}HaewxK;%8Y`I8ZP@f-~s%Ds0N-EJ9j2UBqMfCz)c>eNRxWtaDXpixGfa zJNm;tN&=rIs2CUajGPx}Em z?n>3R-aWAXh`EWhpgRy5li|kU8H#5dWMggJeqd{U`h23#3^AYIeb^jMAZa>5e3nPig(j^ ze#&YjCkH_h(I>(dji21D)-mkjUp5)SQVC656T=2{|F!56`WS0{2CId34;E@3fwqC3 z>kPJQd_E1(bRFl7(b4L_GCNHP2*_pNFeZ9itQd)H&M_U0rM~C268gc$zhORUysto0 zaNVsHi(&fYQ_EY^;*|KF(kx~lNVM&e^fCxJu>v~xdD8t?r9a%-cm4Q~X;h|%pAIv& zsZaX|nWGu=@$LfE6!)InEbQwHS%JO0k;ueUCUy3k=&q5urTArh{T)$ZX$}2Rv1>KJ zS?CQEP*P1eJR>)TI_FS}L7g=bHKp%RXS_0%4Lg)kgdMgT-qc6v{8+t{Y2v~w^p#E> zHo&!BzV+k!a@qMAOC@0|RnJpbR$W(G4K>-6kngk-@l>yTwwwcRm%~8`{%B0ju7m|H zv3nR;`H=CU^hgt@tWpF{L+$1Wt_y*5UC*@cM2rfWaF zor2kmR08s8_ol3Xs2(lL4n0?S-GKN&0bAS0MW0iLm6p>Z;AT1W2J087JN$0W7UHO0 zwTY`s?19{~C&0elgaKLY&I-&Gc8jN23|Q(BnJ)@ee@%$n6B)kJbdY_v>lA zz~n^rA1tv3ta|^X*X;B&W)zyz47Od~gC(TTiF4SF)FYw|@CnroEqTh$P9-puwwV({ z=DPe1T878$SBEbPVShh)Tx?!i3nv^eok8bY{?rxK>X3exM)Y8ISN*lrZZ+4^oz1(O zLgzE%i4IJ3*~zuPdjwk)?^MXj+A(? zFxWLq`tAGe%PaE_#*O1z`vc{Rim9(&ZeT^r{{(D-JAi^nod`_5Zk`k>sef!#N~7K7pxlSg$U6X>_AJ*Ou+K0g0W zJ`9U>{x`@0svQ+tC^=Z;+N*v;|H!XU3N4GPn zX18eK%N3k>C9WcsT+b*V+1%of9kq0;#K_*no3Un zcmE)mq58UB zL#wl=e8LsOEK=2UTkjw)nuPmLJrVSIwAJ^l*;A4idkVVfxAs`&|*t$N;JoAh|TqsO3xr)RN2Nf$;opm zoXUsg(|GjXh;q{}iwt5CcQbwE_7vPh`Z2k<3ni}Zm{UAd?wX~`vtDryuUZt0TK1BR z7dShq)BjSYpBVQ$Mm-*Cu2`yOrARd|lj;1?Gq^-JYlmR67jH$qi)p9U z!kHFyRwbfbo*go5xqpq=tYQ^n=$i3cf;^;+Z(5v)2+In`f2hE4KKjXzq=!# zP#LfrQlJnhU>y#OBN%L=BEQSzM?%z#YF}tgdFqL+8U6FBv&(Crth z<%yvbQ$Tm?taN$2_Q>5HJIvWV;dN7(yz>y`cPn198HmT0UXp4k!RNL<(dfARa(P#7 z=5rHZ8t#LLTGnde>-cw4ve{7;R;T4;PIaS15RH}rtv@{4`S}Je{;e!x*lz-qp^#<< zwgD_pgM4#}`a>lsBz4~6rFDxw7EbjM-J0&8^q`Y0y%BHKU!5_qgiBRHfv4*2v_iW8 zOZuDzk;ae9d~zcydYjHM3!;h-@~wg$s@OW#vli#^w)f8rT*WkHzI+^5?+e5B1t;lt z5iG`j|55t>v^+(PSc&QTO<|j`N&p__jAki?2+Sv&c=?5_3f^7?mObn=*~p1aH+|(Q z8skC}KaJ%oorQz7I9TH=emW4%7x;L2IZ{I?G!B%z4#8~3c0{v^{Vy^aYRT7o0-LzH zyb})6>PwTBKQT?E{d8R5${%xFtle;f+jlYew*W%<9?oJo_o2j^E$8dlt?s2XkpI5wp(Rb6T#BQU9aL#fi3 z7X+zlcBTxn7=q=hlJ&FYr&pbnO1XJh*ixwFXrm^Fz22zGEO`1446xVayDPNRmIAB_ zygNRpCQnFfRBAcdU7(t$^vY=)(=w8s`y%0=V+-DYO%a>{xP291uU*I9$ZxSc4{s^5 z@Qr;bcLrSZexw?dP;y{@v%!>5t0zT4-M2|(Ns-h4sV!*BjJT>d34E~SvQdHOUG41B zrZ9m{gDpLMJP)7x>Ns4@ls~!vFCx^a^wIqbUK{b!>H?UjIm$8I*`kygp(wN=Ia?DlKaB4S072wVXH3nY6K$-sBnD|^z+fjo*3*rHI$ zH#zh9uccf-glh1enJ?xVJ`)wHzmX7(cFsB&>u))kG*lh+yV7;uXgUaF`B96Y(zsRd z6JB3|rn{BiUwc_iSx)fjaGO-G15p>>Z794x?|9`tOgGkTeH9;Jlv8(aQG4;fLIWQa z?~mn`v&KN03)O<OAV4`Edq|yF>-aSSGVS&R zXRB=Q$?_|fQnxPzcOAwW!!^z9Me|r#a|eZH_kVx)xpxE9SH0F!Ha_{|t`gCILV=&n zG&t@f+8+J!=f_>Dta`sESH)iWxh=PVG>Xn3Qj;KGH~*p zb=To>c2&zOu(>KdUT~lFRBJ7l)@;33>r`97;mWWIHjWHIAwQNYhWL!;xp#H_+ZA@$ zA7kA(UW@7UpGyad^hkTK;T%2v2v?kydty}V{m!Y)Cu?!_UWPg=^6i_*)f+4r1k8R1 zw6puv1$`O#1Nc+31n;;U$zCd7?k7HIF8$Qt3z6h+svF~PcTz(sVp12Ik9aN4uCBx) z_Q~&>$G?u<=@vPj&Qehh+Z1jKr=sS2B<1C|qG>^^B(GpeD!PZ+r|c8XBPcr>f;7Ea zS^7lZ(VIE`ONw^nK|8Wp&wq-PX5K(Sz5mv)%6#IV+8uSY5+v(_Td94z0&o0|e9EyxIwG z9YzNr5W*`>J9Cnu>5|>ruWu6*S;}79x6cMHIiuP#QHdPW-`h2RL(MELnUZQ&1XU;f- zjD*2y3G%_&kIgR8S=4k@KO=NMiNwPC!hcNqHmp5=z1#`E+sMozEFca{%@<{u;SG=k zQ4%XAztQ89XlivSv(7r`mJ`ERk#y4wsao^ETUq*Ej~( z&ip0fzG!35Ee3R-+5~8({~IE)N`<+K4}v;@tNE%p_>zClGC>EAYhBHnZXx40*#vNk z9Ecz6ES0_vP2Nz^*tX~Z1+Cc>ewPTv3@eYm$y+Y}bZNVZRk^u^f2+S;&nZYukF`u1 zhWzZL0WlW{vd@M93gB*&Y>utH{JO|;R{GT+PO`7$ZeN}lRy{Vph(nox!wl-!e)Z9x z_1XxLEgt-mS9>)BCCF`|{Q=&T+`$J|gt*p9lGOAX6d`mfvz;qRx56k58E|hQ&%h1Kt zNTA;*I9Vq@8cpC5zZ`M2zh+bPfXm8t#;7-0aFAgE&L)7}-S(kUhW)XCt}w8Dyw~b@ zv%32cW}#G%f%(5d8>xvWr)CG%o(XD6&D^sYYiVSrAsm9l>dNiA$@w1~s>WNYJR{|rLkap~`0*C~=-y{uWphivd`0$s`v6f# z-4nEzM9 z_S&%9*X|qT___!9nO(%hXy1lybu>$_)aFm5y0HB1dMYYtjJ3?S^MCqII``a>iD=|6 z3*C5aY`#Y@Z~6jeN3)$1OdMuh&0fI(=j(bR@q=M6%I=WJW9i%ett^`fP<|;t-1ckK zaTijW11i%V)9*ALbm3Lzi;&a|MXh#*>&@fJZqT+|R(c?jtZ!n5m4-77Ijl24&cRaQ z%BUQpyeN+rI)F&I_q#UEFm9iE znW0T?XTIPO75L}QOThU?YgOODUQeqoUS_=r<*T<)Ae+WRAVSu)Y!o;=Xz&F$l5Xdv zx`>UG1t`X-PlJkeLoe8wqFrsu8;GD>$^4c5wJ- z0vnAhyVXisZxi)l#TalyZ`x(-k>5j^Ah5J}1K~J9>rpYpMR?naVDOpeIsgR926Y=_ z<`b*4%YDzQ&55V`X7A)|S21{mZp_q@e{I3k9Ro*IZ<=QqFrV(-$>4vN%A3Osp83@W zZ!5;1UotRP$Tva~sqbd?=0L|Nen06VE`zs*ebWh;I|u-OQ&x!84O+43Wavo;HIu>}3-1d72;E8{| z0Oaa?&C*ho5AmM~&Y|)920;Jr1>nhy)QIKS4JTTI&L>a~2(tsdGsofEEB(24qxssA zZFYrH`1+ZkCFNz3p*!Bs#;hrC9RZSgJ3Ygd`^H5Vhvc<5APJBhWoUi$P3=hW7cjdx zOqY;q_swGO0z}g=K@UeCAONR`FEb2zo46;oG0Nrv~(ClaVwkPRdxR zdKzj>otL;^vP6DP2jNVMhw_hA%a?VOnKcV0b(Ox+#(jEXLsi#XdT{U!TRlP|mH)-K z92Q*%B8~`O;kD6x`Jur<4M0(P`xxxDBG!o8=WlJq`ZYWRr$X6@6N3%iZpzE4YUGT$ zjls!X$K$%~VknaFjckbQ7A7fa`^U$(N>@2~_|bf31CeBfIspia`FJ8`Lf_HwV(AkK zm6tU?;VN(5(u(pv?%k!l6~zvBcu}c&`YtWm?sbU#&y$E=x(|Qyn?U8&m`*2w5|H0o z9Syw^1r)vPYEHg%*Tw__J%;iB4=l|T)aR56y~DdxDjRR~(g@BuAZ+cLWM1jXo2vrabg9{;gg|Jn@-nbOxSNcM=0TtSXB}w? zfgoU}UL6@d&cseTN{4Uh73ucEq87RO={ML52WZAyQBeta9Owp32jnjgC4ew4PHo23 z`S^~Pn0_d9q{d(_wMH2;Kku`7k(Rc*_*j=OI{|xsweBK21cH%#Tg4|9nv2mqXVKtF zR1+&w0hy?)V<|iz)l=l)iTceelPB-5vv;7Trsi=EM0{5F)7ZoS|7lU zpNa@8tE)$^KSs_)unux5Lcxh>+rRYziF%MRNg$m;R&?G9(%9o>-J)D%+B)@tC;tw@ z1eNCC4dT?|$;w;DMtwnwpZD1CwRA~p;rwew2FiE<=<4Qi zXz&cQDG|*uGR}+W=i^wclCuA<0NxyxN6KPG>|}y@Q>S#qV~Kd$G)rxEwoPM~A&MIz z*oO^`Ml4=qCDl)`88^k-lIfl$X2`U*ww`tZ+i5p9@;gaS-+CsPvK0AP zR<)Q!(1vN`7Z3|gPMTb6>G>80r7l$cw#Y)hWBEht8t}UU052rq^|fHds@?$WhhdsT`}B>yhU;pbVpA&# z6PiY`k}T|y8bk$NvbfImP|EK5Niy`B?WXekARG0eI5Y%Tb^M3?tm2O z?wh9tzy`(t0j)Rr_=n5!ft-_>_+@{8Q_XhPN=EQ}H3(haMeN8QUzIq+5n~=X{@RW% zYVfsh)Q_qQ;l<`48``SzVJsGx0--F4)`h96O(pWEy;2}G>WHAxV!Mn=Kkl-}(m@FH zlwW86_J8^!6-IxfR1`zuzRXczo(?~i2gDOZ&H`h=dC>ne1ss|igh|!_GdlRY)uj^x z===s-UB^))+4nkSn)cF{4U5<;M2=w`mOT05eT6Ip5YjRl{^|HD9?>b_6DWJ4myrbIdLnbOJ`3V_)MXJD2}GZE?i47dytcFmfRy|ZL!obGbH;H zY|wl+^!gGjF2;CY&7>l-ezm;TXU<3@XY?Eh*Y6%h=~*1Usv)74q<*t_D&DS&S9ru2 z)ABmW38H+%Jvq@289~@FGkbnz?I#S2xNf&Z~n@(+4gYk6Ll zlNZD%=k$m@@(2ORSLGzOrdyn^xR(~p3*joQ!7;va{c~vyyV~fQaNg(HjefB$5D1bk zRRS)-Vv*=}jl|YiZ3|n0;Ij!PavC!2)KY2LiV#nEG~c6#GV^k)lA%`8FevQ`bnp1@ zjD<-Pv4)`3kfoTSVGzP@b)NNkZGxYN8`sXuwzwD*s%qus{Te%PKF6G>cP1{HpYZ9G zAq!0zB%M>QXgUs>cIUDxv8BHwby=4Gte!1ITJ!~!iSmHG|7>dVOk#$flw~KcQIF|T zps+PUmaKmWP;@>u>o#4XkFC6&2$ Qk9NDJM%N8-`mT@v2a7g)ZvX%Q literal 0 HcmV?d00001 diff --git a/public/img/neocitieslogo.svg b/public/img/neocitieslogo.svg index 3cf7b6d4..45bc6cfb 100644 --- a/public/img/neocitieslogo.svg +++ b/public/img/neocitieslogo.svg @@ -2,225 +2,1394 @@ + width="253px" height="222px" viewBox="0 0 253 222" enable-background="new 0 0 253 222" xml:space="preserve"> + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/neocitieslogotext.svg b/public/img/neocitieslogotext.svg deleted file mode 100644 index f25dafd3..00000000 --- a/public/img/neocitieslogotext.svg +++ /dev/null @@ -1,1477 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/views/press.erb b/views/press.erb index 26389aaa..a7ae0384 100644 --- a/views/press.erb +++ b/views/press.erb @@ -34,15 +34,11 @@

      Brand Assets

      -

      Download SVG

      -
      -
      - -

      Download SVG

      +

      Download: SVG | PNG

      -

      Download SVG

      +

      Download: SVG

      From 7e74f632b9900f63f8808b5113ac4bbe46dc0484 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 10 Nov 2014 20:09:37 -0600 Subject: [PATCH 16/16] Bit more styling to brand assets --- sass/_project-sass/_project-Main.scss | 8 +++++++- views/press.erb | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index e62afc23..58db845d 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -1390,7 +1390,13 @@ a.tag:hover { padding: 25px 40px 40px 40px; } .brand-asset { - margin-bottom: 2.7em; + margin-bottom: 2em; + float: left; + clear: both; + background: rgba(228, 228, 228, 0.42); + width: 100%; + text-align: center; + padding: 26px 0 5px; p { margin-top: 10px; } diff --git a/views/press.erb b/views/press.erb index a7ae0384..6b7f5b39 100644 --- a/views/press.erb +++ b/views/press.erb @@ -32,8 +32,8 @@

      press@neocities.org

      Brand Assets

      -
      - +
      +

      Download: SVG | PNG