M-Labs
/
web2019
5
0
Fork 2
Code Issues 20 Pull Requests 3 Releases Wiki Activity

Compare commits

base: M-Labs:83369a9d06ce22f1b011aec68afe2f107758208d
Branches Tags
M-Labs:master
...
compare: M-Labs:573a89908d5e7258b774213c7dc6592889705138
Branches Tags
M-Labs:master

4 Commits
83369a9d06 ... 573a89908d

Author SHA1 Message Date
sovanna 573a89908d fix(Solvespace): Uses env (desktop/mobile) to set TreeJS params 2019-08-04 15:31:40 +02:00
sovanna 6049d15e0b fix(Resources): Updates content to have same card height 2019-08-04 15:13:40 +02:00
sovanna 19ac76de57 fix(image): Updates side-min.png 2019-08-04 15:05:17 +02:00
sovanna 76dccbb8ff fix(ARTIQ): Uses chart SVG 2019-08-04 14:57:59 +02:00
5 changed files with 281 additions and 12 deletions
Show Stats Expand all files Collapse all files

2
content/experiment-control/artiq.md
View File

@ -32,7 +32,7 @@ Modern research on quantum information systems poses particular challenges to th
{% layout_text_img(src="images/comp.svg", alt="comp", textleft=true) %}
{% layout_text_img(src="images/chart.svg", alt="comp", textleft=true) %}
##### Enter ARTIQ

16
content/experiment-control/resources.md
View File

@ -28,19 +28,19 @@ template = "page.html"
{% layout_card(title="ARTIQ Documentation") %}
<small>Older manuals (HTML only)</small>
<a href="https://m-labs.hk/artiq/manual-release-3/" target="_blank" rel="noopener noreferrer">ARTIQ-3</a>
<a href="https://m-labs.hk/artiq/manual-release-3/" target="_blank" rel="noopener noreferrer">ARTIQ-3</a> | <a href="https://m-labs.hk/artiq/manual-release-2/" target="_blank" rel="noopener noreferrer">ARTIQ-2</a>
{% end %}
{% layout_card(title="The ARTIQ experiment control system") %}
&nbsp;
{% layout_card(title="Slideshow") %}
<small>The ARTIQ experiment control system</small>
<a href="/docs/artiq/artiq_overview.pdf" target="_blank" rel="noopener noreferrer">View slides</a>
{% end %}
{% layout_card(title="Timing control in ARTIQ") %}
&nbsp;
{% layout_card(title="Slideshow") %}
<small>Timing control in ARTIQ</small>
<a href="/docs/artiq/slides_timing.pdf" target="_blank" rel="noopener noreferrer">View slides</a>
{% end %}
@ -49,7 +49,7 @@ template = "page.html"
{{ layout_separator_empty(style="margin-top: -200px;") }}
{{ layout_separator_empty(style="margin-top: -100px;") }}
@ -95,9 +95,7 @@ template = "page.html"
{% layout_card(src="images/press@2x.png", css="col-12 col-md-4 text-center") %}
NIST press release
<br>
<a href="https://www.nist.gov/news-events/news/2015/01/open-source-software-quantum-information" target="_blank" rel="noopener noreferrer">Open-Source Software for Quantum Information</a>
<a href="https://www.nist.gov/news-events/news/2015/01/open-source-software-quantum-information" target="_blank" rel="noopener noreferrer">NIST press release</a>
<small>&nbsp;</small>
{% end %}

246
static/images/chart.svg Normal file
View File

