From 4c1ff7deb7263cb913690bd1db3f025ec7563479 Mon Sep 17 00:00:00 2001 From: kristi Date: Wed, 2 May 2012 16:55:16 -0700 Subject: [PATCH] fixup the compare revisions page --- lib/gollum/frontend/public/gollum/css/gollum.css | 16 ++++++++++++++-- lib/gollum/frontend/templates/compare.mustache | 10 +++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css index 48e58448..cf73ebc9 100755 --- a/lib/gollum/frontend/public/gollum/css/gollum.css +++ b/lib/gollum/frontend/public/gollum/css/gollum.css @@ -418,10 +418,14 @@ a:hover, a:visited { .compare .data { border: 1px solid #ddd; - margin-top: 1em; + margin: 1em 0 2em; overflow: auto; } + .compare .data table { + width: 100%; + } + .compare .data pre { margin: 0; padding: 0; @@ -434,11 +438,15 @@ a:hover, a:visited { .compare .data tr td { font-family: "Consolas", "Monaco", "Andale Mono", "Courier New", monospace; font-size: 1.2em; - line-height: 1.8em; + line-height: 1.2em; margin: 0; padding: 0; } + .compare .data tr td + td + td { + width: 100%; + } + .compare .data td.line_numbers { background: #f7f7f7; border-right: 1px solid #999; @@ -452,6 +460,10 @@ a:hover, a:visited { margin-right: 0.6em; } +.compare #footer { + margin-bottom: 7em; +} + /* @control syntax */ diff --git a/lib/gollum/frontend/templates/compare.mustache b/lib/gollum/frontend/templates/compare.mustache index 254a9b1f..c06eadf6 100644 --- a/lib/gollum/frontend/templates/compare.mustache +++ b/lib/gollum/frontend/templates/compare.mustache @@ -6,8 +6,12 @@
  • {{>searchbar}}
  • +
  • View Page
  • +
  • Edit Page
  • Back to Page History
  • + class="action-page-history">Page History @@ -19,6 +23,8 @@ {{#show_revert}}