Merge branch 'gh-pages' of github.com:mapbox/tilemill into gh-pages

robbiegd · Jan 25, 2012 · 1248d87 · 1248d87
2 parents 4666795 + 34a1508
commit 1248d87
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 47 deletions.
diff --git a/_posts/0800-01-01-tilemill.html b/_posts/0800-01-01-tilemill.html
@@ -320,11 +320,7 @@ <h3>Embed graphs &amp; images</h3>
   <h3>I have never made a map...</h3>
   <p>If you have ever written one line of CSS, you'll be right at home with TileMill's map styling language Carto. TileMill comes with well-documented examples that illustrate the basics of layer management, feature styling, and interaction. A <a href='{{site.baseurl}}/docs/manual/'>step-by-step manual</a> can teach you everything you need to know about geodata, projections, and symbolizers.</p>
   </div>
-  <div class='col-1'>
-  <h3>Is there a Windows version?</h3>
-  <p>TileMill for Windows is <a href='windows'>coming soon</a>. Until then you may want to try the <a href='http://mapbox.com/tilemill/docs/win-install/'>VirtualBox VM</a> for running TileMill on Windows.</p>
-  </div>
-  <div class='col-1'>
+  <div class='col-2'>
   <h3>Have more questions?</h3>
   <p>Feel free to <a href='{{site.url}}/contact/index.html'>contact us</a> with any questions regarding TileMill or map design in general.</p>
   </div>

diff --git a/_posts/docs/guides/0203-02-01-conditional-styles.md b/_posts/docs/guides/0203-02-01-conditional-styles.md