Merge branch 'wiki-bottom-padding' into 'master'

Add padding to bottom of wiki page, fix #12921. ## What does this MR do? Adds padding to the bottom of the wiki page so it's not right up against the edge of the browser window. ## What are the relevant issue numbers? #12921 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-06_at_12.21.22_PM](/uploads/9710682a57f5e521253f17a65f896f4d/Screen_Shot_2016-06-06_at_12.21.22_PM.png) After: ![Screen_Shot_2016-06-06_at_12.20.50_PM](/uploads/002068b072050e0f8146757a0386d30f/Screen_Shot_2016-06-06_at_12.20.50_PM.png) cc: @jschatz1 See merge request !4490

Merge branch 'wiki-bottom-padding' into 'master'
740a6ecb · Jacob Schatz · 0ba21860 · d2b7c39a · 740a6ecb
Commit 740a6ecb authored Jun 06, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

show.html.haml app/views/projects/wikis/show.html.haml +1 -1

No files found.
--- a/app/views/projects/wikis/show.html.haml
+++ b/app/views/projects/wikis/show.html.haml
@@ -18,7 +18,7 @@
    You can view the #{link_to "most recent version", namespace_project_wiki_path(@project.namespace, @project, @page)} or browse the #{link_to "history", namespace_project_wiki_history_path(@project.namespace, @project, @page)}.


-.wiki-holder.prepend-top-default
+.wiki-holder.prepend-top-default.append-bottom-default
  .wiki
    = preserve do
      = render_wiki_content(@page)