From 1104ab5b332f9af9d7f7c20ebbda6137f2b3c0d6 Mon Sep 17 00:00:00 2001
From: Peli de Halleux <jhalleux@microsoft.com>
Date: Fri, 14 Oct 2016 07:21:50 -0700
Subject: [PATCH] updated logos

---
 docs/static/Logo_Calliope_lang.svg | 247 +++++++++++++++++++++--------
 pxtarget.json                      |   6 +-
 2 files changed, 181 insertions(+), 72 deletions(-)

diff --git a/docs/static/Logo_Calliope_lang.svg b/docs/static/Logo_Calliope_lang.svg
index 913a432a..ac5a0b69 100644
--- a/docs/static/Logo_Calliope_lang.svg
+++ b/docs/static/Logo_Calliope_lang.svg
@@ -1,70 +1,179 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 841.9 595.3" enable-background="new 0 0 841.9 595.3" xml:space="preserve">
-<path fill="#4A5261" d="M406.9,292.9l0.2,0l5.6,17l-11.1,0.1L406.9,292.9z M402,281.8l-14.3,42.2l-3.5,0.5l0.1,5.8l16.5-0.1
-	l-0.1-5.8l-3.4-0.6l2.1-6.7l15.7-0.1l2.2,6.6l-3.3,0.6l0,5.8l16.5-0.2l0-5.8l-3.5-0.5l-15-41.9L402,281.8z"/>
-<polygon fill="#4A5261" points="454.9,281.9 445.2,282 440,282 440.1,287.9 445.2,288.8 445.6,323.5 440.4,324.6 440.5,330.4 
-	476.9,330.1 476.7,316.5 469.3,316.6 468.9,322.7 455.3,322.8 454.9,288.7 460.1,287.7 460.1,281.8 "/>
-<polygon fill="#4A5261" points="501.6,281.9 491.9,282 486.7,282 486.8,287.9 491.9,288.8 492.2,323.5 487.1,324.6 487.2,330.4 
-	523.6,330.1 523.4,316.5 516,316.6 515.6,322.7 501.9,322.8 501.6,288.7 506.8,287.7 506.8,281.8 "/>
-<polygon fill="#4A5261" points="533.4,282 533.4,287.9 538.6,288.8 538.9,323.5 533.8,324.6 533.8,330.4 553.9,330.2 553.8,324.4 
-	548.6,323.5 548.3,288.7 553.5,287.7 553.4,281.8 "/>
-<polygon fill="#4A5261" points="674.9,282 669.7,282 669.8,287.9 674.9,288.8 675.2,323.5 670.1,324.6 670.2,330.4 708.4,330.1 
-	708.3,316.8 700.9,316.9 700.6,322.7 684.9,322.8 684.8,309 701.2,308.8 701.1,301.4 684.7,301.5 684.6,289.4 700.1,289.2 
-	700.6,295 708.1,294.9 707.9,281.7 "/>
-<g>
-	<g>
-		<defs>
-			<rect id="SVGID_7_" x="133.2" y="204.1" width="234.3" height="188.7"/>
-		</defs>
-		<clipPath id="SVGID_1_">
-			<use xlink:href="#SVGID_7_"  overflow="visible"/>
-		</clipPath>
-	</g>
-	<g>
-		<defs>
-			<rect id="SVGID_9_" x="133.2" y="204.1" width="234.3" height="188.7"/>
-		</defs>
-		<clipPath id="SVGID_2_">
-			<use xlink:href="#SVGID_9_"  overflow="visible"/>
-		</clipPath>
-	</g>
-	<g>
-		<defs>
-			<rect id="SVGID_11_" x="133.2" y="204.1" width="234.3" height="188.7"/>
-		</defs>
-		<clipPath id="SVGID_3_">
-			<use xlink:href="#SVGID_11_"  overflow="visible"/>
-		</clipPath>
-		<path clip-path="url(#SVGID_3_)" fill="#4A5261" d="M312.3,246.7H277v-33.8c0-3.4,2.8-6.2,6.2-6.2h22.9c3.4,0,6.2,2.8,6.2,6.2
-			V246.7z"/>
-	</g>
-	<rect x="281.8" y="214.8" fill="#8096A1" width="25.8" height="31.8"/>
-	<path fill="#855C33" d="M224.9,230.1V275l52.3,0.2c0,0,0-42.2,0-44.9c0-14.4-11.8-26.2-26.2-26.2
-		C236.6,204.1,224.9,215.7,224.9,230.1"/>
-	<path fill="#26A6AB" d="M294.7,331h-84.1c-26.2,0-37.4-33.3-16.6-49.2l47-35.2h71.3v66.8C312.3,323.2,304.4,331,294.7,331"/>
-	<polygon fill="#42C9C9" points="237.6,273.8 201,276.6 245.6,243.3 	"/>
-	<polygon fill="#F7F5E8" points="235.9,262.7 245.6,243.3 251.7,262.7 	"/>
-	<polygon fill="#F7F5E8" points="251.7,262.7 257.7,243.3 267.4,262.7 	"/>
-	<polygon fill="#BDD1CF" points="265.7,273.8 237.6,273.8 235.9,262.7 267.4,262.7 	"/>
-	<path fill="#F7F5E8" d="M286,331c-2.6-19.3-7.8-42.7-20.1-57.2h-0.1h-14h-14h-0.1c-12.3,14.5-17.6,37.9-20.1,57.2H286z"/>
-	<path fill="#FFCC99" d="M253.9,243.8h-4.5c-4.7,0-8.5-3.8-8.5-8.5v-14.5h21.5v14.5C262.4,240,258.6,243.8,253.9,243.8"/>
-	<path fill="#BDD1CF" d="M238.3,331v-57.2c9.1,21.4,20.4,47.3,34.2,57.2H238.3z"/>
-	<polygon fill="#FFCC99" points="245.6,243.3 251.7,262.7 257.7,243.3 	"/>
-	<polygon fill="#42C9C9" points="281.8,246.7 312.3,246.7 312.3,285.9 	"/>
-</g>
-<path fill="#4A5261" d="M373.2,297.5l-7.2,0.1l-1.1-6.4c-1-0.9-2.2-1.7-3.6-2.2c-1.5-0.5-3.2-0.8-5.1-0.8c-4.2,0-7.4,1.6-9.7,4.7
-	c-2.2,3.1-3.3,7.1-3.3,12l0,1.7c0,4.9,1.2,8.9,3.5,12c2.3,3.1,5.5,4.6,9.6,4.5c1.9,0,3.7-0.3,5.2-0.9c1.6-0.6,2.8-1.3,3.7-2.3
-	l0.9-6.5l7.2-0.1l0.1,9.6c-1.9,2.3-4.4,4.1-7.4,5.5c-3,1.4-6.4,2.1-10.1,2.1c-6.5,0.1-11.8-2.1-16-6.6c-4.2-4.5-6.3-10.2-6.4-17.3
-	l0-1.6c-0.1-7,1.9-12.8,6-17.4c4.1-4.6,9.4-6.9,15.9-6.9c3.7,0,7.1,0.6,10.2,2c3,1.3,5.5,3.1,7.5,5.3L373.2,297.5z"/>
-<path fill="#4A5261" d="M598.7,305c0-5-1.1-9.1-3.2-12.2c-2.1-3.1-5.2-4.6-9.3-4.6c-4.1,0-7.1,1.6-9.1,4.7c-2,3.1-2.9,7.2-2.9,12.3
-	l0,0.8c0,5.1,1.1,9.2,3.2,12.3c2.1,3.1,5.1,4.6,9.2,4.6c4.1,0,7.2-1.6,9.2-4.8c2-3.1,3-7.2,3-12.3L598.7,305z M608.4,305.7
-	c0.1,7.1-1.9,13-5.9,17.6c-4,4.7-9.3,7-15.9,7.1c-6.5,0.1-11.8-2.2-15.9-6.8c-4.1-4.6-6.1-10.4-6.2-17.5l0-0.7
-	c-0.1-7,1.9-12.9,5.9-17.6c4-4.7,9.2-7.1,15.8-7.1c6.6-0.1,11.9,2.2,16,6.8c4.1,4.6,6.2,10.4,6.3,17.5L608.4,305.7z"/>
-<path fill="#4A5261" d="M633.9,305.2l8.2-0.1c2.7,0,4.7-0.8,6.1-2.3c1.4-1.5,2-3.4,2-5.7c0-2.3-0.7-4.2-2.1-5.7
-	c-1.4-1.5-3.5-2.2-6.2-2.2l-8.2,0.1L633.9,305.2z M641.9,281.8c5.5,0,9.9,1.3,13.2,4.1c3.2,2.8,4.9,6.5,4.9,11.1
-	c0,4.6-1.5,8.4-4.7,11.2s-7.5,4.3-13.1,4.3l-8.2,0.1l0.1,10.7l5.2,0.9l0,5.8l-20,0.2l-0.1-5.8l5.1-1l-0.3-34.7l-5.2-1l-0.1-5.9
-	l5.2,0L641.9,281.8z"/>
-</svg>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 525.21599 126.9"
+   enable-background="new 0 0 841.9 595.3"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Logo_Calliope_lang.svg"
+   width="525.216"
+   height="126.9"><metadata
+     id="metadata75"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs73" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1536"
+     inkscape:window-height="801"
+     id="namedview71"
+     showgrid="false"
+     inkscape:zoom="0.34208337"
+     inkscape:cx="420.95001"
+     inkscape:cy="297.64999"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Ebene_1" /><g
+     id="g8135"
+     transform="translate(-183.18441,126.89999)"><path
+       style="fill:#4a5261"
+       inkscape:connector-curvature="0"
+       id="path3"
+       d="m 406.9,-38.099997 0.2,0 5.6,17 -11.1,0.1 5.3,-17.1 z m -4.9,-11.1 -14.3,42.2000002 -3.5,0.5 0.1,5.79999996 16.5,-0.1 -0.1,-5.79999996 -3.4,-0.6 2.1,-6.7000002 15.7,-0.1 2.2,6.6000002 -3.3,0.6 0,5.79999996 16.5,-0.19999996 0,-5.8 -3.5,-0.5 -15,-41.9000002 -10,0.2 z" /><polygon
+       transform="translate(0,-330.99999)"
+       style="fill:#4a5261"
+       id="polygon5"
+       points="440.1,287.9 445.2,288.8 445.6,323.5 440.4,324.6 440.5,330.4 476.9,330.1 476.7,316.5 469.3,316.6 468.9,322.7 455.3,322.8 454.9,288.7 460.1,287.7 460.1,281.8 454.9,281.9 445.2,282 440,282 " /><polygon
+       transform="translate(0,-330.99999)"
+       style="fill:#4a5261"
+       id="polygon7"
+       points="486.8,287.9 491.9,288.8 492.2,323.5 487.1,324.6 487.2,330.4 523.6,330.1 523.4,316.5 516,316.6 515.6,322.7 501.9,322.8 501.6,288.7 506.8,287.7 506.8,281.8 501.6,281.9 491.9,282 486.7,282 " /><polygon
+       transform="translate(0,-330.99999)"
+       style="fill:#4a5261"
+       id="polygon9"
+       points="553.8,324.4 548.6,323.5 548.3,288.7 553.5,287.7 553.4,281.8 533.4,282 533.4,287.9 538.6,288.8 538.9,323.5 533.8,324.6 533.8,330.4 553.9,330.2 " /><polygon
+       transform="translate(0,-330.99999)"
+       style="fill:#4a5261"
+       id="polygon11"
+       points="708.1,294.9 707.9,281.7 674.9,282 669.7,282 669.8,287.9 674.9,288.8 675.2,323.5 670.1,324.6 670.2,330.4 708.4,330.1 708.3,316.8 700.9,316.9 700.6,322.7 684.9,322.8 684.8,309 701.2,308.8 701.1,301.4 684.7,301.5 684.6,289.4 700.1,289.2 700.6,295 " /><g
+       transform="translate(0,-330.99999)"
+       id="g13"><g
+         id="g15"><defs
+           id="defs17"><rect
+             height="188.7"
+             width="234.3"
+             y="204.10001"
+             x="133.2"
+             id="SVGID_7_" /></defs><clipPath
+           id="SVGID_1_"><use
+             height="100%"
+             width="100%"
+             y="0"
+             x="0"
+             style="overflow:visible"
+             id="use21"
+             overflow="visible"
+             xlink:href="#SVGID_7_" /></clipPath></g><g
+         id="g23"><defs
+           id="defs25"><rect
+             height="188.7"
+             width="234.3"
+             y="204.10001"
+             x="133.2"
+             id="SVGID_9_" /></defs><clipPath
+           id="SVGID_2_"><use
+             height="100%"
+             width="100%"
+             y="0"
+             x="0"
+             style="overflow:visible"
+             id="use29"
+             overflow="visible"
+             xlink:href="#SVGID_9_" /></clipPath></g><g
+         id="g31"><defs
+           id="defs33"><rect
+             height="188.7"
+             width="234.3"
+             y="204.10001"
+             x="133.2"
+             id="SVGID_11_" /></defs><clipPath
+           id="SVGID_3_"><use
+             height="100%"
+             width="100%"
+             y="0"
+             x="0"
+             style="overflow:visible"
+             id="use37"
+             overflow="visible"
+             xlink:href="#SVGID_11_" /></clipPath><path
+           style="fill:#4a5261"
+           inkscape:connector-curvature="0"
+           id="path39"
+           d="m 312.3,246.7 -35.3,0 0,-33.8 c 0,-3.4 2.8,-6.2 6.2,-6.2 l 22.9,0 c 3.4,0 6.2,2.8 6.2,6.2 l 0,33.8 z"
+           clip-path="url(#SVGID_3_)" /></g><rect
+         style="fill:#8096a1"
+         id="rect41"
+         height="31.799999"
+         width="25.799999"
+         y="214.8"
+         x="281.79999" /><path
+         style="fill:#855c33"
+         inkscape:connector-curvature="0"
+         id="path43"
+         d="m 224.9,230.1 0,44.9 52.3,0.2 c 0,0 0,-42.2 0,-44.9 0,-14.4 -11.8,-26.2 -26.2,-26.2 -14.4,0 -26.1,11.6 -26.1,26" /><path
+         style="fill:#26a6ab"
+         inkscape:connector-curvature="0"
+         id="path45"
+         d="m 294.7,331 -84.1,0 c -26.2,0 -37.4,-33.3 -16.6,-49.2 l 47,-35.2 71.3,0 0,66.8 c 0,9.8 -7.9,17.6 -17.6,17.6" /><polygon
+         style="fill:#42c9c9"
+         id="polygon47"
+         points="201,276.6 245.6,243.3 237.6,273.8 " /><polygon
+         style="fill:#f7f5e8"
+         id="polygon49"
+         points="245.6,243.3 251.7,262.7 235.9,262.7 " /><polygon
+         style="fill:#f7f5e8"
+         id="polygon51"
+         points="257.7,243.3 267.4,262.7 251.7,262.7 " /><polygon
+         style="fill:#bdd1cf"
+         id="polygon53"
+         points="267.4,262.7 265.7,273.8 237.6,273.8 235.9,262.7 " /><path
+         style="fill:#f7f5e8"
+         inkscape:connector-curvature="0"
+         id="path55"
+         d="m 286,331 c -2.6,-19.3 -7.8,-42.7 -20.1,-57.2 l -0.1,0 -14,0 -14,0 -0.1,0 c -12.3,14.5 -17.6,37.9 -20.1,57.2 l 68.4,0 z" /><path
+         style="fill:#ffcc99"
+         inkscape:connector-curvature="0"
+         id="path57"
+         d="m 253.9,243.8 -4.5,0 c -4.7,0 -8.5,-3.8 -8.5,-8.5 l 0,-14.5 21.5,0 0,14.5 c 0,4.7 -3.8,8.5 -8.5,8.5" /><path
+         style="fill:#bdd1cf"
+         inkscape:connector-curvature="0"
+         id="path59"
+         d="m 238.3,331 0,-57.2 c 9.1,21.4 20.4,47.3 34.2,57.2 l -34.2,0 z" /><polygon
+         style="fill:#ffcc99"
+         id="polygon61"
+         points="251.7,262.7 257.7,243.3 245.6,243.3 " /><polygon
+         style="fill:#42c9c9"
+         id="polygon63"
+         points="312.3,246.7 312.3,285.9 281.8,246.7 " /></g><path
+       style="fill:#4a5261"
+       inkscape:connector-curvature="0"
+       id="path65"
+       d="m 373.2,-33.499997 -7.2,0.1 -1.1,-6.4 c -1,-0.9 -2.2,-1.7 -3.6,-2.2 -1.5,-0.5 -3.2,-0.8 -5.1,-0.8 -4.2,0 -7.4,1.6 -9.7,4.7 -2.2,3.1 -3.3,7.1 -3.3,12 l 0,1.7 c 0,4.9 1.2,8.9 3.5,12 2.3,3.1000002 5.5,4.6000002 9.6,4.5000002 1.9,0 3.7,-0.3 5.2,-0.9 1.6,-0.6 2.8,-1.3000002 3.7,-2.3000002 l 0.9,-6.5 7.2,-0.1 0.1,9.6000002 c -1.9,2.3 -4.4,4.1 -7.4,5.5 -3,1.4 -6.4,2.09999996 -10.1,2.09999996 -6.5,0.1 -11.8,-2.09999996 -16,-6.59999996 -4.2,-4.5000002 -6.3,-10.2000002 -6.4,-17.3000002 l 0,-1.6 c -0.1,-7 1.9,-12.8 6,-17.4 4.1,-4.6 9.4,-6.9 15.9,-6.9 3.7,0 7.1,0.6 10.2,2 3,1.3 5.5,3.1 7.5,5.3 l 0.1,9.5 z" /><path
+       style="fill:#4a5261"
+       inkscape:connector-curvature="0"
+       id="path67"
+       d="m 598.7,-25.999997 c 0,-5 -1.1,-9.1 -3.2,-12.2 -2.1,-3.1 -5.2,-4.6 -9.3,-4.6 -4.1,0 -7.1,1.6 -9.1,4.7 -2,3.1 -2.9,7.2 -2.9,12.3 l 0,0.8 c 0,5.1 1.1,9.2 3.2,12.3 2.1,3.1000002 5.1,4.6000002 9.2,4.6000002 4.1,0 7.2,-1.6 9.2,-4.8000002 2,-3.1 3,-7.2 3,-12.3 l -0.1,-0.8 z m 9.7,0.7 c 0.1,7.1 -1.9,13 -5.9,17.6000002 -4,4.7 -9.3,6.99999996 -15.9,7.09999996 -6.5,0.1 -11.8,-2.19999996 -15.9,-6.79999996 -4.1,-4.6000002 -6.1,-10.4000002 -6.2,-17.5000002 l 0,-0.7 c -0.1,-7 1.9,-12.9 5.9,-17.6 4,-4.7 9.2,-7.1 15.8,-7.1 6.6,-0.1 11.9,2.2 16,6.8 4.1,4.6 6.2,10.4 6.3,17.5 l -0.1,0.7 z" /><path
+       style="fill:#4a5261"
+       inkscape:connector-curvature="0"
+       id="path69"
+       d="m 633.9,-25.799997 8.2,-0.1 c 2.7,0 4.7,-0.8 6.1,-2.3 1.4,-1.5 2,-3.4 2,-5.7 0,-2.3 -0.7,-4.2 -2.1,-5.7 -1.4,-1.5 -3.5,-2.2 -6.2,-2.2 l -8.2,0.1 0.2,15.9 z m 8,-23.4 c 5.5,0 9.9,1.3 13.2,4.1 3.2,2.8 4.9,6.5 4.9,11.1 0,4.6 -1.5,8.4 -4.7,11.2 -3.2,2.8 -7.5,4.3 -13.1,4.3 l -8.2,0.1 0.1,10.7000002 5.2,0.9 0,5.79999996 -20,0.2 -0.1,-5.79999996 5.1,-1 -0.3,-34.7000002 -5.2,-1 -0.1,-5.9 5.2,0 18,0 z" /></g></svg>
\ No newline at end of file
diff --git a/pxtarget.json b/pxtarget.json
index 3e668d77..78e01373 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -214,10 +214,10 @@
         "accentColor": "#249899",
         "defaultLocale": "de",
         "logoUrl": "https://calliope.cc/about",
-        "logo": "./static/Logo_Calliope_Woman.svg",
-        "docsLogo": "./static/Logo_Calliope_Woman.svg",
+        "logo": "./static/Logo_Calliope_lang.svg",
+        "docsLogo": "./static/Logo_Calliope_lang.svg",
         "portraitLogo": "./static/Logo_Calliope_Woman.svg",
-        "footerLogo": "./static/Logo_Calliope_Woman.svg",
+        "footerLogo": "./static/Logo_Calliope_lang.svg",
         "cardLogo": "https://az851932.vo.msecnd.net/pub/drbwxcth",
         "appLogo": "https://az851932.vo.msecnd.net/pub/tbhemtig",
         "organization": "Microsoft",