fix conflict

4 files changed, 71 insertions, 60 deletions

diff --git a/layouts/footer.html b/layouts/footer.html
index 1b087400..8212535d 100644
--- a/layouts/footer.html
+++ b/layouts/footer.html
@@ -1,64 +1,10 @@
 <footer class=footer>
-  <svg width=65 height=60 viewBox="0 0 210 194" class=footer-logo> <path d="M105.0614,193.655 L105.0614,193.655 L143.7014,74.734 L66.4214,74.734 L105.0614,193.655 L105.0614,193.655 Z" fill="#E24329" class="logo-svg-shape logo-dark-orange-shape"/> <path d="M105.0614,193.6548 L66.4214,74.7338 L12.2684,74.7338 L105.0614,193.6548 Z" fill="#FC6D26" class="logo-svg-shape logo-orange-shape"/> <path d="M12.2685,74.7341 L12.2685,74.7341 L0.5265,110.8731 C-0.5445,114.1691 0.6285,117.7801 3.4325,119.8171 L105.0615,193.6551 L12.2685,74.7341 Z" fill="#FCA326" class="logo-svg-shape logo-light-orange-shape"/> <path d="M12.2685,74.7342 L66.4215,74.7342 L43.1485,3.1092 C41.9515,-0.5768 36.7375,-0.5758 35.5405,3.1092 L12.2685,74.7342 Z" fill="#E24329" class="logo-svg-shape logo-dark-orange-shape"/> <path d="M105.0614,193.6548 L143.7014,74.7338 L197.8544,74.7338 L105.0614,193.6548 Z" fill="#FC6D26" class="logo-svg-shape logo-orange-shape"/> <path d="M197.8544,74.7341 L197.8544,74.7341 L209.5964,110.8731 C210.6674,114.1691 209.4944,117.7801 206.6904,119.8171 L105.0614,193.6551 L197.8544,74.7341 Z" fill="#FCA326" class="logo-svg-shape logo-light-orange-shape"/> <path d="M197.8544,74.7342 L143.7014,74.7342 L166.9744,3.1092 C168.1714,-0.5768 173.3854,-0.5758 174.5824,3.1092 L197.8544,74.7342 Z" fill="#E24329" class="logo-svg-shape logo-dark-orange-shape"/> </svg>
-
-  <div class='animated container'>
-    <ul class='text-center footer-social'>
-      <li> <a href="https://twitter.com/gitlab" target="_blank"><i class='fa fa-twitter'></i> <span class=sr-only>Twitter</span></a></li>
-      <li> <a href="https://www.facebook.com/gitlab" target="_blank"><i class='fa fa-facebook'></i> <span class=sr-only>Facebook</span> </a></li>
-      <li> <a href="https://www.youtube.com/channel/UCnMGQ8QHMAnVIsI3xJrihhg" target="_blank"><i class='fa fa-youtube'></i> <span class=sr-only>YouTube</span> </a></li>
-      <li> <a href="https://www.linkedin.com/company/gitlab-com" target="_blank"><i class='fa fa-linkedin'></i> <span class=sr-only>LinkedIn</span> </a></li>
-    </ul>
-    <div class=row>
-      <div class='col-sm-6 col-md-3 col-lg-2 col-lg-offset-2 footer-link-holder'>
-        <h3 class=footer-link-title>Products</h3>
-        <ul class='animated footer-links'>
-          <li><a href="https://about.gitlab.com/features" target="_blank">Features</a></li>
-          <li><a href="https://about.gitlab.com/gitlab-ee" target="_blank">Enterprise Edition</a></li>
-          <li><a href="https://about.gitlab.com/installation" target="_blank">Community Edition</a></li>
-          <li><a href="https://about.gitlab.com/gitlab-com/" target="_blank">GitLab.com</a></li>
-          <li><a href="https://about.gitlab.com/products/" target="_blank">Pricing</a></li>
-          <li><a href="https://about.gitlab.com/releases/" target="_blank">Releases</a></li>
-        </ul>
-      </div>
-      <div class='col-sm-6 col-md-3 col-lg-2 footer-link-holder'>
-        <h3 class=footer-link-title>Services</h3>
-        <ul class='animated footer-links'>
-          <li><a href="https://about.gitlab.com/resellers/" target="_blank">Resellers</a></li>
-          <li><a href="https://about.gitlab.com/services/" target="_blank">Services</a></li>
-        </ul>
-      </div>
-      <div class='col-sm-6 col-md-3 col-lg-2 footer-link-holder'>
-        <h3 class=footer-link-title>Community</h3>
-        <ul class='animated footer-links'>
-          <li><a href="https://about.gitlab.com/events/" target="_blank">Events</a></li>
-          <li><a href="https://about.gitlab.com/core-team/" target="_blank">Core Team</a></li>
-          <li><a href="http://contributors.gitlab.com/" target="_blank">Contributors</a></li>
-          <li><a href="/">Documentation</a></li>
-          <li><a href="https://about.gitlab.com/getting-help/" target="_blank">Getting Help</a></li>
-          <li><a href="https://about.gitlab.com/contributing/" target="_blank">Contributing</a></li>
-          <li><a href="https://about.gitlab.com/applications/" target="_blank">Applications</a></li>
-          <li><a href="https://about.gitlab.com/mvp/" target="_blank">Hall of Fame</a></li>
-        </ul>
-      </div>
-      <div class='col-sm-6 col-md-3 col-lg-2 footer-link-holder'>
-        <h3 class=footer-link-title>Company</h3>
-        <ul class='animated footer-links'>
-          <li><a href="https://gitlab.com/groups/gitlab-org" target="_blank">Source Code</a></li>
-          <li><a href="https://about.gitlab.com/blog/" target="_blank">Blog</a></li>
-          <li><a href="https://about.gitlab.com/press/" target="_blank">Press and Logos</a></li>
-          <li><a href="https://shop.gitlab.com/" target="_blank">Shop</a></li>
-          <li><a href="https://about.gitlab.com/about/" target="_blank">About Us</a></li>
-          <li><a href="https://about.gitlab.com/team/" target="_blank">Team</a></li>
-          <li><a href="https://about.gitlab.com/direction/" target="_blank">Direction</a></li>
-          <li><a href="https://about.gitlab.com/handbook/" target="_blank">Handbook</a></li>
-          <li><a href="https://about.gitlab.com/jobs/" target="_blank">Jobs</a></li>
-          <li><a href="https://about.gitlab.com/terms/" target="_blank">Terms</a></li>
-          <li><a href="https://about.gitlab.com/contact/" target="_blank">Contact Us</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
+  <%= render '/footer_links.*' %>
   <div class='animated text-center source-link'>
     <a href='https://gitlab.com/gitlab-com/gitlab-docs' target='_blank'>Created</a> with Nanoc, hosted on <a href='https://about.gitlab.com/features/pages/' target='_blank'>GitLab Pages</a>
