Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	_posts/guide/2012-05-08-guides.markdown
	_posts/guide/listing/2012-05-15-pausing-an-item.markdown
	_posts/guide/mypub/2012-05-15-pausing-an-item.markdown
	_posts/guide/orders/2012-05-15-pausing-an-item.markdown
  • Loading branch information
@pduranti
pduranti committed May 24, 2012
2 parents 48e5696 + b2b08fb commit eee1ecd
Show file tree
Hide file tree
Showing 27 changed files with 500 additions and 269 deletions.
57 changes: 57 additions & 0 deletions 404.html
View file
@@ -0,0 +1,57 @@
<!doctype html>
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7 ie6" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8 ie7" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9 ie8" lang="en"> <![endif]-->
<!--[if (gt IE 8)|!(IE)]><!--> <html class="no-js" lang="en"><!--<![endif]-->
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="chrome=1" />
<title>404</title>

<script src="http://static.mlstatic.com/org-img/ch/ui/0.10.5/chico-jquery.min.js"></script>
<script src="http://static.mlstatic.com/org-img/sdk/mercadolibre-1.0.1.js"></script>

<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />

<link rel="stylesheet" href="/stylesheets/pygment_trac.css" />
<link rel="stylesheet" href="http://static.mlstatic.com/org-img/ch/ui/0.10.5/chico-mesh.min.css" />
<link rel="stylesheet" href="/stylesheets/site.css" />
<link href="/feed/" rel="alternate" type="application/rss+xml" title="MELI dev feed" />

<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>
<body>
<header class="ch-g1 main">
<hgroup class="ch-g1-3">
<h1><a href="/">MELI</a></h1>
<h2>MELI Developer Products</h2>
</hgroup>
<nav class="ch-g2-3">
<ul>
<li><a href="/getting-started">Getting Started</a></li>
<li><a href="/guides">Guides & SDKs</a></li>
</ul>
</nav>
</header>

<section class="main ch-g1">
<h2>Sorry, we can't find the page you're looking for. <span class="error404">(Error 404)</span></h2>
<p>Would you like to add content to the site? You can <a href="https://github.com/mercadolibre/mercadolibre.github.com">fork repo on GitHub</a> and contribute!</p>
</section>

<footer class="ch-g1">
<div class="ch-g2-3 extras">
<ul>
<li>©2012 MercadoLibre</li>
</ul>
</div>
<p class="ch-g1-3 maintained-by">This project is maintained by <a href="https://github.com/mercadolibre">MercadoLibre</a></p>
<a href="https://github.com/mercadolibre/mercadolibre.github.com"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://a248.e.akamai.net/camo.github.com/7afbc8b248c68eb468279e8c17986ad46549fb71/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub"></a>
</footer>

<script src="javascripts/scale.fix.js"></script>
<!--[if !IE]><script>fixScale(document);</script><!--<![endif]-->
</body>
</html>
Empty file removed README
View file
Empty file.
129 changes: 64 additions & 65 deletions _layouts/1columns.html
View file
Expand Up @@ -2,73 +2,72 @@
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7 ie6" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8 ie7" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9 ie8" lang="en"> <![endif]-->
<!--[if (gt IE 8)|!(IE)]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<title>{{ page.title }}</title>

<script src="http://static.mlstatic.com/org-img/ch/ui/0.10.5/chico-jquery.min.js"></script>
<script src="http://static.mlstatic.com/org-img/sdk/mercadolibre-1.0.1.js"></script>
<link rel="stylesheet" href="/stylesheets/pygment_trac.css">
<link rel="stylesheet" href="http://static.mlstatic.com/org-img/ch/ui/0.10.5/chico-mesh.min.css">
<link rel="stylesheet" href="/stylesheets/site.css">
<link rel="canonical" href="{{ page.url | canonical }}" />
<!--[if (gt IE 8)|!(IE)]><!--> <html class="no-js" lang="en"><!--<![endif]-->
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="chrome=1" />
<title>{{ page.title }}</title>

<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">

<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>
<body>
<header class="ch-g1 main">
<hgroup class="ch-g1-3">
<h1><a href="/">MELI</a></h1>
<h2>MELI Developer Products</h2>
</hgroup>
<nav class="ch-g2-3">
<ul>
<li><a href="/getting-started">Getting Started</a></li>
<li style="border:none"><a href="/guides">Guides</a></li>
</ul>
</nav>
</header>
<script src="http://static.mlstatic.com/org-img/ch/ui/0.10.5/chico-jquery.min.js"></script>
<script src="http://static.mlstatic.com/org-img/sdk/mercadolibre-1.0.1.js"></script>

<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />

<link rel="stylesheet" href="/stylesheets/pygment_trac.css" />
<link rel="stylesheet" href="http://static.mlstatic.com/org-img/ch/ui/0.10.5/chico-mesh.min.css" />
<link rel="stylesheet" href="/stylesheets/site.css" />
<link rel="canonical" href="{{ page.url | canonical }}" />

<section class="main ch-g1">
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>
<body>
<header class="ch-g1 main">
<hgroup class="ch-g1-3">
<h1><a href="/">MELI</a></h1>
<h2>MELI Developer Products</h2>
</hgroup>
<nav class="ch-g2-3">
<ul>
<li><a href="/getting-started">Getting Started</a></li>
<li><a href="/guides">Guides & SDKs</a></li>
</ul>
</nav>
</header>

<section class="main ch-g1">
{{ content }}

{{ content }}
<section class="disqus">
<div id="disqus_thread"></div>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
</section>
</section>

