1
0
Fork 0

Merge branch 'develop'

This commit is contained in:
Sylvain UTARD 2016-09-07 20:00:53 +02:00
commit 76a44508d9
8 changed files with 14 additions and 48 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 403 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 KiB

View file

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg width="88px" height="24px" viewBox="0 0 88 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"> <title>batch 2</title> <desc>Created with Sketch.</desc> <defs></defs> <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage"> <g id="Logo-/-md-Copy" sketch:type="MSLayerGroup" fill="#FFFFFF"> <g id="batch-2-+-Rectangle-path-2" sketch:type="MSShapeGroup"> <path d="M0.34375,23 L0.34375,0.15625 L3.859375,0.15625 L3.859375,8.65625 C5.30729891,6.76040719 7.20311328,5.8125 9.546875,5.8125 C11.8698033,5.8125 13.7317638,6.64061672 15.1328125,8.296875 C16.5338612,9.95313328 17.234375,12.0494665 17.234375,14.5859375 C17.234375,17.1224085 16.5364653,19.22395 15.140625,20.890625 C13.7447847,22.5573 11.88022,23.390625 9.546875,23.390625 C7.20311328,23.390625 5.30729891,22.4375095 3.859375,20.53125 L3.859375,23 L0.34375,23 Z M3.859375,14.609375 C3.859375,16.2552166 4.28645406,17.6015573 5.140625,18.6484375 C5.99479594,19.6953177 7.19790891,20.21875 8.75,20.21875 C10.2812577,20.21875 11.4531209,19.6953177 12.265625,18.6484375 C13.0781291,17.6015573 13.484375,16.2552166 13.484375,14.609375 C13.484375,12.9843669 13.0807332,11.6406303 12.2734375,10.578125 C11.4661418,9.51561969 10.2942785,8.984375 8.7578125,8.984375 C7.22134648,8.984375 6.02083766,9.51561969 5.15625,10.578125 C4.29166234,11.6406303 3.859375,12.9843669 3.859375,14.609375 L3.859375,14.609375 Z M19.78125,14.609375 C19.78125,12.0468622 20.4791597,9.94011242 21.875,8.2890625 C23.2708403,6.63801258 25.1406133,5.8125 27.484375,5.8125 C29.8489702,5.8125 31.7395762,6.76040719 33.15625,8.65625 L33.15625,6.203125 L36.703125,6.203125 L36.703125,19.09375 C36.703125,19.6458361 36.7942699,20.0390613 36.9765625,20.2734375 C37.1588551,20.5078137 37.453123,20.625 37.859375,20.625 C38.265627,20.625 38.5729156,20.5520841 38.78125,20.40625 L39.203125,22.84375 C38.6510389,23.1145847 37.9687541,23.25 37.15625,23.25 L37.0625,23.25 C35.0520733,23.25 33.8229189,22.3645922 33.375,20.59375 C32.0729102,22.4479259 30.1354295,23.3802083 27.5625,23.390625 C25.1770714,23.390625 23.2838612,22.5625083 21.8828125,20.90625 C20.4817638,19.2499917 19.78125,17.1510544 19.78125,14.609375 L19.78125,14.609375 Z M23.53125,14.6171875 C23.53125,16.2578207 23.9348918,17.6015573 24.7421875,18.6484375 C25.5494832,19.6953177 26.7239506,20.21875 28.265625,20.21875 C29.8281328,20.21875 31.0338499,19.6901095 31.8828125,18.6328125 C32.7317751,17.5755155 33.15625,16.2343831 33.15625,14.609375 C33.15625,12.9635334 32.7239627,11.6145886 31.859375,10.5625 C30.9947873,9.51041141 29.7942785,8.984375 28.2578125,8.984375 C26.7213465,8.984375 25.5494832,9.51301555 24.7421875,10.5703125 C23.9348918,11.6276095 23.53125,12.9765543 23.53125,14.6171875 L23.53125,14.6171875 Z M40.25,8.921875 L40.25,6.203125 L43.0625,6.203125 L43.0625,1.6875 L46.609375,1.6875 L46.609375,6.203125 L51.796875,6.203125 L51.796875,8.921875 L46.609375,8.921875 L46.609375,17.75 C46.609375,19.416675 47.3697841,20.25 48.890625,20.25 C49.6822956,20.25 50.3854136,20.0052108 51,19.515625 L52.40625,22.140625 C51.3229112,22.9739625 49.9895912,23.390625 48.40625,23.390625 C46.2708227,23.390625 44.7552128,22.6718822 43.859375,21.234375 C43.3281223,20.4427044 43.0625,19.2708411 43.0625,17.71875 L43.0625,8.921875 L40.25,8.921875 Z M54.09375,14.609375 C54.09375,12.0468622 54.8567632,9.94011242 56.3828125,8.2890625 C57.9088618,6.63801258 59.9166542,5.8125 62.40625,5.8125 C65.4166817,5.8125 67.7343669,7.0624875 69.359375,9.5625 L66.703125,11.453125 C65.7656203,9.76561656 64.3906341,8.921875 62.578125,8.921875 C61.1302011,8.921875 59.9765668,9.45572383 59.1171875,10.5234375 C58.2578082,11.5911512 57.828125,12.9427002 57.828125,14.578125 C57.828125,16.2448 58.2604123,17.6119738 59.125,18.6796875 C59.9895877,19.7474012 61.1510344,20.28125 62.609375,20.28125 C64.3385503,20.28125 65.7343697,19.4687581 66.796875,17.84375 L69.453125,19.671875 C67.8072834,22.1510541 65.4687652,23.390625 62.4375,23.390625 C59.9166541,23.390625 57.8958409,22.5625083 56.375,20.90625 C54.8541591,19.2499917 54.09375,17.1510544 54.09375,14.609375 L54.09375,14.609375 Z M72.6875,23 L72.6875,0.15625 L76.203125,0.15625 L76.203125,8.65625 C77.6302155,6.76040719 79.4635305,5.8125 81.703125,5.8125 C83.5156341,5.8125 84.9348907,6.37239023 85.9609375,7.4921875 C86.9869843,8.61198477 87.5,10.135407 87.5,12.0625 L87.5,23 L83.96875,23 L83.96875,12.859375 C83.96875,10.3176956 82.8593861,9.046875 80.640625,9.046875 C79.3593686,9.046875 78.2994834,9.4635375 77.4609375,10.296875 C76.6223916,11.1302125 76.203125,12.2291598 76.203125,13.59375 L76.203125,23 L72.6875,23 Z" id="batch-2"></path> </g> </g> </g></svg>

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View file