+    <div class="edit-on">
+      <i class="fa fa-code-fork" aria-hidden="true"></i>
+      <%= edit_on_gitlab(@item) %>
+    </div>
   </div>
 </footer>
diff --git a/layouts/footer_homepage.html b/layouts/footer_homepage.html
new file mode 100644
index 00000000..fb90dfa6
--- /dev/null
+++ b/layouts/footer_homepage.html
@@ -0,0 +1,6 @@
+<footer class=footer>
+  <%= render '/footer_links.*' %>
+  <div class='animated text-center source-link'>
+    <a href='https://gitlab.com/gitlab-com/gitlab-docs' target='_blank'>Created</a> with Nanoc, hosted on <a href='https://about.gitlab.com/features/pages/' target='_blank'>GitLab Pages</a>
+  </div>
+</footer>
diff --git a/layouts/footer_links.html b/layouts/footer_links.html
new file mode 100644
index 00000000..3a67d581
--- /dev/null
+++ b/layouts/footer_links.html
@@ -0,0 +1,59 @@
+  <svg width=65 height=60 viewBox="0 0 210 194" class=footer-logo> <path d="M105.0614,193.655 L105.0614,193.655 L143.7014,74.734 L66.4214,74.734 L105.0614,193.655 L105.0614,193.655 Z" fill="#E24329" class="logo-svg-shape logo-dark-orange-shape"/> <path d="M105.0614,193.6548 L66.4214,74.7338 L12.2684,74.7338 L105.0614,193.6548 Z" fill="#FC6D26" class="logo-svg-shape logo-orange-shape"/> <path d="M12.2685,74.7341 L12.2685,74.7341 L0.5265,110.8731 C-0.5445,114.1691 0.6285,117.7801 3.4325,119.8171 L105.0615,193.6551 L12.2685,74.7341 Z" fill="#FCA326" class="logo-svg-shape logo-light-orange-shape"/> <path d="M12.2685,74.7342 L66.4215,74.7342 L43.1485,3.1092 C41.9515,-0.5768 36.7375,-0.5758 35.5405,3.1092 L12.2685,74.7342 Z" fill="#E24329" class="logo-svg-shape logo-dark-orange-shape"/> <path d="M105.0614,193.6548 L143.7014,74.7338 L197.8544,74.7338 L105.0614,193.6548 Z" fill="#FC6D26" class="logo-svg-shape logo-orange-shape"/> <path d="M197.8544,74.7341 L197.8544,74.7341 L209.5964,110.8731 C210.6674,114.1691 209.4944,117.7801 206.6904,119.8171 L105.0614,193.6551 L197.8544,74.7341 Z" fill="#FCA326" class="logo-svg-shape logo-light-orange-shape"/> <path d="M197.8544,74.7342 L143.7014,74.7342 L166.9744,3.1092 C168.1714,-0.5768 173.3854,-0.5758 174.5824,3.1092 L197.8544,74.7342 Z" fill="#E24329" class="logo-svg-shape logo-dark-orange-shape"/> </svg>
+
+  <div class='animated container'>
+    <ul class='text-center footer-social'>
+      <li> <a href="https://twitter.com/gitlab" target="_blank"><i class='fa fa-twitter'></i> <span class=sr-only>Twitter</span></a></li>
+      <li> <a href="https://www.facebook.com/gitlab" target="_blank"><i class='fa fa-facebook'></i> <span class=sr-only>Facebook</span> </a></li>
+      <li> <a href="https://www.youtube.com/channel/UCnMGQ8QHMAnVIsI3xJrihhg" target="_blank"><i class='fa fa-youtube'></i> <span class=sr-only>YouTube</span> </a></li>
+      <li> <a href="https://www.linkedin.com/company/gitlab-com" target="_blank"><i class='fa fa-linkedin'></i> <span class=sr-only>LinkedIn</span> </a></li>
+    </ul>
+    <div class=row>
+      <div class='col-sm-6 col-md-3 col-lg-2 col-lg-offset-2 footer-link-holder'>
+        <h3 class=footer-link-title>Products</h3>
+        <ul class='animated footer-links'>
+          <li><a href="https://about.gitlab.com/features" target="_blank">Features</a></li>
+          <li><a href="https://about.gitlab.com/gitlab-ee" target="_blank">Enterprise Edition</a></li>
+          <li><a href="https://about.gitlab.com/installation" target="_blank">Community Edition</a></li>
+          <li><a href="https://about.gitlab.com/gitlab-com/" target="_blank">GitLab.com</a></li>
+          <li><a href="https://about.gitlab.com/products/" target="_blank">Pricing</a></li>
+          <li><a href="https://about.gitlab.com/releases/" target="_blank">Releases</a></li>
+        </ul>
+      </div>
+      <div class='col-sm-6 col-md-3 col-lg-2 footer-link-holder'>
+        <h3 class=footer-link-title>Services</h3>
+        <ul class='animated footer-links'>
+          <li><a href="https://about.gitlab.com/resellers/" target="_blank">Resellers</a></li>
+          <li><a href="https://about.gitlab.com/services/" target="_blank">Services</a></li>
+        </ul>
+      </div>
+      <div class='col-sm-6 col-md-3 col-lg-2 footer-link-holder'>
+        <h3 class=footer-link-title>Community</h3>
+        <ul class='animated footer-links'>
+          <li><a href="https://about.gitlab.com/events/" target="_blank">Events</a></li>
+          <li><a href="https://about.gitlab.com/core-team/" target="_blank">Core Team</a></li>
+          <li><a href="http://contributors.gitlab.com/" target="_blank">Contributors</a></li>
+          <li><a href="/">Documentation</a></li>
+          <li><a href="https://about.gitlab.com/getting-help/" target="_blank">Getting Help</a></li>
+          <li><a href="https://about.gitlab.com/contributing/" target="_blank">Contributing</a></li>
+          <li><a href="https://about.gitlab.com/applications/" target="_blank">Applications</a></li>
+          <li><a href="https://about.gitlab.com/mvp/" target="_blank">Hall of Fame</a></li>
+        </ul>
+      </div>
+      <div class='col-sm-6 col-md-3 col-lg-2 footer-link-holder'>
+        <h3 class=footer-link-title>Company</h3>
+        <ul class='animated footer-links'>
+          <li><a href="https://gitlab.com/groups/gitlab-org" target="_blank">Source Code</a></li>
+          <li><a href="https://about.gitlab.com/blog/" target="_blank">Blog</a></li>
+          <li><a href="https://about.gitlab.com/press/" target="_blank">Press and Logos</a></li>
+          <li><a href="https://shop.gitlab.com/" target="_blank">Shop</a></li>
+          <li><a href="https://about.gitlab.com/about/" target="_blank">About Us</a></li>
+          <li><a href="https://about.gitlab.com/team/" target="_blank">Team</a></li>
+          <li><a href="https://about.gitlab.com/direction/" target="_blank">Direction</a></li>
+          <li><a href="https://about.gitlab.com/handbook/" target="_blank">Handbook</a></li>
+          <li><a href="https://about.gitlab.com/jobs/" target="_blank">Jobs</a></li>
+          <li><a href="https://about.gitlab.com/terms/" target="_blank">Terms</a></li>
+          <li><a href="https://about.gitlab.com/contact/" target="_blank">Contact Us</a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
diff --git a/layouts/home.html b/layouts/home.html
index 784efdc7..3acdfee5 100644
--- a/layouts/home.html
+++ b/layouts/home.html
@@ -9,7 +9,7 @@
     </div>
     <%= yield %>
 
-    <%= render '/footer.*' %>
+    <%= render '/footer_homepage.*' %>
     <%= render '/docsearch.*' %>
     <%= render '/analytics.*' %>
     <%= render '/https_redirect.*' %>