<footer class="ch-g1">
<div class="ch-g2-3 extras">
<ul>
<li>©2012 MercadoLibre</li>
</ul>
</div>
<p class="ch-g1-3 maintained-by">This project is maintained by <a href="https://github.com/mercadolibre">MercadoLibre</a></p>
<a href="https://github.com/mercadolibre/mercadolibre.github.com"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://a248.e.akamai.net/camo.github.com/7afbc8b248c68eb468279e8c17986ad46549fb71/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub"></a>
</footer>

<script src="javascripts/scale.fix.js"></script>
<!--[if !IE]><script>fixScale(document);</script><!--<![endif]-->
<script>
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'melidev'; // required: replace example with your forum shortname

<section class="disqus">
<div id="disqus_thread"></div>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
</section>
</section>

<footer class="ch-g1">
<div class="ch-g2-3 extras">
<ul>
<li>©2012 MercadoLibre</li>
<li><a href="/discuss">Discuss</a></li>
</ul>
</div>
<p class="ch-g1-3 maintained-by">This project is maintained by <a href="https://github.com/mercadolibre">mercadolibre</a></p>
<a href="https://github.com/mercadolibre/mercadolibre.github.com"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://a248.e.akamai.net/camo.github.com/7afbc8b248c68eb468279e8c17986ad46549fb71/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub"></a>
</footer>
<script src="javascripts/scale.fix.js"></script>
<!--[if !IE]><script>fixScale(document);</script><!--<![endif]-->
<script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'melidev'; // required: replace example with your forum shortname

/* * * DON'T EDIT BELOW THIS LINE * * */
(function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
</body>
</html>
/* * * DON'T EDIT BELOW THIS LINE * * */
(function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
</body>
</html>
104 changes: 45 additions & 59 deletions _layouts/2columns.html
View file
Expand Up @@ -2,60 +2,46 @@
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7 ie6" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8 ie7" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9 ie8" lang="en"> <![endif]-->
<!--[if (gt IE 8)|!(IE)]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head>
<!--[if (gt IE 8)|!(IE)]><!--> <html class="no-js" lang="en"><!--<![endif]-->
<head>
{% include meta-tags.html %}
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<title>{{ page.title }}</title>

<script src="http://static.mlstatic.com/org-img/ch/ui/0.10.5/chico-jquery.min.js"></script>
<script src="http://static.mlstatic.com/org-img/sdk/mercadolibre-1.0.1.js"></script>
<link rel="stylesheet" href="/stylesheets/pygment_trac.css">
<link rel="stylesheet" href="http://static.mlstatic.com/org-img/ch/ui/0.10.5/chico-mesh.min.css">
<link rel="stylesheet" href="/stylesheets/site.css">
<link rel="canonical" href="{{ page.url | canonical }}" />

<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">

<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>
<body>
<header class="ch-g1 main">
<hgroup class="ch-g1-3">
<h1><a href="/">MELI</a></h1>
<h2>MELI Developer Products</h2>
</hgroup>
<nav class="ch-g2-3">
<ul>
<li><a href="/getting-started">Getting Started</a></li>
<li style="border:none"><a href="/guides">Guides</a></li>
</ul>
</nav>
</header>

<section class="main ch-g4-5">
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="chrome=1" />
<title>{{ page.title }}</title>

<script src="http://static.mlstatic.com/org-img/ch/ui/0.10.5/chico-jquery.min.js"></script>
<script src="http://static.mlstatic.com/org-img/sdk/mercadolibre-1.0.1.js"></script>

<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />

<link rel="stylesheet" href="/stylesheets/pygment_trac.css" />
<link rel="stylesheet" href="http://static.mlstatic.com/org-img/ch/ui/0.10.5/chico-mesh.min.css" />
<link rel="stylesheet" href="/stylesheets/site.css" />
<link rel="canonical" href="{{ page.url | canonical }}" />

{{ content }}
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>
<body>
<header class="ch-g1 main">
<hgroup class="ch-g1-3">
<h1><a href="/">MELI</a></h1>
<h2>MELI Developer Products</h2>
</hgroup>
<nav class="ch-g2-3">
<ul>
<li><a href="/getting-started">Getting Started</a></li>
<li><a href="/guides">Guides & SDKs</a></li>
</ul>
</nav>
</header>

<section>
<div class="prev_next post_nav">
{% if page.next.url %}
<p class="previous">
«&nbsp;<a href="{{ page.next.url }}/" rel="previous" title="{{ page.next.title }}">{{ page.next.title | truncatewords: 15 }}</a>
</p>
{% endif %}
{% if page.previous.url %}
<p class="next">
<a href="{{ page.previous.url }}/" rel="next" title="{{ page.previous.title }}">{{ page.previous.title | truncatewords: 15 }}</a>&nbsp;»
</p>
{% endif %}
</div>
</section>
<section class="disqus">
<section class="main ch-g4-5">
<div class="ch-leftcolumn">
{{ content }}

<section class="disqus">
<div id="disqus_thread"></div>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
Expand All @@ -66,7 +52,7 @@ <h2>MELI Developer Products</h2>
<h2>Related posts</h2>
<ul>
{% for tag in page.tags %}
{% for post in site.tags.[tag] %}
{% for post in site.tags.[tag] reversed %}
{% assign current = nil %}
{% if post.id == page.id %}
{% assign current = 'current' %}
Expand All @@ -92,12 +78,12 @@ <h2>Related posts</h2>
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'melidev'; // required: replace example with your forum shortname

/* * * DON'T EDIT BELOW THIS LINE * * */
(function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
</body>
/* * * DON'T EDIT BELOW THIS LINE * * */
(function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
</body>
</html>

0 comments on commit eee1ecd

Please sign in to comment.