Merge remote-tracking branch 'origin/gh-pages' into gh-pages

This commit is contained in:
ido 2014-12-24 12:29:46 +02:00
commit 339494759d
5 changed files with 31 additions and 10 deletions

20
img/logo-rt.svg Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="902px" height="392px" viewBox="-4 72 902 392" enable-background="new -4 72 902 392" xml:space="preserve">
<circle fill="#00D8FF" cx="353.3" cy="269.3" r="37.1"/>
<path fill="none" stroke="#00D8FF" stroke-width="25" stroke-miterlimit="10" d="M353.4,196.2c48.3,0,92.9,7,126.7,18.6
c40.7,13.9,65.7,35.2,65.7,54.4c0,20.1-26.6,42.6-70.2,57.1c-33,10.8-76.5,16.6-122.2,16.6c-46.9,0-91.3-5.3-124.8-16.8
c-42.2-14.5-67.7-37.2-67.7-56.9c0-19,23.9-40.1,64.1-54C258.9,203.2,304.7,196.2,353.4,196.2z"/>
<path fill="none" stroke="#00D8FF" stroke-width="25" stroke-miterlimit="10" d="M290,232.9c24.2-41.8,52.4-77.2,79.4-100.5
c32.5-28.2,63.4-39.3,80-29.7c17.4,10,23.7,44.2,14.3,89.2c-7,34.2-23.7,74.5-46.7,114.2c-23.5,40.7-50.3,76.5-77,99.7
c-33.6,29.5-66.1,40.1-83.1,30.3c-16.6-9.6-22.9-40.7-14.9-82.5C248.8,318.4,265.6,275,290,232.9z"/>
<path fill="none" stroke="#00D8FF" stroke-width="25" stroke-miterlimit="10" d="M290,306.3c-24.2-41.8-40.7-83.9-47.5-119.1
c-8.2-42.2-2.5-74.5,14.1-84.1c17.4-10,50.1,1.6,84.5,32.1c26,23.1,52.8,57.9,75.7,97.4c23.5,40.5,41.1,81.7,47.9,116.5
c8.6,43.8,1.6,77.4-15.3,87.2c-16.6,9.6-46.7-0.6-79-28.2C343.4,384.5,314.3,348.5,290,306.3z"/>
<polyline fill="none" stroke="#00D8FF" stroke-width="32" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
163.4,423.5 28.9,270.3 28.9,268.9 163.4,115.5 "/>
<polyline fill="none" stroke="#00D8FF" stroke-width="32" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
734.2,423.5 868.7,270.3 868.7,268.9 734.2,115.5 "/>
<line fill="none" stroke="#00D8FF" stroke-width="32" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="680.8" y1="101.3" x2="560.4" y2="437.7"/>
</svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -46,7 +46,7 @@
<div class="nav-main"> <div class="nav-main">
<div class="wrap"> <div class="wrap">
<a class="nav-home" href="index.html"> <a class="nav-home" href="index.html">
<img class="nav-logo" src="https://facebook.github.io/react/img/logo.svg" width="36" height="36"> <img class="nav-logo" src="https://wix.github.io/react-templates/img/logo-rt.svg" width="56" height="24">
React Templates React Templates
</a> </a>
<ul class="nav-site"> <ul class="nav-site">

View File

@ -507,7 +507,8 @@ h1:hover .hash-link, h2:hover .hash-link, h3:hover .hash-link, h4:hover .hash-li
.nav-main .nav-logo { .nav-main .nav-logo {
vertical-align: middle; vertical-align: middle;
display: inline-block display: inline-block;
margin-bottom:5px;
} }
.nav-main ul { .nav-main ul {

View File

@ -3,9 +3,9 @@
<div id="header"> <div id="header">
<div id="header-title"> <div id="header-title">
<a href="index.html" class="title-link"> <a href="index.html" class="title-link">
<span>&lt;</span>
<img class="nav-logo" src="https://facebook.github.io/react/img/logo.svg" width="32" height="32" /> <img class="nav-logo" src="https://wix.github.io/react-templates/img/logo-rt.svg" width="56" height="24" />
<span>/&gt;</span>
</a> </a>
RTFiddle RTFiddle
</div> </div>

View File

@ -37,12 +37,12 @@ define([
return React.createElement('div', { 'className': 'fiddle' }, React.createElement('div', { 'id': 'header' }, React.createElement('div', { 'id': 'header-title' }, React.createElement('a', { return React.createElement('div', { 'className': 'fiddle' }, React.createElement('div', { 'id': 'header' }, React.createElement('div', { 'id': 'header-title' }, React.createElement('a', {
'href': 'index.html', 'href': 'index.html',
'className': 'title-link' 'className': 'title-link'
}, React.createElement('span', {}, '<'), React.createElement('img', { }, React.createElement('img', {
'className': 'nav-logo', 'className': 'nav-logo',
'src': 'https://facebook.github.io/react/img/logo.svg', 'src': 'https://wix.github.io/react-templates/img/logo-rt.svg',
'width': '32', 'width': '56',
'height': '32' 'height': '24'
}), React.createElement('span', {}, '/>')), '\n RTFiddle\n '), React.createElement('div', { 'id': 'buttons-bar' }, React.createElement('button', { })), '\n RTFiddle\n '), React.createElement('div', { 'id': 'buttons-bar' }, React.createElement('button', {
'type': 'button', 'type': 'button',
'className': 'btn btn-default', 'className': 'btn btn-default',
'onClick': onClick1.bind(this) 'onClick': onClick1.bind(this)