From f6f067ad4d5073a34b4ba27611c1965e7b812b32 Mon Sep 17 00:00:00 2001
From: Bebe Peng <bpeng@pivotal.io>
Date: Mon, 5 Jan 2015 17:29:26 -0500
Subject: [PATCH] fix(copy-button): do not include whitespace in hologram
 templates

[Finishes #79279548]

Signed-off-by: Paul Meskers <pmeskers@pivotal.io>
---
 Gemfile                                                   | 2 +-
 Gemfile.lock                                              | 4 ++--
 .../code_example_templates/js_example_template.html.erb   | 4 +---
 .../code_example_templates/jsx_example_template.html.erb  | 4 +---
 .../markup_example_template.html.erb                      | 8 ++------
 .../code_example_templates/markup_table_template.html.erb | 8 ++------
 6 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index 743e82846..0586d3a21 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'hologram', git: 'https://github.com/gpleiss/hologram.git', branch: 'develop'
+gem 'hologram', git: 'https://github.com/gpleiss/hologram.git', branch: 'custom_code_example'
 gem 'haml'
 gem 'sass'
 gem 'compass', '~> 1.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index e4e76d2f2..e9b6b4092 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/gpleiss/hologram.git
-  revision: 9ba6fe0e493f67ad3c6834bcf788fcc860f86916
-  branch: develop
+  revision: 2b156bd2afd7b09e23645d29dab0d1badd9cb6d1
+  branch: custom_code_example
   specs:
     hologram (1.2.0)
       redcarpet (>= 2.2, < 4.0)
diff --git a/hologram/code_example_templates/js_example_template.html.erb b/hologram/code_example_templates/js_example_template.html.erb
index 823cbc0a3..c65ef90c9 100644
--- a/hologram/code_example_templates/js_example_template.html.erb
+++ b/hologram/code_example_templates/js_example_template.html.erb
@@ -1,9 +1,7 @@
 <script><%= rendered_example %></script>
 <div class="codeBlock jsExample">
   <div class="highlight" data-code-to-copy>
-    <pre>
-      <%= code_example %>
-    </pre>
+    <pre><%= code_example %></pre>
   </div>
   <button class="btn btn-default btn-copy" data-btn-copy data-placement="left">
     Copy
diff --git a/hologram/code_example_templates/jsx_example_template.html.erb b/hologram/code_example_templates/jsx_example_template.html.erb
index 5d74853e3..7ab782e26 100644
--- a/hologram/code_example_templates/jsx_example_template.html.erb
+++ b/hologram/code_example_templates/jsx_example_template.html.erb
@@ -1,9 +1,7 @@
 <script type='text/jsx'><%= rendered_example %></script>
 <div class="codeBlock jsExample">
   <div class="highlight" data-code-to-copy>
-    <pre>
-      <%= code_example %>
-    </pre>
+    <pre><%= code_example %></pre>
   </div>
   <button class="btn btn-default btn-copy" data-btn-copy data-placement="left">
     Copy
diff --git a/hologram/code_example_templates/markup_example_template.html.erb b/hologram/code_example_templates/markup_example_template.html.erb
index 8e721df4c..18399caef 100644
--- a/hologram/code_example_templates/markup_example_template.html.erb
+++ b/hologram/code_example_templates/markup_example_template.html.erb
@@ -1,12 +1,8 @@
 <div class="codeExample">
-  <div class="exampleOutput">
-    <%= rendered_example %>
-  </div>
+  <div class="exampleOutput"><%= rendered_example %></div>
   <div class="codeBlock">
     <div class="highlight" data-code-to-copy>
-      <pre>
-        <%= code_example %>
-      </pre>
+      <pre><%= code_example %></pre>
     </div>
     <button class="btn btn-default btn-copy" data-btn-copy data-placement="left">
       Copy
diff --git a/hologram/code_example_templates/markup_table_template.html.erb b/hologram/code_example_templates/markup_table_template.html.erb
index bdc629993..4c9e5e4d6 100644
--- a/hologram/code_example_templates/markup_table_template.html.erb
+++ b/hologram/code_example_templates/markup_table_template.html.erb
@@ -4,16 +4,12 @@
       <% examples.each do |example| %>
         <tr>
           <th>
-            <div class="exampleOutput">
-              <%= example.rendered_example %>
-            </div>
+            <div class="exampleOutput"><%= example.rendered_example %></div>
           </th>
           <td>
             <div class="codeBlock">
               <div class="highlight" data-code-to-copy>
-                <pre>
-                  <%= example.code_example %>
-                </pre>
+                <pre><%= example.code_example %></pre>
               </div>
             </div>
             <button class="btn btn-default btn-copy" data-btn-copy data-placement="left">