From 2cb0c9fea64ea3538dc15c5f6a01518c25984f9a Mon Sep 17 00:00:00 2001 From: kristi Date: Sun, 6 May 2012 17:25:04 -0700 Subject: [PATCH 01/10] Fix urls --- lib/gollum/frontend/public/gollum/css/template.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css index e00df341..9e167f44 100644 --- a/lib/gollum/frontend/public/gollum/css/template.css +++ b/lib/gollum/frontend/public/gollum/css/template.css @@ -68,7 +68,7 @@ a.absent { .markdown-body h4:hover a.anchor, .markdown-body h5:hover a.anchor, .markdown-body h6:hover a.anchor { - background: url('../../images/modules/styleguide/para.png') no-repeat 10px center; + background: url('/images/para.png') no-repeat 10px center; text-decoration: none; } .markdown-body h1 tt, @@ -118,7 +118,7 @@ a.absent { margin: 15px 0 } .markdown-body hr { - background: transparent url('../../images/modules/pulls/dirty-shade.png') repeat-x 0 0; + background: transparent url('/images/dirty-shade.png') repeat-x 0 0; border: 0 none; color: #ccc; height: 4px; From 50107504a656a779421804698100404c24b7a178 Mon Sep 17 00:00:00 2001 From: kristi Date: Sun, 6 May 2012 17:25:39 -0700 Subject: [PATCH 02/10] Add images from github --- .../public/gollum/images/dirty-shade.png | Bin 0 -> 939 bytes .../frontend/public/gollum/images/para.png | Bin 0 -> 1048 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/gollum/frontend/public/gollum/images/dirty-shade.png create mode 100644 lib/gollum/frontend/public/gollum/images/para.png diff --git a/lib/gollum/frontend/public/gollum/images/dirty-shade.png b/lib/gollum/frontend/public/gollum/images/dirty-shade.png new file mode 100644 index 0000000000000000000000000000000000000000..3e0e9c90bdf0469caf1afc7f7b8e35dc41aa99ad GIT binary patch literal 939 zcmaJ=&yLbS9Bu?RX5%J%)r*sIm3CVGv`naLX~At`2>}v0I68E`#B(wv*x$VPM%sc<5`*!CP28u*qoIUzjFg2jXA466 zB8#!NBn(W+JctbO_ovSy2z*0))^MR4TVxSjZWA)v_Q&3K>9u_E;t^-VUUGa zQHnA{-032I&aY(=>>zAuh}S_)+ySs?LO?@;RSz~HXeyFYt81F}5U5arGE`+nttuL- zsR%-_|3vOB@n>jg_x8THWrz#LVkFD!^;%ljB$~`+rPXTX8me05h-$it7|yCuS}7E4 zl6pxHvw%h*SHx4gVur{gy-p#F53*6ZFB31AoZ(njB$%gE0A2V0&@eopQ#K?w@%~dd z9dBYH4@pW_iN_l^tK_a?WF-VMnv5yEDyleGP)5@Qje#|402g~fl-oPJ>mnyg8IC;S z*oMdzq#*E-ZdtvWshQ12(^Ql$>}Z|3sn>K(wbWLxt`}UJdaIB`tl;`L+|E&MJ_=#X zJ=-J+UJ}2T&=BlWM#1q|^rL!vu75n1)={p^gOT&b{?+K>ice2|Jd7-TSeeBn>xfn%HF?B~>feETarsWeTXe}C6gl9dganLhU$?bv4U>&^lNpMnERjTwcI_K$pnbJ{xI#Ff zH$r0c;=!Aq3I6~G(Qx5t;>i2#A6R>(50lDh68CTHRb0wr5tMH-4GwOBT` z){L~t&fWzxflLK#M060?>y9r68Mdh_({*^vv!DqfYZ>-DsTFkzzP>A!84k;!iWl@sj)1dXRG@55tWlbrzV$ofOtr6nNJYTQZxq5=b-YPGo z)9Fwn9*g4fyse-h-|#G#Sl9ufqF%upB*W57&#z#+9a+b3*+dQF1Ks5X z4u)5116B3^P}}aHeWIa@eE%uzmp5I+YskkNo+FsbT><%Ha+rnsugCC4YaW1y0f zVQDzdvP?Ohm!x!lE}lxkq97E6l$c5@sf41$b43y6l5MVnjSU+)q|G%ixQVXZux@OZ zMplq#y+CHs!!~I8BU{~bfnD`lT(f&FLRT(Nli|ZE_^T?~N3_(!Wv9mJrqdX-UbIgYT8!jmB(bV&|JMRl8 Td-L}vXeg#sSX2(?p1t}5UOquV literal 0 HcmV?d00001 From 6b971e9e1b4b07f13bffbca63cabf552c0f317ae Mon Sep 17 00:00:00 2001 From: kristi Date: Sun, 6 May 2012 17:36:07 -0700 Subject: [PATCH 03/10] uniform spacing for css --- .../frontend/public/gollum/css/template.css | 174 +++++++++--------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css index 9e167f44..834f5120 100644 --- a/lib/gollum/frontend/public/gollum/css/template.css +++ b/lib/gollum/frontend/public/gollum/css/template.css @@ -346,227 +346,227 @@ a.absent { } .highlight { - background: #fff + background: #fff } .highlight .c { - color: #998; - font-style: italic; + color: #998; + font-style: italic; } .highlight .err { - color: #a61717; - background-color: #e3d2d2; + color: #a61717; + background-color: #e3d2d2; } .highlight .k { - font-weight: bold + font-weight: bold } .highlight .o { - font-weight: bold + font-weight: bold } .highlight .cm { - color: #998; - font-style: italic; + color: #998; + font-style: italic; } .highlight .cp { - color: #999; - font-weight: bold; + color: #999; + font-weight: bold; } .highlight .c1 { - color: #998; - font-style: italic; + color: #998; + font-style: italic; } .highlight .cs { - color: #999; - font-weight: bold; - font-style: italic; + color: #999; + font-weight: bold; + font-style: italic; } .highlight .gd { - color: #000; - background-color: #fdd; + color: #000; + background-color: #fdd; } .highlight .gd .x { - color: #000; - background-color: #faa; + color: #000; + background-color: #faa; } .highlight .ge { - font-style: italic + font-style: italic } .highlight .gr { - color: #a00 + color: #a00 } .highlight .gh { - color: #999 + color: #999 } .highlight .gi { - color: #000; - background-color: #dfd; + color: #000; + background-color: #dfd; } .highlight .gi .x { - color: #000; - background-color: #afa; + color: #000; + background-color: #afa; } .highlight .go { - color: #888 + color: #888 } .highlight .gp { - color: #555 + color: #555 } .highlight .gs { - font-weight: bold + font-weight: bold } .highlight .gu { - color: #800080; - font-weight: bold; + color: #800080; + font-weight: bold; } .highlight .gt { - color: #a00 + color: #a00 } .highlight .kc { - font-weight: bold + font-weight: bold } .highlight .kd { - font-weight: bold + font-weight: bold } .highlight .kn { - font-weight: bold + font-weight: bold } .highlight .kp { - font-weight: bold + font-weight: bold } .highlight .kr { - font-weight: bold + font-weight: bold } .highlight .kt { - color: #458; - font-weight: bold; + color: #458; + font-weight: bold; } .highlight .m { - color: #099 + color: #099 } .highlight .s { - color: #d14 + color: #d14 } .highlight .na { - color: #008080 + color: #008080 } .highlight .nb { - color: #0086B3 + color: #0086B3 } .highlight .nc { - color: #458; - font-weight: bold; + color: #458; + font-weight: bold; } .highlight .no { - color: #008080 + color: #008080 } .highlight .ni { - color: #800080 + color: #800080 } .highlight .ne { - color: #900; - font-weight: bold; + color: #900; + font-weight: bold; } .highlight .nf { - color: #900; - font-weight: bold; + color: #900; + font-weight: bold; } .highlight .nn { - color: #555 + color: #555 } .highlight .nt { - color: #000080 + color: #000080 } .highlight .nv { - color: #008080 + color: #008080 } .highlight .ow { - font-weight: bold + font-weight: bold } .highlight .w { - color: #bbb + color: #bbb } .highlight .mf { - color: #099 + color: #099 } .highlight .mh { - color: #099 + color: #099 } .highlight .mi { - color: #099 + color: #099 } .highlight .mo { - color: #099 + color: #099 } .highlight .sb { - color: #d14 + color: #d14 } .highlight .sc { - color: #d14 + color: #d14 } .highlight .sd { - color: #d14 + color: #d14 } .highlight .s2 { - color: #d14 + color: #d14 } .highlight .se { - color: #d14 + color: #d14 } .highlight .sh { - color: #d14 + color: #d14 } .highlight .si { - color: #d14 + color: #d14 } .highlight .sx { - color: #d14 + color: #d14 } .highlight .sr { - color: #009926 + color: #009926 } .highlight .s1 { - color: #d14 + color: #d14 } .highlight .ss { - color: #990073 + color: #990073 } .highlight .bp { - color: #999 + color: #999 } .highlight .vc { - color: #008080 + color: #008080 } .highlight .vg { - color: #008080 + color: #008080 } .highlight .vi { - color: #008080 + color: #008080 } .highlight .il { - color: #099 + color: #099 } .highlight .gc { - color: #999; - background-color: #EAF2F5; + color: #999; + background-color: #EAF2F5; } .type-csharp .highlight .k { - color: #00F + color: #00F } .type-csharp .highlight .kt { - color: #00F + color: #00F } .type-csharp .highlight .nf { - color: #000; - font-weight: normal; + color: #000; + font-weight: normal; } .type-csharp .highlight .nc { - color: #2B91AF + color: #2B91AF } .type-csharp .highlight .nn { - color: #000 + color: #000 } .type-csharp .highlight .s { - color: #A31515 + color: #A31515 } .type-csharp .highlight .sc { - color: #A31515 + color: #A31515 } From 33af47c2829b0abd7bf4711c669a86e4fbbaaf43 Mon Sep 17 00:00:00 2001 From: kristi Date: Mon, 7 May 2012 00:20:59 -0700 Subject: [PATCH 04/10] Make code border darker --- lib/gollum/frontend/public/gollum/css/template.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css index 834f5120..b2075ec4 100644 --- a/lib/gollum/frontend/public/gollum/css/template.css +++ b/lib/gollum/frontend/public/gollum/css/template.css @@ -318,7 +318,7 @@ a.absent { margin: 0 2px; padding: 0 5px; white-space: nowrap; - border: 1px solid #eaeaea; + border: 1px solid #ddd; background-color: #f8f8f8; border-radius: 3px; } From 5d259bb5aa955046b5394075e0f8c89f47f06fab Mon Sep 17 00:00:00 2001 From: kristi Date: Mon, 7 May 2012 20:09:59 -0700 Subject: [PATCH 05/10] Use markdown css formatting for header and footer --- lib/gollum/frontend/templates/page.mustache | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/gollum/frontend/templates/page.mustache b/lib/gollum/frontend/templates/page.mustache index 3e6a3a20..d60ae5d6 100644 --- a/lib/gollum/frontend/templates/page.mustache +++ b/lib/gollum/frontend/templates/page.mustache @@ -22,7 +22,7 @@
{{#has_header}}
-
+
{{{header_content}}}
@@ -33,14 +33,14 @@
{{#has_sidebar}}
-
+
{{{sidebar_content}}}
{{/has_sidebar}} {{#has_footer}}
-
+
{{{footer_content}}}
From 8a8afcfb2453e2aa17085434e72d3efff7e6d23f Mon Sep 17 00:00:00 2001 From: kristi Date: Mon, 7 May 2012 20:28:07 -0700 Subject: [PATCH 06/10] Put gray background on header, fix footer font size --- .../frontend/public/gollum/css/gollum.css | 112 +++++++++--------- 1 file changed, 58 insertions(+), 54 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css index 26adf4c1..656bfe41 100755 --- a/lib/gollum/frontend/public/gollum/css/gollum.css +++ b/lib/gollum/frontend/public/gollum/css/gollum.css @@ -116,71 +116,75 @@ a:hover, a:visited { content: "← "; } - /* @section footer */ +/* @section footer */ - #wiki-footer { - clear: both; - margin: 2em 0 5em; - } +#wiki-footer { + clear: both; + margin: 2em 0 5em; +} - .has-rightbar #wiki-footer { - width: 70%; - } +.has-rightbar #wiki-footer { + width: 70%; +} - #wiki-footer #footer-content { - background-color: #f7f7f7; - border: 1px solid #ddd; - font-size: 1.2em; - line-height: 1.5em; - margin-top: 1.5em; - padding: 1em; +#wiki-header #header-content, +#wiki-footer #footer-content { + background-color: #f7f7f7; + border: 1px solid #ddd; + padding: 1em; - border-radius: 0.5em; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - } + border-radius: 0.5em; + -moz-border-radius: 0.5em; + -webkit-border-radius: 0.5em; +} +#wiki-header #header-content { + margin-bottom: 1.5em; +} +#wiki-footer #footer-content { + margin-top: 1.5em; +} - #wiki-footer #footer-content h3 { - font-size: 1.2em; - color: #333; - margin: 0; - padding: 0 0 0.2em; - text-shadow: 0 1px 0 #fff; - } +#wiki-footer #footer-content h3 { + font-size: 1.2em; + color: #333; + margin: 0; + padding: 0 0 0.2em; + text-shadow: 0 1px 0 #fff; +} - #wiki-footer #footer-content p { - margin: 0.5em 0 0; - padding: 0; - } +#wiki-footer #footer-content p { + margin: 0.5em 0 0; + padding: 0; +} - #wiki-footer #footer-content ul.links { - margin: 0.5em 0 0; - overflow: hidden; - padding: 0; - } +#wiki-footer #footer-content ul.links { + margin: 0.5em 0 0; + overflow: hidden; + padding: 0; +} - #wiki-footer #footer-content ul.links li { - color: #999; - float: left; - list-style-position: inside; - list-style-type: square; - padding: 0; - margin-left: 0.75em; - } +#wiki-footer #footer-content ul.links li { + color: #999; + float: left; + list-style-position: inside; + list-style-type: square; + padding: 0; + margin-left: 0.75em; +} - #wiki-footer #footer-content ul.links li a { - font-weight: bold; - text-shadow: 0 1px 0 #fff; - } +#wiki-footer #footer-content ul.links li a { + font-weight: bold; + text-shadow: 0 1px 0 #fff; +} - #wiki-footer #footer-content ul.links li:first-child { - list-style-type: none; - margin: 0; - } +#wiki-footer #footer-content ul.links li:first-child { + list-style-type: none; + margin: 0; +} - .ff #wiki-footer #footer-content ul.links li:first-child { - margin: 0 -0.75em 0 0; - } +.ff #wiki-footer #footer-content ul.links li:first-child { + margin: 0 -0.75em 0 0; +} /* @section page-footer */ .page #footer { From 42c7d0ca44a455dffbd742d27826dd3e6d0077f7 Mon Sep 17 00:00:00 2001 From: kristi Date: Mon, 7 May 2012 20:35:28 -0700 Subject: [PATCH 07/10] Fix crazy spacing (sorry, git blame, I couldn't stand it any longer) --- .../frontend/public/gollum/css/gollum.css | 560 +++++++++--------- 1 file changed, 280 insertions(+), 280 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css index 656bfe41..f4502202 100755 --- a/lib/gollum/frontend/public/gollum/css/gollum.css +++ b/lib/gollum/frontend/public/gollum/css/gollum.css @@ -42,13 +42,13 @@ a:hover, a:visited { overflow: hidden; } - #head h1 { - display: none; - } +#head h1 { + display: none; +} - #head ul.actions { - float: right; - } +#head ul.actions { + float: right; +} /* @section content */ #wiki-content { @@ -56,65 +56,65 @@ a:hover, a:visited { overflow: visible; } - #wiki-content .wrap { - height: 1%; - overflow: auto; - } +#wiki-content .wrap { + height: 1%; + overflow: auto; +} - /* @section comments */ - #wiki-body #inline-comment { - display: none; /* todo */ - } +/* @section comments */ +#wiki-body #inline-comment { + display: none; /* todo */ +} - /* @section body */ - #wiki-body { - display: block; - float: left; - margin-right: 3%; - margin-bottom: 40px; - width: 100%; - } +/* @section body */ +#wiki-body { + display: block; + float: left; + margin-right: 3%; + margin-bottom: 40px; + width: 100%; +} - .has-rightbar #wiki-body { - width: 68%; - } +.has-rightbar #wiki-body { + width: 68%; +} - /* @section rightbar */ - #wiki-rightbar { - background-color: #f7f7f7; - border: 1px solid #ddd; - font-size: 13px; - float: right; - padding: 7px; - width: 25%; - color: #555; +/* @section rightbar */ +#wiki-rightbar { + background-color: #f7f7f7; + border: 1px solid #ddd; + font-size: 13px; + float: right; + padding: 7px; + width: 25%; + color: #555; - border-radius: 0.5em; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - } + border-radius: 0.5em; + -moz-border-radius: 0.5em; + -webkit-border-radius: 0.5em; +} - #wiki-rightbar p { - margin: 13px 0 0; - } +#wiki-rightbar p { + margin: 13px 0 0; +} - #wiki-rightbar > p:first-child { - margin-top: 10px; - } +#wiki-rightbar > p:first-child { + margin-top: 10px; +} - #wiki-rightbar p.parent { - border-bottom: 1px solid #bbb; - font-weight: bold; - margin: 0 0 0.5em 0; - padding: 0 0 0.5em 0; - text-shadow: 0 1px 0 #fff; - } +#wiki-rightbar p.parent { + border-bottom: 1px solid #bbb; + font-weight: bold; + margin: 0 0 0.5em 0; + padding: 0 0 0.5em 0; + text-shadow: 0 1px 0 #fff; +} - /* Back arrow */ - #wiki-rightbar p.parent:before { - color: #666; - content: "← "; - } +/* Back arrow */ +#wiki-rightbar p.parent:before { + color: #666; + content: "← "; +} /* @section footer */ @@ -186,22 +186,22 @@ a:hover, a:visited { margin: 0 -0.75em 0 0; } - /* @section page-footer */ - .page #footer { - border-top: 1px solid #ddd; - margin: 1em 0 7em; - } +/* @section page-footer */ +.page #footer { + border-top: 1px solid #ddd; + margin: 1em 0 7em; +} - #footer p#last-edit { - font-size: .9em; - line-height: 1.6em; - color: #999; - margin: 0.9em 0; - } +#footer p#last-edit { + font-size: .9em; + line-height: 1.6em; + color: #999; + margin: 0.9em 0; +} - #footer p#last-edit span.username { - font-weight: bold; - } +#footer p#last-edit span.username { + font-weight: bold; +} /* @section history */ @@ -210,109 +210,109 @@ a:hover, a:visited { font-weight: normal; } - .history h1 strong { - color: #000; - font-weight: bold; - } +.history h1 strong { + color: #000; + font-weight: bold; +} #wiki-history { margin-top: 2em; } - #wiki-history fieldset { - border: 0; - margin: 1em 0; - padding: 0; - } +#wiki-history fieldset { + border: 0; + margin: 1em 0; + padding: 0; +} - #wiki-history table, #wiki-history tbody { - border-collapse: collapse; - padding: 0; - margin: 0; - width: 100%; - } +#wiki-history table, #wiki-history tbody { + border-collapse: collapse; + padding: 0; + margin: 0; + width: 100%; +} - #wiki-history table tr { - padding: 0; - margin: 0; - } +#wiki-history table tr { + padding: 0; + margin: 0; +} - #wiki-history table tr { - background-color: #ebf2f6; - } +#wiki-history table tr { + background-color: #ebf2f6; +} - #wiki-history table tr td { - border: 1px solid #c0dce9; - font-size: 1em; - line-height: 1.6em; - margin: 0; - padding: 0.3em 0.7em; - } +#wiki-history table tr td { + border: 1px solid #c0dce9; + font-size: 1em; + line-height: 1.6em; + margin: 0; + padding: 0.3em 0.7em; +} - #wiki-history table tr td.checkbox { - width: 4em; - padding: 0.3em; - } +#wiki-history table tr td.checkbox { + width: 4em; + padding: 0.3em; +} - #wiki-history table tr td.checkbox input { - cursor: pointer; - display: block; - padding-right: 0; - padding-top: 0.4em; - margin: 0 auto; - width: 1.2em; - height: 1.2em; - } +#wiki-history table tr td.checkbox input { + cursor: pointer; + display: block; + padding-right: 0; + padding-top: 0.4em; + margin: 0 auto; + width: 1.2em; + height: 1.2em; +} - #wiki-history table tr:nth-child(2n), - #wiki-history table tr.alt-row { - background-color: #f3f7fa; - } +#wiki-history table tr:nth-child(2n), +#wiki-history table tr.alt-row { + background-color: #f3f7fa; +} - #wiki-history table tr.selected { - background-color: #ffffea !important; - z-index: 100; - } +#wiki-history table tr.selected { + background-color: #ffffea !important; + z-index: 100; +} - #wiki-history table tr td.commit-name { - border-left: 0; - } +#wiki-history table tr td.commit-name { + border-left: 0; +} - #wiki-history table tr td.commit-name span.time-elapsed { - color: #999; - } +#wiki-history table tr td.commit-name span.time-elapsed { + color: #999; +} - #wiki-history table tr td.author { - width: 20%; - } +#wiki-history table tr td.author { + width: 20%; +} - #wiki-history table tr td.author a { - color: #000; - font-weight: bold; - } +#wiki-history table tr td.author a { + color: #000; + font-weight: bold; +} - #wiki-history table tr td.author a span.username { - display: block; - padding-top: 3px; - } +#wiki-history table tr td.author a span.username { + display: block; + padding-top: 3px; +} - #wiki-history table tr td img { - background-color: #fff; - border: 1px solid #999; - display: block; - float: left; - height: 18px; - overflow: hidden; - margin: 0 0.5em 0 0; - width: 18px; - padding: 2px; - } +#wiki-history table tr td img { + background-color: #fff; + border: 1px solid #999; + display: block; + float: left; + height: 18px; + overflow: hidden; + margin: 0 0.5em 0 0; + width: 18px; + padding: 2px; +} - #wiki-history table tr td.commit-name a { - font-size: 0.9em; - font-family: 'Monaco', 'Andale Mono', Consolas, 'Courier New', monospace; - padding: 0 0.2em; - } +#wiki-history table tr td.commit-name a { + font-size: 0.9em; + font-family: 'Monaco', 'Andale Mono', Consolas, 'Courier New', monospace; + padding: 0 0.2em; +} .history #footer { margin-bottom: 7em; @@ -330,10 +330,10 @@ a:hover, a:visited { font-weight: normal; } - .edit h1 strong { - color: #000; - font-weight: bold; - } +.edit h1 strong { + color: #000; + font-weight: bold; +} /* @section search */ @@ -342,42 +342,42 @@ a:hover, a:visited { font-weight: normal; } - .results h1 strong { - color: #000; - font-weight: bold; - } +.results h1 strong { + color: #000; + font-weight: bold; +} - .results #results { - border-bottom: 1px solid #ccc; - margin-bottom: 2em; - padding-bottom: 2em; - } +.results #results { + border-bottom: 1px solid #ccc; + margin-bottom: 2em; + padding-bottom: 2em; +} - .results #results ul { - margin: 2em 0 0 0; - padding: 0; - } +.results #results ul { + margin: 2em 0 0 0; + padding: 0; +} - .results #results ul li { - font-size: 1.2em; - line-height: 1.6em; - list-style-position: outside; - padding: 0.2em 0; - } +.results #results ul li { + font-size: 1.2em; + line-height: 1.6em; + list-style-position: outside; + padding: 0.2em 0; +} - .results #results ul li span.count { - color: #999; - } +.results #results ul li span.count { + color: #999; +} - .results p#no-results { - font-size: 1.2em; - line-height: 1.6em; - margin-top: 2em; - } +.results p#no-results { + font-size: 1.2em; + line-height: 1.6em; + margin-top: 2em; +} - .results #footer ul.actions li { - margin: 0 1em 0 0; - } +.results #footer ul.actions li { + margin: 0 1em 0 0; +} /* @section compare */ @@ -386,52 +386,52 @@ a:hover, a:visited { font-weight: normal; } - .compare h1 strong { - color: #000; - font-weight: bold; - } +.compare h1 strong { + color: #000; + font-weight: bold; +} - .compare #compare-content { - margin-top: 3em; - } +.compare #compare-content { + margin-top: 3em; +} - .compare .data { - border: 1px solid #ddd; - margin: 1em 0 2em; - overflow: auto; - } +.compare .data { + border: 1px solid #ddd; + margin: 1em 0 2em; + overflow: auto; +} - .compare .data table { - width: 100%; - } +.compare .data table { + width: 100%; +} - .compare .data pre { - margin: 0; - padding: 0; - } +.compare .data pre { + margin: 0; + padding: 0; +} - .compare .data pre div { - padding: 0 0 0 1em; - } +.compare .data pre div { + padding: 0 0 0 1em; +} - .compare .data tr td { - font-family: "Consolas", "Monaco", "Andale Mono", "Courier New", monospace; - font-size: 1.2em; - line-height: 1.2em; - margin: 0; - padding: 0; - } +.compare .data tr td { + font-family: "Consolas", "Monaco", "Andale Mono", "Courier New", monospace; + font-size: 1.2em; + line-height: 1.2em; + margin: 0; + padding: 0; +} - .compare .data tr td + td + td { - width: 100%; - } +.compare .data tr td + td + td { + width: 100%; +} - .compare .data td.line_numbers { - background: #f7f7f7; - border-right: 1px solid #999; - color: #999; - padding: 0 0 0 0.5em; - } +.compare .data td.line_numbers { + background: #f7f7f7; + border-right: 1px solid #999; + color: #999; + padding: 0 0 0 0.5em; +} .compare #compare-content ul.actions li, .compare #footer ul.actions li { @@ -590,68 +590,68 @@ ul.actions { overflow: hidden; } - #head #searchbar #searchbar-fauxtext { - background: #fff; - border: 1px solid #d4d4d4; - overflow: hidden; - height: 2.2em; +#head #searchbar #searchbar-fauxtext { + background: #fff; + border: 1px solid #d4d4d4; + overflow: hidden; + height: 2.2em; - border-radius: 0.3em; - -moz-border-radius: 0.3em; - -webkit-border-radius: 0.3em; - } + border-radius: 0.3em; + -moz-border-radius: 0.3em; + -webkit-border-radius: 0.3em; +} - #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: inherit; - padding: 0 .5em; +#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: inherit; + padding: 0 .5em; - -webkit-focus-ring: none; - } + -webkit-focus-ring: none; +} - .ie8 #head #searchbar #searchbar-fauxtext input#search-query { - padding: 0.5em 0 0 0.5em; - } +.ie8 #head #searchbar #searchbar-fauxtext input#search-query { + padding: 0.5em 0 0 0.5em; +} - #head #searchbar #searchbar-fauxtext input#search-query.ph { - color: #999; - } +#head #searchbar #searchbar-fauxtext input#search-query.ph { + color: #999; +} - #head #searchbar #searchbar-fauxtext #search-submit { - border: 0; - border-left: 1px solid #d4d4d4; - cursor: pointer; - margin: 0 !important; - padding: 0; - float: right; - height: inherit; +#head #searchbar #searchbar-fauxtext #search-submit { + border: 0; + border-left: 1px solid #d4d4d4; + cursor: pointer; + margin: 0 !important; + padding: 0; + float: right; + height: inherit; - border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - -webkit-border-radius: 0 3px 3px 0; - } + border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + -webkit-border-radius: 0 3px 3px 0; +} - #head #searchbar #searchbar-fauxtext #search-submit span { - background-image: url(/images/icon-sprite.png); - background-position: -431px -1px; - background-repeat: no-repeat; - display: block; - height: inherit; - overflow: hidden; - text-indent: -5000px; - width: 28px; - } +#head #searchbar #searchbar-fauxtext #search-submit span { + background-image: url(/images/icon-sprite.png); + background-position: -431px -1px; + background-repeat: no-repeat; + display: block; + height: inherit; + overflow: hidden; + text-indent: -5000px; + width: 28px; +} - .ff #head #searchbar #searchbar-fauxtext #search-submit span, - .ie #head #searchbar #searchbar-fauxtext #search-submit span { - height: 2.2em; - } +.ff #head #searchbar #searchbar-fauxtext #search-submit span, +.ie #head #searchbar #searchbar-fauxtext #search-submit span { + height: 2.2em; +} - #head #searchbar #searchbar-fauxtext #search-submit:hover span { - background-position: -431px -28px; - padding: 0; - } +#head #searchbar #searchbar-fauxtext #search-submit:hover span { + background-position: -431px -28px; + padding: 0; +} From e7825387775c85442f841c47464af163abd7720e Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Tue, 8 May 2012 12:17:36 -0600 Subject: [PATCH 08/10] Add windows filename invalid notice to readme. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7f6c10b5..beb9d20f 100644 --- a/README.md +++ b/README.md @@ -472,6 +472,9 @@ like Rack::Auth, OmniAuth, etc. Precious::App.set(:default_markup, :markdown) # set your favorite markup language run Precious::App +## Windows Filename Validation +Note that filenames on windows must not contain any of the following characters `\ / : * ? " < > |`. See [this support article](http://support.microsoft.com/kb/177506) for details. + ## Testing [![Build Status](https://secure.travis-ci.org/github/gollum.png?branch=master)](http://travis-ci.org/github/gollum) From 26f372a36a55d7935843621c116acdd3ea0be357 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Tue, 8 May 2012 12:25:03 -0700 Subject: [PATCH 09/10] this works on 1.9.3 now too --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e107102b..fc72739e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ rvm: - 1.8.7 + - 1.9.3 notifications: disabled: true before_install: From d90e7db49766390d9e617f0e451358b6de84cacc Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Tue, 8 May 2012 13:39:21 -0600 Subject: [PATCH 10/10] Fix #278. --- lib/gollum/frontend/public/gollum/css/gollum.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css index f4502202..4fb9a8a9 100755 --- a/lib/gollum/frontend/public/gollum/css/gollum.css +++ b/lib/gollum/frontend/public/gollum/css/gollum.css @@ -10,6 +10,17 @@ A basic stylesheet for Gollum */ +/* + Fixes AsciiDoc listing block rendering. + Must be !important to override + .markdown-body code, .markdown-body tt { + in template.css. + https://github.com/github/gollum/issues/278 +*/ +pre > tt { + white-space: pre !important; +} + /* @section core */ body, html { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;