@ -1,45 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="150px" height="48px" viewBox="0 0 150 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
<title>echo</title>
<desc>Created with Sketch.</desc>
<defs>
<radialGradient cx="85.1421106%" cy="50.1949703%" fx="85.1421106%" fy="50.1949703%" r="86.5222156%" id="radialGradient-1">
<stop stop-color="#5580AB" offset="0%"></stop>
<stop stop-color="#22A5CC" offset="50%"></stop>
<stop stop-color="#2FBFD8" offset="100%"></stop>
</radialGradient>
<radialGradient cx="77.7411029%" cy="50.3072315%" fx="77.7411029%" fy="50.3072315%" r="129.621313%" id="radialGradient-2">
<stop stop-color="#5580AB" offset="0%"></stop>
<stop stop-color="#22A5CC" offset="50%"></stop>
<stop stop-color="#2FBFD8" offset="100%"></stop>
</radialGradient>
<radialGradient cx="45.6497331%" cy="51.2903522%" fx="45.6497331%" fy="51.2903522%" r="316.49944%" id="radialGradient-3">
<stop stop-color="#5580AB" offset="0%"></stop>
<stop stop-color="#22A5CC" offset="50%"></stop>
<stop stop-color="#2FBFD8" offset="100%"></stop>
</radialGradient>
</defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="echo">
<g id="Page-1">
<g id="echo">
<g id="Page-1">
<g id="echo">
<g id="Group">
<path d="M6.6668794,14.7490248 L6.6668794,21.140628 L22.8741418,21.140628 L22.8741418,26.6487934 L6.6668794,26.6487934 L6.6668794,33.1663472 L22.8741418,33.1663472 L22.8741418,38.674843 L0.0326804578,38.674843 L0.0326804578,9.2408595 L22.934419,9.2408595 L22.934419,14.7490248 L6.6668794,14.7490248 L6.6668794,14.7490248 L6.6668794,14.7490248 L6.6668794,14.7490248 Z" id="Shape" fill="#FFF"></path>
<path d="M97.5744058,38.674843 L97.5744058,27.0693554 L84.2643486,27.0693554 L84.2643486,38.674843 L77.6299516,38.674843 L77.6299516,9.2408595 L84.2643486,9.2408595 L84.2643486,21.5192066 L97.5744058,21.5192066 L97.5744058,9.2408595 L104.208473,9.2408595 L104.208473,38.674843 L97.5744058,38.674843 L97.5744058,38.674843 L97.5744058,38.674843 L97.5744058,38.674843 Z" id="Shape" fill="#FFF"></path>
<path d="M149.96732,23.9580166 C149.96732,32.4515042 143.165229,38.969124 134.179952,38.969124 C125.19441,38.969124 118.39232,32.4935538 118.39232,23.9580166 C118.39232,15.3799008 125.19441,9.03094214 134.179952,9.03094214 C143.165229,9.03087604 149.96732,15.4221488 149.96732,23.9580166 L149.96732,23.9580166 L149.96732,23.9580166 L149.96732,23.9580166 Z M125.19441,23.9580166 C125.19441,29.1299174 129.351232,33.1663472 134.263798,33.1663472 C139.176364,33.1663472 143.165163,29.1299174 143.165163,23.9580166 C143.165163,18.7858512 139.176364,14.8333223 134.263798,14.8333223 C129.309309,14.8333223 125.19441,18.7857851 125.19441,23.9580166 L125.19441,23.9580166 L125.19441,23.9580166 L125.19441,23.9580166 Z" id="Shape" fill="#FFF"></path>
<g id="Shape" transform="translate(37.103874, 0.000000)">
<path d="M23.956492,47.976529 C10.7548415,47.976529 0.014590669,37.220562 0.014590669,24 C0.014590669,10.779438 10.7548415,0.0234710744 23.956492,0.0234710744 C25.2740096,0.0234710744 26.3420994,1.09289256 26.3420994,2.41249586 C26.3420994,3.73203306 25.2740096,4.80152066 23.956492,4.80152066 C13.3857174,4.80152066 4.78580546,13.4138843 4.78580546,23.9999338 C4.78580546,34.5860496 13.3856514,43.1984132 23.956492,43.1984132 C25.2740096,43.1984132 26.3420994,44.2679008 26.3420994,45.587372 C26.3420994,46.9070414 25.2740096,47.976529 23.956492,47.976529 L23.956492,47.976529 L23.956492,47.976529 L23.956492,47.976529 Z" fill="url(#radialGradient-1)"></path>
<path d="M23.956492,39.210248 C15.5816461,39.210248 8.76839788,32.386843 8.76839788,24 C8.76839788,15.613157 15.5817121,8.78981818 23.956492,8.78981818 C25.2740096,8.78981818 26.3420994,9.85930578 26.3420994,11.178843 C26.3420994,12.4983802 25.2740096,13.5678678 23.956492,13.5678678 C18.212522,13.5678678 13.5396127,18.2476033 13.5396127,24 C13.5396127,29.7523306 18.212522,34.4320662 23.956492,34.4320662 C25.2740096,34.4320662 26.3420994,35.5015538 26.3420994,36.821157 C26.3420994,38.1407604 25.2740096,39.210248 23.956492,39.210248 L23.956492,39.210248 L23.956492,39.210248 L23.956492,39.210248 Z" fill="url(#radialGradient-2)"></path>
<path d="M22.743486,27.6040992 C20.756052,27.6040992 19.1448724,25.9912066 19.1448724,24.0006612 C19.1448724,22.0101158 20.756052,20.3968926 22.743486,20.3968926 C24.7309198,20.3968926 26.3420994,22.0101158 26.3420994,24.0006612 C26.3420994,25.9912066 24.7308538,27.6040992 22.743486,27.6040992 L22.743486,27.6040992 L22.743486,27.6040992 L22.743486,27.6040992 Z" fill="url(#radialGradient-3)"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 5.3 KiB

