Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io

_layouts/docwithnav.html

@@ -32,8 +32,8 @@ layout: headerfooter
         {% assign tree = site.data[page.versionfilesafe][foundTOC].toc %}{% include tree.html %}
         </div> <!-- /pi-accordion -->
 	</div> <!-- /docsToc -->
-	<div id="docsContent">{% if page.showedit == true %}<a href="/{{ page.version }}/editdocs#{{ page.path }}" class="button" style="float:right;margin-top:20px;">Edit This Page</a>{% endif %}
-    	{% if hideTitle != true %}<h1>{{ page.title }}</h1>{% endif %}
+	<div id="docsContent">{% if page.showedit == true %}<a href="/{{ page.version }}/editdocs#{{ page.path }}" id="editPageButton">Edit This Page</a>{% endif %}
+    	<h1>{{ page.title }}</h1>
 		{{ content }}
         <p><a href=""><img src="https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/{{ page.path }}?pixel" alt="Analytics" /></a>
 	</div>