@ -0,0 +1,246 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, 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 634 436" enable-background="new 0 0 634 436" xml:space="preserve">
<g>
<path fill="#1A6D93" d="M413.8,217.2c1.1,0,1.9-0.9,1.9-1.9s-0.9-1.9-1.9-1.9s-1.9,0.9-1.9,1.9
C411.9,216.4,412.7,217.2,413.8,217.2z"/>
<path fill="#1A6D93" d="M368.5,179.7l2.2,2c0.1,0,0.1-0.1,0.1-0.1c4.3-3.7,9.2-7,14.5-9.7c6.9-3.4,12.7-5.2,18.4-5.6
c0.5,0,1-0.1,1.5-0.1c1.9,0,3.5,0.3,4.9,1c1.6,0.8,2.4,2,2.4,3.8c0,1.4-0.4,2.7-1.2,4.2c-0.5,1-1.2,2-1.8,3
c-0.3,0.4-0.5,0.8-0.8,1.3l2.1,2c1.7-2.1,3.5-4.7,4.3-7.9c0.1-0.4,0.2-0.8,0.3-1.1c0-0.2,0.1-0.3,0.1-0.5v-1.9c0,0,0-0.1,0-0.1
c0-0.1-0.1-0.2-0.1-0.3c-0.4-2.5-1.9-4.3-4.4-5.5c-1.6-0.7-3.4-0.9-4.9-1c-0.5,0-0.9-0.1-1.4-0.1c-2.5,0-5.1,0.4-7.9,1.1
c-9.7,2.6-18.9,7.4-27.3,14.4c-0.2,0.2-0.4,0.4-0.7,0.6C368.7,179.6,368.6,179.6,368.5,179.7z"/>
<path fill="#1A6D93" d="M374.5,172.6c0.6-0.4,1.2-0.8,1.8-1.2c0.7-0.4,1-1,1.1-1.7c0.8-4.2,2-7.5,3.6-10.4c0.9-1.7,1.9-2.9,3-3.8
c1.9-1.5,3.8-1.5,5.7,0c1.2,0.9,2.1,2.1,2.9,3.6c0.5,0.9,0.9,1.7,1.3,2.6c0.2,0.4,0.4,0.8,0.5,1.1l3-0.8c-0.2-0.5-0.5-1-0.7-1.5
c-0.5-1.2-1.1-2.3-1.7-3.3c-2-3.5-4.3-5.4-7.4-6h-1.7c-2.5,0.5-4.6,2-6.3,4.5c-0.8,1.1-1.4,2.2-2,3.3c-1.5,3.1-2.6,6.6-3.5,11.1
c-0.1,0.6-0.2,1.3-0.3,1.9c-0.1,0.3-0.1,0.5-0.1,0.8C374.1,172.9,374.3,172.8,374.5,172.6z"/>
<path fill="#1A6D93" d="M371.9,200.4c-0.7,0.1-1.3,0.1-1.9,0.2c-0.4,0-0.8,0-1.1,0c-1.5,0-2.8-0.2-4-0.5c-0.2-0.1-0.3-0.1-0.5-0.2
c-2.4-0.9-3.3-2.7-2.9-5.2c0.4-2.3,1.6-4.2,2.8-5.9c0.2-0.3,0.5-0.7,0.7-1c0.1-0.1,0.2-0.3,0.3-0.4l-2.1-2.1
c-1.6,1.9-3.5,4.6-4.3,7.8c-0.7,2.5-0.5,4.7,0.6,6.4s2.9,3,5.4,3.6c1.3,0.3,2.6,0.4,4.1,0.4c0.8,0,1.6-0.1,2.5-0.1
c0.5-0.1,1-0.1,1.6-0.2c0.2,0,0.4-0.1,0.6-0.1l-0.8-2.9C372.4,200.3,372.2,200.3,371.9,200.4z"/>
<path fill="#1A6D93" d="M368.8,200.6c0.3,0,0.7,0,1.1,0C369.5,200.5,369.2,200.6,368.8,200.6z"/>
<path fill="#1A6D93" d="M364.9,200c1.2,0.4,2.5,0.5,4,0.5C367.3,200.6,366,200.4,364.9,200z"/>
<path fill="#1A6D93" d="M368.9,203.6c-1.5,0-2.9-0.2-4.1-0.4C366,203.4,367.4,203.6,368.9,203.6z"/>
<path fill="#1A6D93" d="M371.4,203.4c-0.9,0.1-1.7,0.1-2.5,0.1C369.6,203.6,370.5,203.5,371.4,203.4z"/>
<path fill="#1A6D93" d="M394.9,174.7c-0.1-0.9-0.3-1.7-0.4-2.5c-0.1-0.4-1.2-1.3-1.7-1.3c0,0-0.1,0-0.1,0c-0.9,0.3-1.7,0.7-2.6,1
c-0.3,0.1-0.6,0.2-0.9,0.4l5.8,3.3L394.9,174.7z"/>
<path fill="#1A6D93" d="M376.1,179.9c-0.1,0.1-0.1,0.1-0.2,0.2c-0.1,0.1-0.2,0.2-0.3,0.2c-0.6,0.5-1.2,0.9-1.7,1.3
c-0.6,0.4-0.8,0.9-0.7,1.5c0,0.1,0,0.3,0,0.4c0,0.3,0,0.5,0.1,0.6c0.7,0.6,1.4,1.2,2.2,1.8c0.1,0.1,0.3,0.2,0.4,0.3
c0.1,0.1,0.1,0.1,0.2,0.2c0,0,0.1,0.1,0.1,0.1v-6.7C376.2,179.9,376.1,179.9,376.1,179.9z"/>
<path fill="#1A6D93" d="M381.6,168.4L381.6,168.4c0.7-0.4,1.4-0.7,2.2-1.1l0.8-0.4l-3.6-1.3l-0.8,2.9c0.4,0.2,0.5,0.2,0.7,0.2
c0.1,0,0.2-0.1,0.4-0.1C381.4,168.5,381.5,168.4,381.6,168.4z"/>
<path fill="#1A6D93" d="M381.3,168.5c0.1,0,0.2-0.1,0.2-0.1h0h0C381.5,168.4,381.4,168.5,381.3,168.5z"/>
<path fill="#1A6D93" d="M405.5,187.2l-2.1-2c-0.2,0.5-0.4,3-0.3,4.1L405.5,187.2z"/>
<path fill="#1A6D93" d="M380.4,198.4c-0.1,0-0.1,0-0.1,0c0,0-0.1,0.2,0,0.3c0.2,0.7,0.4,1.3,0.6,2l0.2,0.6l3.1-1.1l-0.6-0.3
c-1-0.5-1.9-1-2.9-1.5C380.5,198.4,380.4,198.4,380.4,198.4z"/>
<path fill="#1A6D93" d="M387,185.4c1.1,0,1.9-0.9,1.9-1.9c0-1-0.9-1.9-1.9-1.9c-1,0-1.9,0.9-1.9,1.9
C385.1,184.5,385.9,185.4,387,185.4z"/>
<path fill="#0D3547" d="M412.7,218.1l3-0.5l1-2.9l-2-2.4l-3,0.5l-1,2.9L412.7,218.1 M385.4,187.9l4.7-0.8l1.7-4.5l-3.1-3.7
l-4.7,0.8l-1.7,4.5L385.4,187.9 M387.1,176c2.2,0,4.3,0.9,5.8,2.7c1.4,1.7,2,3.9,1.6,5.9c0.1,1,0.8,2.9,3.5,6
c0,0,8.3,10.6,14.1,18.1c0.3,0.3,1.4,1.4,2.5,1.8c1,0.2,2,0.7,2.7,1.6c1.7,2,1.4,5-0.6,6.6c-0.9,0.7-2,1.1-3,1.1
c-1.4,0-2.7-0.6-3.6-1.7c-0.7-0.8-1-1.7-1.1-2.7l0,0c0,0,0-0.2,0-0.2c-0.1-1.1-1.1-2.5-1.5-3l-15.4-16.7c-2.6-3.2-4.4-4.2-5.3-4.5
c-2-0.1-4.1-1-5.5-2.7c-2.7-3.2-2.2-8,1-10.6C383.7,176.6,385.4,176,387.1,176"/>
<path fill="#0D3547" d="M362,236.9l1.7-4l1.8,4H362z M363.2,228.3l-5.9,12.7v0.2h3l0.9-1.9h5.3l0.9,1.9h3V241l-5.9-12.7H363.2z"/>
<path fill="#0D3547" d="M378.6,234.8H376v-3.7h0.2c0.3,0,0.5,0,0.8,0c0.5,0,1.1,0,1.6,0c1.1,0,1.6,1,1.6,1.8
C380.2,233.9,379.7,234.8,378.6,234.8z M381.3,236.6c1.6-1,2.3-3.1,1.6-5.1c-0.6-1.9-2.2-3-4.3-3h-5.6v12.7h3v-3.9h2.1l2.3,3.9h3.5
v-0.2l-2.6-4.3L381.3,236.6z"/>
<polygon fill="#0D3547" points="388.9,231.1 388.9,241.3 391.9,241.3 391.9,231.1 395.1,231.1 395.1,228.5 385.7,228.5
385.7,231.1 "/>
<polygon fill="#0D3547" points="397.4,228.5 397.4,231 398.9,231 398.9,238.7 397.2,238.7 397.2,241.3 403.5,241.3 403.5,238.7
401.8,238.7 401.8,231 403.4,231 403.4,228.5 "/>
<path fill="#0D3547" d="M412.6,238.7c-1.7,0-3.5-1.2-3.5-3.8c0-2.6,1.8-3.8,3.5-3.8c1.7,0,3.5,1.2,3.5,3.8
C416.1,237.5,414.3,238.7,412.6,238.7z M418.2,238.7c0.7-1.1,1-2.3,1-3.8c0-4.6-3.4-6.6-6.5-6.6s-6.5,2.1-6.5,6.6
c0,4.5,3.4,6.6,6.5,6.6c1.2,0,2.3-0.3,3.2-0.8l0.2-0.1l0.4,0.7h3.1v-0.2l-1.4-2.3L418.2,238.7z"/>
<path fill="#1A6D93" d="M391.7,197.7L391.7,197.7c-5.1-1.9-10-4.5-14.8-7.8c-5.1-3.5-8.9-6.9-11.9-10.8c-1.8-2.4-2.9-4.3-3.4-6.4
c-0.6-2.4,0-4.3,1.9-5.3c0.5-0.3,1-0.5,1.6-0.6c1.6-0.4,3.3-0.6,5.3-0.4c0.3,0,0.5,0.1,0.8,0.1c0.3,0,0.6,0.1,0.9,0.1l0.7,0.1
l0.8-2.9c-0.2,0-0.4-0.1-0.6-0.1c-0.5-0.1-1-0.1-1.5-0.2c-1-0.1-1.8-0.1-2.6-0.1c-1.8,0-3.4,0.2-4.8,0.7c-3,1-4.8,2.8-5.4,5.5
c-0.4,1.9-0.1,3.8,0.9,6.2c1.3,3,3.2,5.8,6.3,8.8c6.6,6.7,14.6,11.9,24.3,15.8c0.7,0.3,1.3,0.5,2,0.8c0.3,0.1,0.6,0.2,0.9,0.3
l0.5-1.8L391.7,197.7z"/>
<path fill="#1A6D93" d="M415.6,194.8c0-0.1-0.1-0.1-0.1-0.2c-0.2-1.7-0.8-3.4-1.8-5.2c-1.6-3-3.9-5.8-7.1-8.8
c-0.8-0.7-1.6-1.4-2.5-2.2c-0.3-0.3-0.7-0.6-1.1-0.9v0c0,0.1,0,0.1,0,0.2l0,0.8c0,0.9,0.1,1.9,0.1,2.9c0,0.2,0.1,0.3,0.3,0.5
c0.4,0.4,0.9,0.9,1.4,1.3c0.8,0.8,1.6,1.6,2.4,2.4c2.4,2.6,4,5.1,4.9,7.6c0.4,1.2,0.6,2.3,0.4,3.2c-0.2,1.6-1.3,2.7-3.2,3.4
c-0.5,0.2-1,0.3-1.6,0.4l2,2.6c0.3-0.1,0.7-0.2,0.9-0.3c2.6-1,4.1-2.7,4.7-5.2l0.2-0.8V195C415.6,194.8,415.6,194.8,415.6,194.8z"
/>
<path fill="#1A6D93" d="M396.6,170.2c0.1,1,0.3,2.1,0.4,3.1c0.3,2.3,0.6,4.7,0.8,7c0.2,2.3,0.2,4.6,0,7.1l2.7,3.5
c0.1-0.7,0.1-1.4,0.2-2.1c0.4-5.3,0.2-10.4-0.5-15.4c-0.2-1-0.3-2-0.5-3.1c-0.1-0.4-0.2-0.9-0.2-1.4l-3,0.7c0,0.1,0,0.1,0,0.2
C396.5,169.9,396.5,170.1,396.6,170.2z"/>
<path fill="#1A6D93" d="M395.3,201.6c-0.5,1.5-1,3-1.7,4.3c-0.8,1.8-1.9,3.7-3.7,5.3c-1.9,1.6-4,1.6-5.9,0c-1.2-1-2.3-2.4-3.3-4.4
c-1.4-2.7-2.4-5.7-3.3-9.7l0-0.1c0-0.2-0.1-0.4-0.2-0.5c-0.9-0.6-1.8-1.1-2.7-1.7c-0.2-0.1-0.4-0.3-0.7-0.4c0,0.2,0.1,0.4,0.1,0.6
c0.1,0.5,0.2,1,0.3,1.6c1,5.2,2.2,8.9,4.1,12.2c1.6,2.8,3.7,5.8,7.7,6.7h1.7c3.7-0.8,5.8-3.5,7.4-6c0.4-0.7,0.8-1.4,1.1-2
c0.5-1,0.9-2.1,1.4-3.3L395.3,201.6z"/>
</g>
<path fill="none" stroke="#1A6D93" stroke-width="2" stroke-miterlimit="10" d="M382,71.8H148.7c-1.6,0-3-1.3-3-3v-64
c0-1.7,1.4-3,3-3H382c1.6,0,3,1.3,3,3v64C385,70.5,383.7,71.8,382,71.8z"/>
<path fill="none" stroke="#1A6D93" stroke-width="2" stroke-miterlimit="10" d="M628,381.6H394.7c-1.7,0-3-1.4-3-3v-64
c0-1.6,1.3-3,3-3H628c1.7,0,3,1.4,3,3v64C631,380.3,629.7,381.6,628,381.6z"/>
<path fill="#0D3547" d="M598.4,345.8c-0.3-0.3-0.7-0.5-1.2-0.5c-0.5,0-0.9,0.2-1.2,0.5c-0.3,0.3-0.5,0.8-0.5,1.4h3.3
C598.9,346.6,598.7,346.1,598.4,345.8z M595.5,348.7c0,0.7,0.2,1.2,0.6,1.6c0.4,0.4,0.9,0.6,1.6,0.6c0.5,0,1-0.1,1.5-0.2
c0.5-0.1,1-0.3,1.5-0.5v1.8c-0.4,0.2-0.9,0.4-1.3,0.5c-0.5,0.1-1.1,0.2-1.7,0.2c-1.4,0-2.5-0.4-3.3-1.2s-1.2-1.9-1.2-3.3
c0-1.5,0.4-2.6,1.1-3.4c0.7-0.8,1.7-1.2,3-1.2c1.2,0,2.2,0.3,2.9,1.1c0.7,0.7,1,1.7,1,2.9v1.2H595.5z M588.9,348.2
c0-0.9-0.1-1.6-0.4-2c-0.3-0.4-0.8-0.6-1.4-0.6c-1.1,0-1.7,0.9-1.7,2.6c0,0.9,0.1,1.5,0.4,2c0.3,0.4,0.7,0.6,1.3,0.6
c0.6,0,1.1-0.2,1.4-0.6c0.3-0.4,0.4-1,0.4-1.8V348.2z M590,355.4c-0.7,0.6-1.8,1-3.3,1c-1.3,0-2.4-0.2-3.3-0.5v-1.9
c1.1,0.4,2.2,0.7,3.4,0.7c1.2,0,1.8-0.7,1.8-2v-0.2l0.1-1.1h-0.1c-0.6,0.9-1.4,1.3-2.5,1.3c-1,0-1.9-0.4-2.4-1.2
c-0.6-0.8-0.9-1.9-0.9-3.3c0-1.4,0.3-2.5,0.9-3.3c0.6-0.8,1.4-1.2,2.5-1.2c1.1,0,1.9,0.4,2.5,1.3h0.1l0.2-1.1h2v8.7
C591.1,353.8,590.7,354.7,590,355.4z M578.7,348.5l-0.9,0c-0.7,0-1.2,0.1-1.5,0.4c-0.3,0.2-0.5,0.6-0.5,1c0,0.7,0.4,1,1.2,1
c0.6,0,1-0.2,1.3-0.5c0.3-0.3,0.5-0.7,0.5-1.3V348.5z M579.4,352.5l-0.5-1.2h-0.1c-0.4,0.5-0.8,0.9-1.2,1c-0.4,0.2-1,0.3-1.7,0.3
c-0.8,0-1.5-0.2-2-0.7c-0.5-0.5-0.7-1.2-0.7-2c0-0.9,0.3-1.6,1-2c0.6-0.4,1.6-0.7,2.9-0.7l1.5,0v-0.4c0-0.9-0.5-1.3-1.4-1.3
c-0.7,0-1.5,0.2-2.5,0.6l-0.8-1.6c1-0.5,2.1-0.8,3.3-0.8c1.2,0,2.1,0.3,2.7,0.8c0.6,0.5,0.9,1.3,0.9,2.3v5.8H579.4z M569.5,352.5
l-0.3-1.1h-0.1c-0.3,0.4-0.6,0.7-1.1,0.9c-0.5,0.2-1,0.3-1.6,0.3c-1,0-1.8-0.3-2.3-0.8c-0.5-0.5-0.8-1.3-0.8-2.4v-5.7h2.4v5.1
c0,0.6,0.1,1.1,0.3,1.4c0.2,0.3,0.6,0.5,1.1,0.5c0.7,0,1.1-0.2,1.4-0.7c0.3-0.4,0.4-1.2,0.4-2.2v-4.1h2.4v8.7H569.5z M558.6,348.2
c0-0.9-0.1-1.6-0.4-2c-0.3-0.4-0.8-0.6-1.4-0.6c-1.1,0-1.7,0.9-1.7,2.6c0,0.9,0.1,1.5,0.4,2c0.3,0.4,0.7,0.6,1.3,0.6
c0.6,0,1.1-0.2,1.4-0.6c0.3-0.4,0.4-1,0.4-1.8V348.2z M559.7,355.4c-0.7,0.6-1.8,1-3.3,1c-1.3,0-2.4-0.2-3.3-0.5v-1.9
c1.1,0.4,2.2,0.7,3.4,0.7c1.2,0,1.8-0.7,1.8-2v-0.2l0.1-1.1h-0.1c-0.6,0.9-1.4,1.3-2.5,1.3c-1,0-1.9-0.4-2.4-1.2
c-0.6-0.8-0.9-1.9-0.9-3.3c0-1.4,0.3-2.5,0.9-3.3c0.6-0.8,1.4-1.2,2.5-1.2c1.1,0,1.9,0.4,2.5,1.3h0.1l0.2-1.1h2v8.7
C560.8,353.8,560.5,354.7,559.7,355.4z M548.4,352.5v-5.1c0-0.6-0.1-1.1-0.3-1.4c-0.2-0.3-0.6-0.5-1.1-0.5c-0.7,0-1.1,0.2-1.4,0.7
c-0.3,0.4-0.4,1.2-0.4,2.2v4.1h-2.4v-8.7h1.8l0.3,1.1h0.1c0.3-0.4,0.6-0.7,1.1-1c0.5-0.2,1-0.3,1.6-0.3c1,0,1.8,0.3,2.3,0.8
c0.5,0.5,0.8,1.3,0.8,2.4v5.7H548.4z M537.9,348.5l-0.9,0c-0.7,0-1.2,0.1-1.5,0.4c-0.3,0.2-0.5,0.6-0.5,1c0,0.7,0.4,1,1.2,1
c0.6,0,1-0.2,1.3-0.5c0.3-0.3,0.5-0.7,0.5-1.3V348.5z M538.6,352.5l-0.5-1.2h-0.1c-0.4,0.5-0.8,0.9-1.2,1c-0.4,0.2-1,0.3-1.7,0.3
c-0.8,0-1.5-0.2-2-0.7c-0.5-0.5-0.7-1.2-0.7-2c0-0.9,0.3-1.6,1-2c0.6-0.4,1.6-0.7,2.9-0.7l1.5,0v-0.4c0-0.9-0.5-1.3-1.4-1.3
c-0.7,0-1.5,0.2-2.5,0.6l-0.8-1.6c1-0.5,2.1-0.8,3.3-0.8c1.2,0,2.1,0.3,2.7,0.8c0.6,0.5,0.9,1.3,0.9,2.3v5.8H538.6z M524.2,352.5
v-11.4h2.4v9.4h4.6v2H524.2z M515.2,348.2c0-0.9-0.1-1.6-0.4-2c-0.3-0.4-0.8-0.6-1.4-0.6c-0.5,0-0.9,0.2-1.2,0.7
c-0.3,0.5-0.4,1.1-0.4,2c0,0.9,0.1,1.5,0.4,1.9c0.3,0.4,0.7,0.6,1.3,0.6c0.6,0,1.1-0.2,1.3-0.5c0.3-0.4,0.4-1,0.5-1.8V348.2z
M515.6,352.5l-0.5-1.1H515c-0.5,0.9-1.4,1.3-2.5,1.3c-1,0-1.8-0.4-2.4-1.2c-0.6-0.8-0.9-1.9-0.9-3.3c0-1.4,0.3-2.5,0.9-3.3
c0.6-0.8,1.4-1.2,2.5-1.2c1.1,0,1.9,0.4,2.5,1.3h0.1c-0.1-0.6-0.2-1.2-0.2-1.7v-2.8h2.4v12.1H515.6z M505.1,345.8
c-0.3-0.3-0.7-0.5-1.2-0.5c-0.5,0-0.9,0.2-1.2,0.5c-0.3,0.3-0.5,0.8-0.5,1.4h3.3C505.6,346.6,505.4,346.1,505.1,345.8z M502.2,348.7
c0,0.7,0.2,1.2,0.6,1.6c0.4,0.4,0.9,0.6,1.6,0.6c0.5,0,1-0.1,1.5-0.2c0.5-0.1,1-0.3,1.5-0.5v1.8c-0.4,0.2-0.9,0.4-1.3,0.5
c-0.5,0.1-1.1,0.2-1.7,0.2c-1.4,0-2.5-0.4-3.3-1.2c-0.8-0.8-1.2-1.9-1.2-3.3c0-1.5,0.4-2.6,1.1-3.4c0.7-0.8,1.7-1.2,3-1.2
c1.2,0,2.2,0.3,2.9,1.1c0.7,0.7,1,1.7,1,2.9v1.2H502.2z M496.3,350.5c0.2,0.2,0.4,0.2,0.8,0.2c0.4,0,0.9-0.1,1.5-0.3v1.8
c-0.6,0.3-1.3,0.4-2.2,0.4c-1,0-1.6-0.2-2.1-0.7c-0.4-0.5-0.7-1.2-0.7-2.2v-4.2h-1.1v-1l1.3-0.8l0.7-1.8h1.5v1.9h2.4v1.8H496v4.2
C496,350.1,496.1,350.4,496.3,350.5z M488.8,345.8c-0.3-0.3-0.7-0.5-1.2-0.5c-0.5,0-0.9,0.2-1.2,0.5s-0.5,0.8-0.5,1.4h3.3
C489.2,346.6,489.1,346.1,488.8,345.8z M485.8,348.7c0,0.7,0.2,1.2,0.6,1.6c0.4,0.4,0.9,0.6,1.6,0.6c0.5,0,1-0.1,1.5-0.2
c0.5-0.1,1-0.3,1.5-0.5v1.8c-0.4,0.2-0.9,0.4-1.3,0.5c-0.5,0.1-1.1,0.2-1.7,0.2c-1.4,0-2.5-0.4-3.3-1.2s-1.2-1.9-1.2-3.3
c0-1.5,0.4-2.6,1.1-3.4c0.7-0.8,1.7-1.2,3-1.2c1.2,0,2.2,0.3,2.9,1.1c0.7,0.7,1,1.7,1,2.9v1.2H485.8z M482.4,345.9
c-0.2-0.1-0.4-0.1-0.7-0.1c-0.8,0-1.4,0.2-1.8,0.6c-0.4,0.4-0.6,0.9-0.6,1.6v4.4h-2.4v-8.7h1.8l0.4,1.5h0.1c0.3-0.5,0.6-0.9,1.1-1.2
c0.5-0.3,1-0.4,1.5-0.4c0.3,0,0.6,0,0.8,0.1L482.4,345.9z M472.1,346.2c-0.3-0.4-0.7-0.6-1.2-0.6c-0.6,0-1,0.2-1.3,0.5
c-0.3,0.4-0.4,1-0.4,1.8v0.3c0,0.9,0.1,1.6,0.4,2c0.3,0.4,0.7,0.6,1.3,0.6c1.1,0,1.6-0.9,1.6-2.6
C472.5,347.2,472.3,346.6,472.1,346.2z M474.5,350.5c-0.3,0.7-0.7,1.2-1.2,1.6c-0.5,0.4-1.1,0.5-1.8,0.5c-1,0-1.8-0.4-2.4-1.1H469
c0.1,0.7,0.1,1.1,0.1,1.3v3.5h-2.4v-12.6h1.9l0.3,1.1h0.1c0.6-0.9,1.4-1.3,2.5-1.3c1,0,1.8,0.4,2.4,1.2c0.6,0.8,0.9,1.9,0.9,3.3
C474.9,349.1,474.8,349.9,474.5,350.5z M465,345.9c-0.2-0.1-0.4-0.1-0.7-0.1c-0.8,0-1.4,0.2-1.8,0.6c-0.4,0.4-0.6,0.9-0.6,1.6v4.4
h-2.4v-8.7h1.8l0.4,1.5h0.1c0.3-0.5,0.6-0.9,1.1-1.2c0.5-0.3,1-0.4,1.5-0.4c0.3,0,0.6,0,0.8,0.1L465,345.9z M454.9,345.8
c-0.3-0.3-0.7-0.5-1.2-0.5s-0.9,0.2-1.2,0.5c-0.3,0.3-0.5,0.8-0.5,1.4h3.3C455.3,346.6,455.2,346.1,454.9,345.8z M451.9,348.7
c0,0.7,0.2,1.2,0.6,1.6c0.4,0.4,0.9,0.6,1.6,0.6c0.5,0,1-0.1,1.5-0.2c0.5-0.1,1-0.3,1.5-0.5v1.8c-0.4,0.2-0.9,0.4-1.3,0.5
c-0.5,0.1-1.1,0.2-1.7,0.2c-1.4,0-2.5-0.4-3.3-1.2c-0.8-0.8-1.2-1.9-1.2-3.3c0-1.5,0.4-2.6,1.1-3.4c0.7-0.8,1.7-1.2,3-1.2
c1.2,0,2.2,0.3,2.9,1.1c0.7,0.7,1,1.7,1,2.9v1.2H451.9z M446,350.5c0.2,0.2,0.4,0.2,0.8,0.2c0.4,0,0.9-0.1,1.5-0.3v1.8
c-0.6,0.3-1.3,0.4-2.2,0.4c-1,0-1.6-0.2-2.1-0.7c-0.4-0.5-0.7-1.2-0.7-2.2v-4.2h-1.1v-1l1.3-0.8l0.7-1.8h1.5v1.9h2.4v1.8h-2.4v4.2
C445.8,350.1,445.8,350.4,446,350.5z M438.3,352.5v-5.1c0-0.6-0.1-1.1-0.3-1.4c-0.2-0.3-0.6-0.5-1.1-0.5c-0.7,0-1.1,0.2-1.4,0.7
c-0.3,0.4-0.4,1.2-0.4,2.2v4.1h-2.4v-8.7h1.8l0.3,1.1h0.1c0.3-0.4,0.6-0.7,1.1-1c0.5-0.2,1-0.3,1.6-0.3c1,0,1.8,0.3,2.3,0.8
c0.5,0.5,0.8,1.3,0.8,2.4v5.7H438.3z M430.9,351.1v1.4h-5.2v-1.4l1.4-0.6v-7.4l-1.4-0.6v-1.4h5.2v1.4l-1.4,0.6v7.4L430.9,351.1z"/>
<path fill="#0D3547" d="M628.3,432.3c-0.3,0.9-0.8,1.6-1.4,2c-0.6,0.5-1.4,0.7-2.2,0.7c-0.4,0-0.8,0-1.2-0.1V433
c0.3,0.1,0.6,0.1,0.9,0.1c0.4,0,0.8-0.1,1.1-0.4c0.3-0.3,0.6-0.6,0.7-1.2l0.1-0.4l-3.5-8.7h2.6l1.6,4.9c0.1,0.4,0.2,0.9,0.3,1.5h0
c0.1-0.5,0.2-1,0.3-1.5l1.6-4.9h2.6L628.3,432.3z M620.2,429.2c0.2,0.2,0.4,0.2,0.8,0.2c0.4,0,0.9-0.1,1.5-0.3v1.8
c-0.6,0.3-1.3,0.4-2.2,0.4c-1,0-1.6-0.2-2.1-0.7c-0.4-0.5-0.7-1.2-0.7-2.2v-4.2h-1.1v-1l1.3-0.8l0.7-1.8h1.5v1.9h2.4v1.8h-2.4v4.2
C619.9,428.8,620,429,620.2,429.2z M614.7,431.2h-2.4v-8.7h2.4V431.2z M614.5,421c-0.2,0.2-0.5,0.3-1,0.3c-0.9,0-1.3-0.4-1.3-1.2
c0-0.8,0.4-1.2,1.3-1.2c0.9,0,1.3,0.4,1.3,1.2C614.9,420.5,614.7,420.8,614.5,421z M607.8,431.2h-2.4l-3.3-8.7h2.5l1.7,5
c0.2,0.5,0.3,1.1,0.3,1.8h0.1c0-0.6,0.2-1.2,0.4-1.8l1.7-5h2.5L607.8,431.2z M600.8,431.2h-2.4v-8.7h2.4V431.2z M600.6,421
c-0.2,0.2-0.5,0.3-1,0.3c-0.9,0-1.3-0.4-1.3-1.2c0-0.8,0.4-1.2,1.3-1.2c0.9,0,1.3,0.4,1.3,1.2C600.9,420.5,600.8,420.8,600.6,421z
M594.5,424.2c-0.4-0.1-0.8-0.2-1.2-0.2c-0.7,0-1.1,0.2-1.1,0.6c0,0.2,0.1,0.4,0.3,0.6s0.7,0.4,1.5,0.7c0.7,0.3,1.2,0.5,1.5,0.8
c0.3,0.2,0.6,0.5,0.7,0.8c0.2,0.3,0.2,0.7,0.2,1.1c0,0.9-0.3,1.6-0.9,2c-0.6,0.5-1.6,0.7-2.8,0.7c-0.6,0-1.2,0-1.6-0.1
c-0.4-0.1-0.9-0.2-1.3-0.4v-2c0.4,0.2,0.9,0.4,1.5,0.5c0.6,0.1,1,0.2,1.5,0.2c0.9,0,1.3-0.3,1.3-0.8c0-0.2-0.1-0.3-0.2-0.5
c-0.1-0.1-0.3-0.2-0.6-0.4c-0.3-0.2-0.7-0.3-1.1-0.5c-0.7-0.3-1.2-0.5-1.5-0.8c-0.3-0.2-0.5-0.5-0.7-0.8c-0.1-0.3-0.2-0.7-0.2-1.1
c0-0.8,0.3-1.4,0.9-1.8c0.6-0.4,1.5-0.6,2.6-0.6c1.1,0,2.1,0.2,3.1,0.7l-0.7,1.7C595.3,424.5,594.9,424.3,594.5,424.2z M586.6,424.2
c-0.4-0.1-0.8-0.2-1.2-0.2c-0.7,0-1.1,0.2-1.1,0.6c0,0.2,0.1,0.4,0.3,0.6c0.2,0.2,0.7,0.4,1.5,0.7c0.7,0.3,1.2,0.5,1.5,0.8
c0.3,0.2,0.6,0.5,0.7,0.8c0.2,0.3,0.2,0.7,0.2,1.1c0,0.9-0.3,1.6-0.9,2c-0.6,0.5-1.6,0.7-2.8,0.7c-0.6,0-1.2,0-1.6-0.1
c-0.4-0.1-0.9-0.2-1.3-0.4v-2c0.4,0.2,0.9,0.4,1.5,0.5c0.6,0.1,1,0.2,1.5,0.2c0.9,0,1.3-0.3,1.3-0.8c0-0.2-0.1-0.3-0.2-0.5
c-0.1-0.1-0.3-0.2-0.6-0.4c-0.3-0.2-0.7-0.3-1.1-0.5c-0.7-0.3-1.2-0.5-1.5-0.8c-0.3-0.2-0.5-0.5-0.7-0.8c-0.1-0.3-0.2-0.7-0.2-1.1
c0-0.8,0.3-1.4,0.9-1.8c0.6-0.4,1.5-0.6,2.6-0.6c1.1,0,2.1,0.2,3.1,0.7l-0.7,1.7C587.3,424.5,586.9,424.3,586.6,424.2z M577.9,424.4
c-0.3-0.3-0.7-0.5-1.2-0.5c-0.5,0-0.9,0.2-1.2,0.5c-0.3,0.3-0.5,0.8-0.5,1.4h3.3C578.3,425.2,578.2,424.8,577.9,424.4z M574.9,427.4
c0,0.7,0.2,1.2,0.6,1.6c0.4,0.4,0.9,0.6,1.6,0.6c0.5,0,1-0.1,1.5-0.2c0.5-0.1,1-0.3,1.5-0.5v1.8c-0.4,0.2-0.9,0.4-1.3,0.5
c-0.5,0.1-1.1,0.2-1.7,0.2c-1.4,0-2.5-0.4-3.3-1.2c-0.8-0.8-1.2-1.9-1.2-3.3c0-1.5,0.4-2.6,1.1-3.4c0.7-0.8,1.7-1.2,3-1.2
c1.2,0,2.2,0.4,2.9,1.1c0.7,0.7,1,1.7,1,2.9v1.2H574.9z M571.4,424.6c-0.2-0.1-0.4-0.1-0.7-0.1c-0.8,0-1.4,0.2-1.8,0.6
c-0.4,0.4-0.6,0.9-0.6,1.6v4.4H566v-8.7h1.8l0.3,1.5h0.1c0.3-0.5,0.6-0.9,1.1-1.2c0.5-0.3,1-0.5,1.5-0.5c0.3,0,0.6,0,0.8,0.1
L571.4,424.6z M561.2,424.8c-0.3-0.4-0.7-0.6-1.2-0.6c-0.6,0-1,0.2-1.3,0.5c-0.3,0.4-0.4,1-0.4,1.8v0.3c0,0.9,0.1,1.6,0.4,2
c0.3,0.4,0.7,0.6,1.3,0.6c1.1,0,1.6-0.9,1.6-2.6C561.6,425.9,561.4,425.2,561.2,424.8z M563.6,429.2c-0.3,0.7-0.7,1.2-1.2,1.6
c-0.5,0.4-1.1,0.5-1.8,0.5c-1,0-1.8-0.4-2.4-1.1h-0.1c0.1,0.7,0.1,1.1,0.1,1.3v3.5h-2.4v-12.6h1.9l0.3,1.1h0.1
c0.6-0.9,1.4-1.3,2.5-1.3c1,0,1.8,0.4,2.4,1.2c0.6,0.8,0.9,1.9,0.9,3.3C564,427.7,563.9,428.5,563.6,429.2z M554.5,431.2h-2.7
l-1.8-3l-1.8,3h-2.7l3-4.5l-2.8-4.3h2.7l1.7,2.8l1.7-2.8h2.7l-2.8,4.3L554.5,431.2z M544.4,429.2v2h-6.6v-11.4h6.6v2h-4.2v2.5h3.9v2
h-3.9v2.9H544.4z"/>
<path fill="#0D3547" d="M626.8,411.2v-9l7.2,4.5L626.8,411.2z M117.9,407.7v-2.1h508.8v2.1H117.9z M114.7,8.2l4.2-7.2l4.2,7.2H114.7
z M117.9,407.2V8.2h2v398.9H117.9z"/>
<path fill="#0D3547" d="M348.6,42.8v-5.1c0-0.6-0.1-1.1-0.3-1.4c-0.2-0.3-0.6-0.5-1.1-0.5c-0.7,0-1.1,0.2-1.4,0.7
c-0.3,0.4-0.4,1.2-0.4,2.2v4.1h-2.4v-8.7h1.8l0.3,1.1h0.1c0.3-0.4,0.6-0.7,1.1-1c0.5-0.2,1-0.3,1.6-0.3c1,0,1.8,0.3,2.3,0.8
c0.5,0.6,0.8,1.3,0.8,2.4v5.7H348.6z M338.2,38.5c0-0.9-0.1-1.6-0.4-2c-0.3-0.4-0.8-0.6-1.4-0.6c-1.1,0-1.7,0.9-1.7,2.6
c0,0.9,0.1,1.5,0.4,2c0.3,0.4,0.7,0.6,1.3,0.6c0.6,0,1.1-0.2,1.4-0.5c0.3-0.4,0.4-1,0.4-1.8V38.5z M339.3,45.7c-0.7,0.6-1.8,1-3.3,1
c-1.3,0-2.4-0.2-3.3-0.5v-1.9c1.1,0.4,2.2,0.7,3.4,0.7c1.2,0,1.8-0.7,1.8-2v-0.2l0.1-1.1H338c-0.6,0.9-1.4,1.3-2.5,1.3
c-1,0-1.9-0.4-2.4-1.2c-0.6-0.8-0.9-1.9-0.9-3.3c0-1.4,0.3-2.5,0.9-3.3c0.6-0.8,1.4-1.2,2.5-1.2c1.1,0,1.9,0.4,2.5,1.3h0.1l0.2-1.1
h2v8.7C340.4,44.1,340.1,45,339.3,45.7z M330.3,42.8h-2.4v-8.7h2.4V42.8z M330.1,32.7c-0.2,0.2-0.5,0.3-1,0.3
c-0.9,0-1.3-0.4-1.3-1.2c0-0.8,0.4-1.2,1.3-1.2c0.9,0,1.3,0.4,1.3,1.2C330.4,32.2,330.3,32.5,330.1,32.7z M324,35.8
c-0.4-0.1-0.8-0.2-1.2-0.2c-0.7,0-1.1,0.2-1.1,0.6c0,0.2,0.1,0.4,0.3,0.6c0.2,0.2,0.7,0.4,1.5,0.7c0.7,0.3,1.2,0.5,1.5,0.8
c0.3,0.2,0.6,0.5,0.7,0.8c0.2,0.3,0.2,0.7,0.2,1.1c0,0.9-0.3,1.6-0.9,2c-0.6,0.5-1.6,0.7-2.8,0.7c-0.6,0-1.2,0-1.6-0.1
c-0.4-0.1-0.9-0.2-1.3-0.4v-2c0.4,0.2,0.9,0.4,1.5,0.5c0.6,0.1,1,0.2,1.5,0.2c0.9,0,1.3-0.2,1.3-0.7c0-0.2-0.1-0.3-0.2-0.5
c-0.1-0.1-0.3-0.3-0.6-0.4c-0.3-0.1-0.7-0.3-1.1-0.5c-0.7-0.3-1.2-0.5-1.5-0.8c-0.3-0.2-0.5-0.5-0.7-0.8c-0.1-0.3-0.2-0.7-0.2-1.1
c0-0.8,0.3-1.4,0.9-1.8c0.6-0.4,1.5-0.6,2.6-0.6c1.1,0,2.1,0.2,3.1,0.7l-0.7,1.7C324.8,36.1,324.4,36,324,35.8z M315.4,36.1
c-0.3-0.3-0.7-0.5-1.2-0.5c-0.5,0-0.9,0.2-1.2,0.5c-0.3,0.3-0.5,0.8-0.5,1.4h3.3C315.8,36.8,315.6,36.4,315.4,36.1z M312.4,39
c0,0.7,0.2,1.2,0.6,1.6c0.4,0.4,0.9,0.6,1.6,0.6c0.5,0,1-0.1,1.5-0.2c0.5-0.1,1-0.3,1.5-0.5v1.8c-0.4,0.2-0.9,0.4-1.3,0.5
c-0.5,0.1-1.1,0.2-1.7,0.2c-1.4,0-2.5-0.4-3.3-1.2c-0.8-0.8-1.2-1.9-1.2-3.3c0-1.5,0.4-2.6,1.1-3.4c0.7-0.8,1.7-1.2,3-1.2
c1.2,0,2.2,0.4,2.9,1.1c0.7,0.7,1,1.7,1,2.9V39H312.4z M302.6,33.4h-1.3v7.4h1c2.3,0,3.5-1.3,3.5-3.8
C305.9,34.6,304.8,33.4,302.6,33.4z M306.8,41.3c-1.1,1-2.6,1.5-4.6,1.5h-3.2V31.4h3.6c1.9,0,3.3,0.5,4.3,1.5c1,1,1.5,2.4,1.5,4.1
C308.4,38.8,307.8,40.3,306.8,41.3z M288,33.9c-0.1-0.3-0.2-0.6-0.2-0.8c-0.2,0.7-0.7,2.3-1.5,4.9h3C288.5,35.6,288.1,34.2,288,33.9
z M290.7,42.8l-0.8-2.7h-4.2l-0.8,2.7h-2.6l4-11.5h3l4,11.5H290.7z M276.5,38.4v-2h4.5v5.9c-0.7,0.2-1.4,0.4-2.1,0.5
c-0.6,0.1-1.3,0.1-2,0.1c-1.7,0-3-0.5-3.9-1.5c-0.9-1-1.4-2.5-1.4-4.4c0-1.8,0.5-3.3,1.6-4.3c1.1-1,2.5-1.5,4.4-1.5
c1.2,0,2.3,0.2,3.4,0.7l-0.8,1.9c-0.8-0.4-1.7-0.6-2.6-0.6c-1,0-1.9,0.4-2.5,1.1c-0.6,0.7-0.9,1.6-0.9,2.8c0,1.2,0.3,2.2,0.8,2.8
c0.5,0.7,1.2,1,2.2,1c0.5,0,1-0.1,1.5-0.2v-2.4H276.5z M267.1,33.8c-0.3-0.3-0.8-0.4-1.5-0.4h-1.1v3.4h0.8c0.7,0,1.3-0.1,1.7-0.4
c0.4-0.3,0.6-0.7,0.6-1.3C267.6,34.4,267.4,34,267.1,33.8z M268.9,37.7c-0.8,0.6-1.9,1-3.3,1h-1v4.1h-2.4V31.4h3.6
c1.4,0,2.4,0.3,3.2,0.9c0.7,0.6,1.1,1.5,1.1,2.7C270,36.2,269.6,37.1,268.9,37.7z M255.7,33.4v2.9h3.9v2h-3.9v4.5h-2.4V31.4h6.5v2
H255.7z M244.2,42.8v-5.1c0-0.6-0.1-1.1-0.3-1.4c-0.2-0.3-0.5-0.5-1-0.5c-0.6,0-1,0.2-1.3,0.6c-0.3,0.4-0.4,1.1-0.4,2v4.4h-2.4v-5.1
c0-0.6-0.1-1.1-0.3-1.4c-0.2-0.3-0.5-0.5-1-0.5c-0.6,0-1.1,0.2-1.3,0.7c-0.3,0.4-0.4,1.2-0.4,2.2v4.1h-2.4v-8.7h1.8l0.3,1.1h0.1
c0.2-0.4,0.6-0.7,1-0.9c0.4-0.2,0.9-0.3,1.5-0.3c1.3,0,2.2,0.4,2.7,1.3h0.2c0.2-0.4,0.6-0.7,1-0.9c0.5-0.2,1-0.3,1.5-0.3
c1,0,1.7,0.3,2.2,0.8c0.5,0.5,0.8,1.3,0.8,2.4v5.7H244.2z M228.5,36.5c-0.3-0.4-0.7-0.6-1.4-0.6c-0.6,0-1.1,0.2-1.4,0.6
c-0.3,0.4-0.4,1.1-0.4,1.9c0,0.9,0.1,1.5,0.4,2c0.3,0.4,0.7,0.7,1.4,0.7c0.6,0,1.1-0.2,1.4-0.7c0.3-0.4,0.4-1.1,0.4-2
C228.9,37.5,228.8,36.9,228.5,36.5z M230.2,41.7c-0.7,0.8-1.8,1.2-3.1,1.2c-0.8,0-1.6-0.2-2.2-0.6c-0.6-0.4-1.1-0.9-1.5-1.6
c-0.3-0.7-0.5-1.5-0.5-2.4c0-1.4,0.4-2.5,1.1-3.3c0.7-0.8,1.8-1.2,3.1-1.2c0.8,0,1.6,0.2,2.2,0.5c0.6,0.4,1.1,0.9,1.5,1.6
c0.3,0.7,0.5,1.5,0.5,2.4C231.4,39.8,231,40.9,230.2,41.7z M219.4,40.8c0.2,0.2,0.4,0.2,0.8,0.2c0.4,0,0.9-0.1,1.5-0.3v1.8
c-0.6,0.3-1.3,0.4-2.2,0.4c-1,0-1.6-0.2-2.1-0.7c-0.4-0.5-0.7-1.2-0.7-2.2v-4.2h-1.1v-1l1.3-0.8l0.7-1.8h1.5v1.9h2.4v1.8h-2.4v4.2
C219.1,40.4,219.2,40.6,219.4,40.8z M212.6,35.8c-0.4-0.1-0.8-0.2-1.2-0.2c-0.7,0-1.1,0.2-1.1,0.6c0,0.2,0.1,0.4,0.3,0.6
c0.2,0.2,0.7,0.4,1.5,0.7c0.7,0.3,1.2,0.5,1.5,0.8c0.3,0.2,0.6,0.5,0.7,0.8c0.2,0.3,0.2,0.7,0.2,1.1c0,0.9-0.3,1.6-0.9,2
c-0.6,0.5-1.6,0.7-2.8,0.7c-0.6,0-1.2,0-1.6-0.1c-0.4-0.1-0.9-0.2-1.3-0.4v-2c0.4,0.2,0.9,0.4,1.5,0.5c0.6,0.1,1,0.2,1.5,0.2
c0.9,0,1.3-0.2,1.3-0.7c0-0.2-0.1-0.3-0.2-0.5c-0.1-0.1-0.3-0.3-0.6-0.4c-0.3-0.1-0.7-0.3-1.1-0.5c-0.7-0.3-1.2-0.5-1.5-0.8
c-0.3-0.2-0.5-0.5-0.7-0.8c-0.1-0.3-0.2-0.7-0.2-1.1c0-0.8,0.3-1.4,0.9-1.8c0.6-0.4,1.5-0.6,2.6-0.6c1.1,0,2.1,0.2,3.1,0.7l-0.7,1.7
C213.4,36.1,213,36,212.6,35.8z M204.2,42.8l-0.3-1.1h-0.1c-0.3,0.4-0.6,0.7-1.1,0.9c-0.5,0.2-1,0.3-1.6,0.3c-1,0-1.8-0.3-2.3-0.8
c-0.5-0.5-0.8-1.3-0.8-2.4v-5.7h2.4v5.1c0,0.6,0.1,1.1,0.3,1.4c0.2,0.3,0.6,0.5,1.1,0.5c0.7,0,1.1-0.2,1.4-0.7
c0.3-0.4,0.4-1.2,0.4-2.2v-4.1h2.4v8.7H204.2z M195.5,34c-0.4-0.2-0.9-0.4-1.3-0.5c-0.4-0.2-0.9-0.2-1.3-0.2c-0.9,0-1.6,0.3-2.1,1
c-0.5,0.7-0.7,1.6-0.7,2.9c0,2.5,1,3.8,2.9,3.8c0.8,0,1.8-0.2,2.9-0.6v2c-0.9,0.4-2,0.6-3.1,0.6c-1.7,0-2.9-0.5-3.8-1.5
c-0.9-1-1.3-2.5-1.3-4.3c0-1.2,0.2-2.2,0.6-3.1c0.4-0.9,1.1-1.6,1.9-2.1c0.8-0.5,1.8-0.7,2.8-0.7c1.1,0,2.2,0.3,3.3,0.8L195.5,34z"
/>
<path fill="#0D3547" d="M100.1,31.3c-0.3-0.3-0.7-0.5-1.2-0.5s-0.9,0.2-1.2,0.5c-0.3,0.3-0.4,0.8-0.5,1.4h3.3
C100.5,32,100.3,31.6,100.1,31.3z M97.1,34.2c0,0.7,0.2,1.2,0.6,1.6c0.4,0.4,0.9,0.6,1.6,0.6c0.5,0,1-0.1,1.5-0.2
c0.5-0.1,1-0.3,1.5-0.5v1.8c-0.4,0.2-0.9,0.4-1.3,0.5c-0.5,0.1-1.1,0.2-1.7,0.2c-1.4,0-2.5-0.4-3.3-1.2c-0.8-0.8-1.2-1.9-1.2-3.3
c0-1.5,0.4-2.6,1.1-3.4c0.7-0.8,1.7-1.2,3-1.2c1.2,0,2.2,0.3,2.9,1.1c0.7,0.7,1,1.7,1,2.9v1.2H97.1z M92.8,31.5
c-0.4-0.2-0.7-0.3-1-0.4c-0.3-0.1-0.6-0.1-1-0.1c-1.2,0-1.9,0.9-1.9,2.6c0,1.7,0.6,2.6,1.9,2.6c0.5,0,0.9-0.1,1.3-0.2
c0.4-0.1,0.8-0.3,1.2-0.6v2c-0.4,0.2-0.8,0.4-1.2,0.5c-0.4,0.1-0.9,0.1-1.5,0.1c-2.7,0-4.1-1.5-4.1-4.5c0-1.5,0.4-2.6,1.1-3.4
c0.7-0.8,1.8-1.2,3.2-1.2c1,0,1.9,0.2,2.7,0.6L92.8,31.5z M82.2,38v-5.1c0-0.6-0.1-1.1-0.3-1.4c-0.2-0.3-0.6-0.5-1.1-0.5
c-0.7,0-1.1,0.2-1.4,0.7c-0.3,0.4-0.4,1.2-0.4,2.2V38h-2.4v-8.7h1.8l0.3,1.1h0.1c0.3-0.4,0.6-0.7,1.1-1c0.5-0.2,1-0.3,1.6-0.3
c1,0,1.8,0.3,2.3,0.8c0.5,0.6,0.8,1.3,0.8,2.4V38H82.2z M71.7,33.9l-0.9,0c-0.7,0-1.2,0.1-1.5,0.4c-0.3,0.2-0.5,0.6-0.5,1
c0,0.7,0.4,1,1.2,1c0.6,0,1-0.2,1.3-0.5c0.3-0.3,0.5-0.7,0.5-1.3V33.9z M72.4,38l-0.5-1.2h-0.1c-0.4,0.5-0.8,0.9-1.2,1.1
c-0.4,0.2-1,0.3-1.7,0.3c-0.8,0-1.5-0.2-2-0.7c-0.5-0.5-0.7-1.2-0.7-2c0-0.9,0.3-1.6,1-2.1c0.6-0.4,1.6-0.7,2.9-0.7l1.5,0v-0.4
c0-0.9-0.5-1.3-1.4-1.3c-0.7,0-1.5,0.2-2.5,0.6l-0.8-1.6c1-0.5,2.1-0.8,3.3-0.8c1.2,0,2.1,0.3,2.7,0.8c0.6,0.5,0.9,1.3,0.9,2.3V38
H72.4z M62,38v-5.1c0-0.6-0.1-1.1-0.3-1.4c-0.2-0.3-0.5-0.5-1-0.5c-0.6,0-1,0.2-1.3,0.6c-0.3,0.4-0.4,1.1-0.4,2V38h-2.4v-5.1
c0-0.6-0.1-1.1-0.3-1.4c-0.2-0.3-0.5-0.5-1-0.5c-0.6,0-1.1,0.2-1.3,0.7c-0.3,0.4-0.4,1.2-0.4,2.2V38h-2.4v-8.7H53l0.3,1.1h0.1
c0.2-0.4,0.6-0.7,1-0.9c0.4-0.2,0.9-0.3,1.5-0.3c1.3,0,2.2,0.4,2.7,1.3h0.2c0.2-0.4,0.6-0.7,1-0.9c0.5-0.2,1-0.3,1.5-0.3
c1,0,1.7,0.3,2.2,0.8c0.5,0.5,0.8,1.3,0.8,2.4V38H62z M49.4,31.4c-0.2-0.1-0.4-0.1-0.7-0.1c-0.8,0-1.4,0.2-1.8,0.6
c-0.4,0.4-0.6,0.9-0.6,1.6V38h-2.4v-8.7h1.8l0.4,1.5h0.1c0.3-0.5,0.6-0.9,1.1-1.2c0.5-0.3,1-0.4,1.5-0.4c0.3,0,0.6,0,0.8,0.1
L49.4,31.4z M39.1,31.6c-0.3-0.4-0.7-0.6-1.4-0.6c-0.6,0-1.1,0.2-1.4,0.6c-0.3,0.4-0.4,1.1-0.4,1.9c0,0.9,0.1,1.5,0.4,2
c0.3,0.4,0.7,0.7,1.4,0.7c0.6,0,1.1-0.2,1.4-0.7c0.3-0.4,0.4-1.1,0.4-2C39.5,32.7,39.4,32.1,39.1,31.6z M40.8,36.9
c-0.7,0.8-1.8,1.2-3.1,1.2c-0.8,0-1.6-0.2-2.2-0.6c-0.6-0.4-1.1-0.9-1.5-1.6s-0.5-1.5-0.5-2.4c0-1.4,0.4-2.5,1.1-3.3
c0.7-0.8,1.8-1.2,3.1-1.2c0.8,0,1.6,0.2,2.2,0.5c0.6,0.4,1.1,0.9,1.5,1.6c0.3,0.7,0.5,1.5,0.5,2.4C41.9,35,41.6,36.1,40.8,36.9z
M32.9,27.8c-0.5-0.2-0.9-0.2-1.3-0.2c-0.3,0-0.6,0.1-0.7,0.3c-0.2,0.2-0.2,0.5-0.2,0.8v0.5h2.1V31h-2.1V38h-2.4V31h-1.3v-1.1
l1.3-0.6v-0.6c0-1,0.2-1.7,0.7-2.2c0.5-0.5,1.3-0.7,2.3-0.7c0.8,0,1.6,0.1,2.2,0.4L32.9,27.8z M26,31.4c-0.2-0.1-0.4-0.1-0.7-0.1
c-0.8,0-1.4,0.2-1.8,0.6c-0.4,0.4-0.6,0.9-0.6,1.6V38h-2.4v-8.7h1.8l0.4,1.5h0.1c0.3-0.5,0.6-0.9,1.1-1.2c0.5-0.3,1-0.4,1.5-0.4
c0.3,0,0.6,0,0.8,0.1L26,31.4z M15.9,31.3c-0.3-0.3-0.7-0.5-1.2-0.5c-0.5,0-0.9,0.2-1.2,0.5c-0.3,0.3-0.5,0.8-0.5,1.4h3.3
C16.4,32,16.2,31.6,15.9,31.3z M13,34.2c0,0.7,0.2,1.2,0.6,1.6c0.4,0.4,0.9,0.6,1.6,0.6c0.5,0,1-0.1,1.5-0.2c0.5-0.1,1-0.3,1.5-0.5
v1.8c-0.4,0.2-0.9,0.4-1.3,0.5c-0.5,0.1-1.1,0.2-1.7,0.2c-1.4,0-2.5-0.4-3.3-1.2c-0.8-0.8-1.2-1.9-1.2-3.3c0-1.5,0.4-2.6,1.1-3.4
c0.7-0.8,1.7-1.2,3-1.2c1.2,0,2.2,0.3,2.9,1.1c0.7,0.7,1,1.7,1,2.9v1.2H13z M6.2,28.9c-0.3-0.3-0.8-0.4-1.5-0.4H3.7v3.4h0.8
c0.7,0,1.3-0.1,1.7-0.4c0.4-0.3,0.6-0.7,0.6-1.3C6.7,29.6,6.5,29.2,6.2,28.9z M8,32.9c-0.8,0.6-1.9,1-3.3,1h-1V38H1.3V26.6h3.6
c1.4,0,2.4,0.3,3.2,0.9c0.7,0.6,1.1,1.5,1.1,2.7C9.1,31.3,8.8,32.3,8,32.9z M100,9.6c0-0.9-0.1-1.6-0.4-2C99.2,7.2,98.8,7,98.1,7
c-1.1,0-1.7,0.9-1.7,2.6c0,0.9,0.1,1.5,0.4,2c0.3,0.4,0.7,0.6,1.3,0.6c0.6,0,1.1-0.2,1.4-0.6c0.3-0.4,0.4-1,0.4-1.8V9.6z
M101.1,16.8c-0.7,0.6-1.8,1-3.3,1c-1.3,0-2.4-0.2-3.3-0.5v-1.9c1.1,0.4,2.2,0.7,3.4,0.7c1.2,0,1.8-0.7,1.8-2v-0.2l0.1-1.1h-0.1
c-0.6,0.9-1.4,1.3-2.5,1.3c-1,0-1.9-0.4-2.4-1.2C94.3,12.1,94,11,94,9.6c0-1.4,0.3-2.5,0.9-3.3s1.4-1.2,2.5-1.2
c1.1,0,1.9,0.4,2.5,1.3h0.1l0.2-1.1h2V14C102.2,15.2,101.8,16.2,101.1,16.8z M89.7,14V8.9c0-0.6-0.1-1.1-0.3-1.4
C89.2,7.1,88.8,7,88.3,7c-0.7,0-1.1,0.2-1.4,0.7c-0.3,0.4-0.4,1.2-0.4,2.2V14h-2.4V5.2h1.8l0.3,1.1h0.1c0.3-0.4,0.6-0.7,1.1-1
c0.5-0.2,1-0.3,1.6-0.3c1,0,1.8,0.3,2.3,0.8c0.5,0.5,0.8,1.3,0.8,2.4V14H89.7z M81.6,14h-2.4V5.2h2.4V14z M81.3,3.8
c-0.2,0.2-0.5,0.3-1,0.3c-0.9,0-1.3-0.4-1.3-1.2c0-0.8,0.4-1.2,1.3-1.2c0.9,0,1.3,0.4,1.3,1.2C81.7,3.4,81.6,3.6,81.3,3.8z M74.3,14
V8.9c0-0.6-0.1-1.1-0.3-1.4C73.8,7.1,73.5,7,73,7c-0.6,0-1,0.2-1.3,0.6c-0.3,0.4-0.4,1.1-0.4,2V14h-2.4V8.9c0-0.6-0.1-1.1-0.3-1.4
c-0.2-0.3-0.5-0.5-1-0.5c-0.6,0-1.1,0.2-1.3,0.7c-0.3,0.4-0.4,1.2-0.4,2.2V14h-2.4V5.2h1.8l0.3,1.1h0.1c0.2-0.4,0.6-0.7,1-0.9
c0.4-0.2,1-0.3,1.5-0.3c1.3,0,2.2,0.4,2.7,1.3h0.2c0.2-0.4,0.6-0.7,1-0.9c0.5-0.2,1-0.3,1.5-0.3c1,0,1.7,0.3,2.2,0.8
c0.5,0.5,0.8,1.3,0.8,2.4V14H74.3z M61,14h-2.4V5.2H61V14z M60.8,3.8c-0.2,0.2-0.5,0.3-1,0.3c-0.9,0-1.3-0.4-1.3-1.2
c0-0.8,0.4-1.2,1.3-1.2c0.9,0,1.3,0.4,1.3,1.2C61.1,3.4,61,3.6,60.8,3.8z M53.9,4.6V14h-2.4V4.6h-3.1v-2H57v2H53.9z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
static/images/side-min.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 309 KiB

