From 1283a52db82b5a3f55577ff9ec0ed71d6243414d Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Fri, 14 Jun 2013 00:30:40 +0530 Subject: [PATCH] Revert "Whitespace trimming in guides generation" This reverts commit 91a1cf7013252753567b36f61bfcd5fd0a5bb2b8. Reason: code changes disallowed in docrails, even if they are guides generation related. --- guides/Rakefile | 4 ++-- guides/assets/stylesheets/responsive-tables.css | 14 +++++++------- guides/source/credits.html.erb | 4 ++-- guides/source/kindle/toc.ncx.erb | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/guides/Rakefile b/guides/Rakefile index ea5622dba6..d6dd950d01 100644 --- a/guides/Rakefile +++ b/guides/Rakefile @@ -13,10 +13,10 @@ namespace :guides do desc "Generate .mobi file. The kindlegen executable must be in your PATH. You can get it for free from http://www.amazon.com/kindlepublishing" task :kindle do - unless `kindlerb -v 2> /dev/null` =~ /kindlerb 0.1.1/ + unless `kindlerb -v 2> /dev/null` =~ /kindlerb 0.1.1/ abort "Please `gem install kindlerb`" end - unless `convert` =~ /convert/ + unless `convert` =~ /convert/ abort "Please install ImageMagick`" end ENV['KINDLE'] = '1' diff --git a/guides/assets/stylesheets/responsive-tables.css b/guides/assets/stylesheets/responsive-tables.css index 9ecb15fd3a..f5fbcbf948 100755 --- a/guides/assets/stylesheets/responsive-tables.css +++ b/guides/assets/stylesheets/responsive-tables.css @@ -1,7 +1,7 @@ /* Foundation v2.1.4 http://foundation.zurb.com */ /* Artfully masterminded by ZURB */ -/* -------------------------------------------------- +/* -------------------------------------------------- Table of Contents ----------------------------------------------------- :: Shared Styles @@ -19,21 +19,21 @@ table td, table th { padding: 9px 10px; text-align: left; } /* Mobile */ @media only screen and (max-width: 767px) { - + table { margin-bottom: 0; } - + .pinned { position: absolute; left: 0; top: 0; background: #fff; width: 35%; overflow: hidden; overflow-x: scroll; border-right: 1px solid #ccc; border-left: 1px solid #ccc; } .pinned table { border-right: none; border-left: none; width: 100%; } .pinned table th, .pinned table td { white-space: nowrap; } .pinned td:last-child { border-bottom: 0; } - + div.table-wrapper { position: relative; margin-bottom: 20px; overflow: hidden; border-right: 1px solid #ccc; } div.table-wrapper div.scrollable table { margin-left: 35%; } - div.table-wrapper div.scrollable { overflow: scroll; overflow-y: hidden; } - + div.table-wrapper div.scrollable { overflow: scroll; overflow-y: hidden; } + table td, table th { position: relative; white-space: nowrap; overflow: hidden; } table th:first-child, table td:first-child, table td:first-child, table.pinned td { display: none; } - + } /* ----------------------------------------- diff --git a/guides/source/credits.html.erb b/guides/source/credits.html.erb index 8f546784ec..10dd8178fb 100644 --- a/guides/source/credits.html.erb +++ b/guides/source/credits.html.erb @@ -32,8 +32,8 @@ Ruby on Rails Guides: Credits <% end %> <%= author('Oscar Del Ben', 'oscardelben', 'oscardelben.jpg') do %> - Oscar Del Ben is a software engineer at Wildfire. He's a regular open source contributor (GitHub account) and tweets regularly at @oscardelben. -<% end %> +Oscar Del Ben is a software engineer at Wildfire. He's a regular open source contributor (GitHub account) and tweets regularly at @oscardelben. + <% end %> <%= author('Frederick Cheung', 'fcheung') do %> Frederick Cheung is Chief Wizard at Texperts where he has been using Rails since 2006. He is based in Cambridge (UK) and when not consuming fine ales he blogs at spacevatican.org. diff --git a/guides/source/kindle/toc.ncx.erb b/guides/source/kindle/toc.ncx.erb index 24ca6c88c9..2c6d8e3bdf 100644 --- a/guides/source/kindle/toc.ncx.erb +++ b/guides/source/kindle/toc.ncx.erb @@ -37,7 +37,7 @@ Copyright & License - + <% play_order = 4 %> @@ -47,7 +47,7 @@ <%= section['name'] %> - + <% section['documents'].each_with_index do |document, document_no| %>