View file

@ -105,18 +105,28 @@ layout: default
Marionette.js
.col-sm-4.showcase
%a{:href => "https://echo.labstack.com", :target => "_blank"}
%img.img-responsive.logo{:src => "./img/showcase/logo-echo.svg", :alt => "echo"}
%img.img-responsive.logo{:src => "./img/showcase/logo-echo.png", :alt => "echo"}
.screen-wrapper
%img.img-responsive.example.freezeframe{:src => "./img/showcase/example-echo.png", :alt => "echo docsearch demo"}
%img.img-responsive.example.freezeframe{:src => "./img/showcase/example-echo.gif", :alt => "echo docsearch demo"}
%img.img-responsive.screen-mask{:src => "./img/mask.png", :alt => "mask"}
.spacer10
Echo
.col-sm-4.showcase
%a{:href => "https://serge.io/", :target => "_blank"}
%img.img-responsive.logo{:src => "./img/showcase/logo-serge.svg", :alt => "serge"}
.screen-wrapper
%img.img-responsive.example.freezeframe{:src => "./img/showcase/example-serge.png", :alt => "serge docsearch demo"}
%img.img-responsive.example.freezeframe{:src => "./img/showcase/example-serge.gif", :alt => "serge docsearch demo"}
%img.img-responsive.screen-mask{:src => "./img/mask.png", :alt => "mask"}
.spacer10
Serge
.col-sm-4.showcase
%a{:href => "https://batch.com/", :target => "_blank"}
%img.img-responsive.logo{:src => "./img/showcase/logo-batch.svg", :alt => "batch"}
.screen-wrapper
%img.img-responsive.example.freezeframe{:src => "./img/showcase/example-batch.gif", :alt => "batch docsearch demo"}
%img.img-responsive.screen-mask{:src => "./img/mask.png", :alt => "mask"}
.spacer10
Batch
.col-sm-4.showcase
.placeholder-logo
.placeholder-screen