From 3d95730880004707ae3fff375ce29379e32eba17 Mon Sep 17 00:00:00 2001 From: kristi Date: Wed, 2 May 2012 13:00:46 -0700 Subject: [PATCH 01/30] Fix navbar and searchbar css --- lib/gollum/frontend/public/gollum/css/gollum.css | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css index 986f8e30..64eec5b3 100755 --- a/lib/gollum/frontend/public/gollum/css/gollum.css +++ b/lib/gollum/frontend/public/gollum/css/gollum.css @@ -37,6 +37,7 @@ a:hover, a:visited { /* @section head */ #head { + border-bottom: 1px solid #ccc; margin: 4.5em 0 0.5em; padding: 0.5em 0; overflow: hidden; @@ -481,7 +482,7 @@ ul.actions { ul.actions li { float: left; - font-size: 1.2em; + font-size: 1em; margin-left: 0.6em; } @@ -605,8 +606,9 @@ ul.actions { color: #000; float: left; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 1.2em; + font-size: 1em; height: 2.15em; + padding: 0 .5em; -webkit-focus-ring: none; } @@ -639,10 +641,10 @@ ul.actions { #head #searchbar #searchbar-fauxtext #search-submit span { background-image: url(/images/icon-sprite.png); - background-position: -431px 4px; + background-position: -431px 0px; background-repeat: no-repeat; display: block; - height: 2.15em; + height: 1.8em; overflow: hidden; text-indent: -5000px; width: 28px; @@ -654,6 +656,6 @@ ul.actions { } #head #searchbar #searchbar-fauxtext #search-submit:hover span { - background-position: -431px -28px; + background-position: -431px -27px; padding: 0; } From 12cf102543e72cc4561a8e718be6c9c9314696d7 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 2 May 2012 20:45:46 +0000 Subject: [PATCH 02/30] removing hardcoded reference to old version of wikicloth --- gollum.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gollum.gemspec b/gollum.gemspec index ff376b78..1bf5e919 100644 --- a/gollum.gemspec +++ b/gollum.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |s| s.add_development_dependency('org-ruby', '~>0.6.2') s.add_development_dependency('shoulda') s.add_development_dependency('rack-test') - s.add_development_dependency('wikicloth', '~> 0.6.3') + s.add_development_dependency('wikicloth') s.add_development_dependency('rake', '~> 0.9.2') # = MANIFEST = From b29d22e99ba4af76e6182c0f23d04243cba4c61c Mon Sep 17 00:00:00 2001 From: kristi Date: Wed, 2 May 2012 13:51:26 -0700 Subject: [PATCH 03/30] Make navbar flow nicely for narrow windows --- .../frontend/public/gollum/css/gollum.css | 27 ++++++++++--------- .../frontend/templates/compare.mustache | 6 +++-- .../frontend/templates/history.mustache | 6 +++-- lib/gollum/frontend/templates/page.mustache | 4 ++- lib/gollum/frontend/templates/pages.mustache | 4 ++- lib/gollum/frontend/templates/search.mustache | 4 ++- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css index 64eec5b3..57b323af 100755 --- a/lib/gollum/frontend/public/gollum/css/gollum.css +++ b/lib/gollum/frontend/public/gollum/css/gollum.css @@ -37,9 +37,8 @@ a:hover, a:visited { /* @section head */ #head { - border-bottom: 1px solid #ccc; + border-bottom: 1px solid #ddd; margin: 4.5em 0 0.5em; - padding: 0.5em 0; overflow: hidden; } @@ -209,6 +208,7 @@ a:hover, a:visited { /* @section page-footer */ .page #footer { + border-top: 1px solid #ddd; margin: 1em 0 7em; } @@ -482,8 +482,9 @@ ul.actions { ul.actions li { float: left; - font-size: 1em; + font-size: 0.9em; margin-left: 0.6em; + margin-bottom: 0.6em; } .minibutton a { @@ -595,28 +596,30 @@ ul.actions { background: #fff; border: 1px solid #d4d4d4; overflow: hidden; + height: 2.0em; border-radius: 0.3em; -moz-border-radius: 0.3em; -webkit-border-radius: 0.3em; } + .ie #head #searchbar #searchbar-fauxtext, + .ff #head #searchbar #searchbar-fauxtext { + height: 2.2em + } + #head #searchbar #searchbar-fauxtext input#search-query { border: none; color: #000; float: left; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 1em; - height: 2.15em; + height: inherit; padding: 0 .5em; -webkit-focus-ring: none; } - .ff #head #searchbar #searchbar-fauxtext input#search-query { - padding: 0.2em 0 0.2em 0.5em; - } - .ie #head #searchbar #searchbar-fauxtext input#search-query { padding: 0.4em 0 0 0.5em; } @@ -632,7 +635,7 @@ ul.actions { margin: 0 !important; padding: 0; float: right; - font-size: 1.2em; + height: inherit; border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; @@ -641,10 +644,10 @@ ul.actions { #head #searchbar #searchbar-fauxtext #search-submit span { background-image: url(/images/icon-sprite.png); - background-position: -431px 0px; + background-position: -431px -1px; background-repeat: no-repeat; display: block; - height: 1.8em; + height: inherit; overflow: hidden; text-indent: -5000px; width: 28px; @@ -656,6 +659,6 @@ ul.actions { } #head #searchbar #searchbar-fauxtext #search-submit:hover span { - background-position: -431px -27px; + background-position: -431px -28px; padding: 0; } diff --git a/lib/gollum/frontend/templates/compare.mustache b/lib/gollum/frontend/templates/compare.mustache index db079950..254a9b1f 100644 --- a/lib/gollum/frontend/templates/compare.mustache +++ b/lib/gollum/frontend/templates/compare.mustache @@ -3,10 +3,12 @@

History for {{path}}

- {{>searchbar}} {{#message}} @@ -50,4 +52,4 @@ - \ No newline at end of file + diff --git a/lib/gollum/frontend/templates/history.mustache b/lib/gollum/frontend/templates/history.mustache index eb4b6f5b..930f76b1 100644 --- a/lib/gollum/frontend/templates/history.mustache +++ b/lib/gollum/frontend/templates/history.mustache @@ -2,12 +2,14 @@
@@ -57,4 +59,4 @@ class="action-back-to-top">Back to Top
- \ No newline at end of file + diff --git a/lib/gollum/frontend/templates/page.mustache b/lib/gollum/frontend/templates/page.mustache index 9739c07f..8d29fb4c 100644 --- a/lib/gollum/frontend/templates/page.mustache +++ b/lib/gollum/frontend/templates/page.mustache @@ -2,6 +2,9 @@
diff --git a/lib/gollum/frontend/templates/pages.mustache b/lib/gollum/frontend/templates/pages.mustache index ca666666..5e723705 100644 --- a/lib/gollum/frontend/templates/pages.mustache +++ b/lib/gollum/frontend/templates/pages.mustache @@ -2,10 +2,12 @@
diff --git a/lib/gollum/frontend/templates/search.mustache b/lib/gollum/frontend/templates/search.mustache index 080fc9c7..6152f25c 100644 --- a/lib/gollum/frontend/templates/search.mustache +++ b/lib/gollum/frontend/templates/search.mustache @@ -2,10 +2,12 @@
From 5a7cb129bbfc26c7ee5aaf6aaa4cd672a8573848 Mon Sep 17 00:00:00 2001 From: kristi Date: Wed, 2 May 2012 15:52:15 -0700 Subject: [PATCH 04/30] Fixup css styling for pages, editor, history --- .../frontend/public/gollum/css/editor.css | 35 ++++++++----------- .../frontend/public/gollum/css/gollum.css | 17 ++++++--- .../frontend/public/gollum/css/template.css | 31 ++++++++-------- 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/editor.css b/lib/gollum/frontend/public/gollum/css/editor.css index caa5254d..cadd47bc 100755 --- a/lib/gollum/frontend/public/gollum/css/editor.css +++ b/lib/gollum/frontend/public/gollum/css/editor.css @@ -30,6 +30,7 @@ a { -webkit-border-radius: 1em; } +.ff #gollum-editor, .ie #gollum-editor { padding-bottom: 1em; } @@ -51,9 +52,9 @@ a { background: #fff; border: 1px solid #ddd; color: #000; - font-size: 1.3em; + font-size: 1.1em; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - line-height: 1.8em; + line-height: 1.5em; margin: 1em 0 0.4em; padding: 0.5em; width: 98%; @@ -192,44 +193,36 @@ a#function-help:hover span { background-position: -405px -28px; } #gollum-editor #gollum-editor-function-bar #gollum-editor-format-selector { overflow: hidden; - padding: 0 0 1.1em 0; + padding: .2em 0 .5em 0; } #gollum-editor #gollum-editor-function-bar #gollum-editor-format-selector select { background-color: #f9f9f9; - border: 1px solid transparent; + border: 1px solid #ddd; + color: #333; float: right; - font-size: 1.1em; + font-size: 1em; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: bold; line-height: 1.6em; - padding: 0.5em 0.7em; - margin-bottom: 0; + padding: 0.3em 0.4em; border-radius: 0.5em; -moz-border-radius: 0.5em; -webkit-border-radius: 0.5em; - -moz-outline: none; -} - -#gollum-editor #gollum-editor-function-bar - #gollum-editor-format-selector select:hover { - background-color: #fff; - border: 1px solid #ddd; - -moz-outline: none; } #gollum-editor #gollum-editor-function-bar #gollum-editor-format-selector label { color: #999; float: right; - font-size: 1.1em; + font-size: 1em; font-weight: bold; line-height: 1.6em; - padding: 0.6em 0.5em 0 0; + padding: .3em 0.5em 0 0; } #gollum-editor #gollum-editor-function-bar @@ -243,9 +236,9 @@ a#function-help:hover span { background-position: -405px -28px; } #gollum-editor textarea#gollum-editor-body { background: #fff; border: 1px solid #ddd; - font-size: 1.3em; + font-size: 1em; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - line-height: 1.8em; + line-height: 1.4em; margin: 1em 0 0.4em; padding: 0.5em; /* I don't really like mixing pct & em here… */ width: 98%; @@ -259,7 +252,7 @@ a#function-help:hover span { background-position: -405px -28px; } cursor: pointer; display: block; float: left; - font-size: 1.2em; + font-size: 1em; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: bold; margin: 0; @@ -403,7 +396,7 @@ a#function-help:hover span { background-position: -405px -28px; } color: #333; cursor: pointer; display: block; - font-size: 1.2em; + font-size: 1em; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: bold; line-height: 1.2em; diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css index 57b323af..48e58448 100755 --- a/lib/gollum/frontend/public/gollum/css/gollum.css +++ b/lib/gollum/frontend/public/gollum/css/gollum.css @@ -142,6 +142,7 @@ a:hover, a:visited { } /* @section footer */ + #wiki-footer { clear: both; margin: 2em 0 5em; @@ -236,12 +237,12 @@ a:hover, a:visited { } #wiki-history { - margin-top: 3em; + margin-top: 2em; } #wiki-history fieldset { border: 0; - margin: 2em 0; + margin: 1em 0; padding: 0; } @@ -263,14 +264,14 @@ a:hover, a:visited { #wiki-history table tr td { border: 1px solid #c0dce9; - font-size: 1.2em; + font-size: 1em; line-height: 1.6em; margin: 0; padding: 0.3em 0.7em; } #wiki-history table tr td.checkbox { - min-width: 2em; + width: 4em; padding: 0.3em; } @@ -279,7 +280,9 @@ a:hover, a:visited { display: block; padding-right: 0; padding-top: 0.4em; - margin-right: -0.2em; + margin: 0 auto; + width: 1.2em; + height: 1.2em; } #wiki-history table tr:nth-child(2n), @@ -332,6 +335,10 @@ a:hover, a:visited { padding: 0 0.2em; } +.history #footer { + margin-bottom: 7em; +} + .history #wiki-history ul.actions li, .history #footer ul.actions li { margin: 0 0.6em 0 0; diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css index 9dc26c9d..398546f2 100644 --- a/lib/gollum/frontend/public/gollum/css/template.css +++ b/lib/gollum/frontend/public/gollum/css/template.css @@ -10,7 +10,7 @@ html, body { - color: black; + color: #333; } body { @@ -24,7 +24,7 @@ img { #template { font-size: 14px; - line-height: 1.4; + line-height: 1.6; margin-bottom: 40px; } @@ -35,7 +35,7 @@ a.absent { /* Primary Body Copy */ #template p { - margin: 1em 0; + margin: 1.4em 0; padding: 0; } @@ -52,17 +52,17 @@ a.absent { } #template h1 { - border-bottom: 1px solid #ccc; - font-size: 33px; /* was 32, GH is 33px */ + font-size: 28px; line-height: normal; - padding: .08em 0 0 0; - margin: 0; + padding: 10px 0 0 0; + margin: 30px 0 10px; } #template h2 { + border-bottom: 1px solid #ddd; font-size: 22px; - line-height: normal; - margin: 22px 0 0; + line-height: 1.6; + margin: 22px 0 10px; padding: 7px 0 0; } @@ -110,16 +110,16 @@ a.absent { /* Border Reset for headers with horizontal rules */ #template > h2:first-child, #template > h1:first-child { - margin: 12px 0 0; - padding: 10px 0 0; + margin: 12px 0 10px; + padding: 10px 0 10px; } /* Lists, Blockquotes & Such */ #template ul, #template ol { - margin-top: 1.5em; - margin-left: 2.6em; + margin: 15px 0; + padding-left: 30px; } /* Nested Lists */ @@ -132,7 +132,7 @@ a.absent { #template ul ul, #template ol ol { padding: 0; - margin: .5em 0; + margin: 15px 0; } #template dl { @@ -286,7 +286,7 @@ a.absent { background-color: #f8f8f8; border: 1px solid #dedede; font-size: 13px; - padding: 0; + padding: 1px 5px; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -313,6 +313,7 @@ pre, code { #template pre code, #template pre tt { background-color: transparent; border: none; + padding: 0; } /* From 4c1ff7deb7263cb913690bd1db3f025ec7563479 Mon Sep 17 00:00:00 2001 From: kristi Date: Wed, 2 May 2012 16:55:16 -0700 Subject: [PATCH 05/30] 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}}