After

Width:  |  Height:  |  Size: 68 KiB

29
templates/page-solvespace.html
View File

@ -16,6 +16,31 @@
<script>
(function () {
function findBootstrapEnvironment() {
let envs = ['xs', 'sm', 'md', 'lg', 'xl'];
let el = document.createElement('div');
document.body.appendChild(el);
let curEnv = envs.shift();
for (let env of envs.reverse()) {
el.classList.add(`d-${env}-none`);
if (window.getComputedStyle(el).display === 'none') {
curEnv = env;
break;
}
}
document.body.removeChild(el);
return curEnv;
}
var bootstrap_env = findBootstrapEnvironment();
var params_chamber = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 400, height: 200, scale: 1} : {width: 800, height: 600, scale: 3};
var params_k526s_fixture = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 400, height: 200, scale: 6} : {width: 800, height: 400, scale: 12};
var nodes = [{
id: 'kf25',
model: solvespace_model_kf25,
@ -31,7 +56,7 @@
}, {
id: 'chamber',
model: solvespace_model_chamber,
params: {width: 800, height: 600, scale: 3},
params: params_chamber,
}, {
id: 'k526s-body',
model: solvespace_model_k526s_body,
@ -43,7 +68,7 @@
}, {
id: 'k526s-fixture',
model: solvespace_model_k526s_fixture,
params: {width: 800, height: 400, scale: 12},
params: params_k526s_fixture,
}, {
id: 'k526s-adapter',
model: solvespace_model_k526s_adapter,