From c0f653340ef12462fcd77fd8e6eacc2cf9b42cea Mon Sep 17 00:00:00 2001 From: kristi Date: Sun, 6 May 2012 17:25:04 -0700 Subject: [PATCH 1/9] 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 d590bf7d6466996cc12b8ee35d215ed2be61b2a8 Mon Sep 17 00:00:00 2001 From: kristi Date: Sun, 6 May 2012 17:25:39 -0700 Subject: [PATCH 2/9] 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 9fc79296659c49f5696d6779daaff45dbea853fa Mon Sep 17 00:00:00 2001 From: kristi Date: Sun, 6 May 2012 17:36:07 -0700 Subject: [PATCH 3/9] 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 6c8cfcd7c22aa880a23717104482fd9b9bc9868a Mon Sep 17 00:00:00 2001 From: kristi Date: Mon, 7 May 2012 00:20:59 -0700 Subject: [PATCH 4/9] 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 2c12fb7ae85718d4f35f14d387e69a72de9d2e56 Mon Sep 17 00:00:00 2001 From: kristi Date: Tue, 8 May 2012 02:55:56 -0700 Subject: [PATCH 5/9] Add missing semicolons --- .../frontend/public/gollum/css/template.css | 160 +++++++++--------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css index b2075ec4..a3c2f402 100644 --- a/lib/gollum/frontend/public/gollum/css/template.css +++ b/lib/gollum/frontend/public/gollum/css/template.css @@ -31,13 +31,13 @@ a.absent { line-height: 1.6; } .markdown-body>*:first-child { - margin-top: 0!important + margin-top: 0!important; } .markdown-body>*:last-child { - margin-bottom: 0!important + margin-bottom: 0!important; } .markdown-body a.absent { - color: #c00 + color: #c00; } .markdown-body a.anchor { display: block; @@ -83,7 +83,7 @@ a.absent { .markdown-body h5 code, .markdown-body h6 tt, .markdown-body h6 code { - font-size: inherit + font-size: inherit; } .markdown-body h1 { font-size: 28px; @@ -95,13 +95,13 @@ a.absent { color: #000; } .markdown-body h3 { - font-size: 18px + font-size: 18px; } .markdown-body h4 { - font-size: 16px + font-size: 16px; } .markdown-body h5 { - font-size: 14px + font-size: 14px; } .markdown-body h6 { color: #777; @@ -115,7 +115,7 @@ a.absent { .markdown-body li, .markdown-body table, .markdown-body pre { - margin: 15px 0 + margin: 15px 0; } .markdown-body hr { background: transparent url('/images/dirty-shade.png') repeat-x 0 0; @@ -149,25 +149,25 @@ a.absent { .markdown-body h4+p, .markdown-body h5+p, .markdown-body h6+p { - margin-top: 0 + margin-top: 0; } .markdown-body li p.first { - display: inline-block + display: inline-block; } .markdown-body ul, .markdown-body ol { - padding-left: 30px + padding-left: 30px; } .markdown-body ul li>:first-child, .markdown-body ol li>:first-child { - margin-top: 0 + margin-top: 0; } .markdown-body ul li>:last-child, .markdown-body ol li>:last-child { - margin-bottom: 0 + margin-bottom: 0; } .markdown-body dl { - padding: 0 + padding: 0; } .markdown-body dl dt { font-size: 14px; @@ -177,23 +177,23 @@ a.absent { margin: 15px 0 5px; } .markdown-body dl dt:first-child { - padding: 0 + padding: 0; } .markdown-body dl dt>:first-child { - margin-top: 0 + margin-top: 0; } .markdown-body dl dt>:last-child { - margin-bottom: 0 + margin-bottom: 0; } .markdown-body dl dd { margin: 0 0 15px; padding: 0 15px; } .markdown-body dl dd>:first-child { - margin-top: 0 + margin-top: 0; } .markdown-body dl dd>:last-child { - margin-bottom: 0 + margin-bottom: 0; } .markdown-body blockquote { border-left: 4px solid #DDD; @@ -201,13 +201,13 @@ a.absent { color: #777; } .markdown-body blockquote>:first-child { - margin-top: 0 + margin-top: 0; } .markdown-body blockquote>:last-child { - margin-bottom: 0 + margin-bottom: 0; } .markdown-body table { - padding: 0 + padding: 0; } .markdown-body table tr { border-top: 1px solid #ccc; @@ -216,10 +216,10 @@ a.absent { padding: 0; } .markdown-body table tr:nth-child(2n) { - background-color: #f8f8f8 + background-color: #f8f8f8; } .markdown-body table tr th { - font-weight: bold + font-weight: bold; } .markdown-body table tr th, .markdown-body table tr td { @@ -230,14 +230,14 @@ a.absent { } .markdown-body table tr th>:first-child, .markdown-body table tr td>:first-child { - margin-top: 0 + margin-top: 0; } .markdown-body table tr th>:last-child, .markdown-body table tr td>:last-child { - margin-bottom: 0 + margin-bottom: 0; } .markdown-body img { - max-width: 100% + max-width: 100%; } .markdown-body span.frame { display: block; @@ -299,7 +299,7 @@ a.absent { float: left; } .markdown-body span.float-left span { - margin: 13px 0 0 + margin: 13px 0 0; } .markdown-body span.float-right { display: block; @@ -346,7 +346,7 @@ a.absent { } .highlight { - background: #fff + background: #fff; } .highlight .c { color: #998; @@ -357,10 +357,10 @@ a.absent { background-color: #e3d2d2; } .highlight .k { - font-weight: bold + font-weight: bold; } .highlight .o { - font-weight: bold + font-weight: bold; } .highlight .cm { color: #998; @@ -388,13 +388,13 @@ a.absent { 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; @@ -405,61 +405,61 @@ a.absent { 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; } .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; } .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; } .highlight .no { - color: #008080 + color: #008080; } .highlight .ni { - color: #800080 + color: #800080; } .highlight .ne { color: #900; @@ -470,103 +470,103 @@ a.absent { 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; } .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; } .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 1dbe49243cc50f5d4c3b3fd43f9c9e1bdf806fa8 Mon Sep 17 00:00:00 2001 From: kristi Date: Tue, 8 May 2012 04:16:08 -0700 Subject: [PATCH 6/9] Give headers more headroom --- .../frontend/public/gollum/css/gollum.css | 3 ++- .../frontend/public/gollum/css/template.css | 24 ++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css index 4fb9a8a9..7da4f2af 100755 --- a/lib/gollum/frontend/public/gollum/css/gollum.css +++ b/lib/gollum/frontend/public/gollum/css/gollum.css @@ -49,7 +49,8 @@ a:hover, a:visited { /* @section head */ #head { border-bottom: 1px solid #ddd; - margin: 4.5em 0 0.5em; + margin: 4em 0 1.5em; + padding-bottom: 0.3em; overflow: hidden; } diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css index a3c2f402..196fa4c0 100644 --- a/lib/gollum/frontend/public/gollum/css/template.css +++ b/lib/gollum/frontend/public/gollum/css/template.css @@ -88,14 +88,20 @@ a.absent { .markdown-body h1 { font-size: 28px; color: #000; + margin-top: 50px; + margin-bottom: 20px; } .markdown-body h2 { font-size: 24px; border-bottom: 1px solid #ccc; color: #000; + margin-top: 40px; + margin-bottom: 20px; } .markdown-body h3 { font-size: 18px; + margin-top: 30px; + margin-bottom: 15px; } .markdown-body h4 { font-size: 16px; @@ -124,15 +130,18 @@ a.absent { height: 4px; padding: 0; } -.markdown-body>h2:first-child, .markdown-body>h1:first-child, -.markdown-body>h1:first-child+h2, +.markdown-body>h2:first-child, .markdown-body>h3:first-child, .markdown-body>h4:first-child, .markdown-body>h5:first-child, .markdown-body>h6:first-child { - margin-top: 0; - padding-top: 0; +} +.markdown-body h1+h2{ + margin-top: 30px; +} +.markdown-body h2+h3{ + margin-top: 10px; } .markdown-body a:first-child h1, .markdown-body a:first-child h2, @@ -329,7 +338,6 @@ a.absent { border: none; background: transparent; } -.markdown-body .highlight pre, .markdown-body pre { background-color: #f8f8f8; border: 1px solid #ccc; @@ -339,12 +347,16 @@ a.absent { padding: 6px 10px; border-radius: 3px; } +.markdown-body pre pre, .markdown-body pre code, .markdown-body pre tt { background-color: transparent; border: none; } - +.markdown-body pre pre { + margin: 0; + padding: 0; +} .highlight { background: #fff; } From 49c6534da6ac48ca6b2f716e655d9301369041c8 Mon Sep 17 00:00:00 2001 From: kristi Date: Tue, 8 May 2012 17:11:02 -0700 Subject: [PATCH 7/9] Put asciidoc fix into template with the rest of the markup css Also remove padding from the asciidoc code block so first line doesn't get indented --- lib/gollum/frontend/public/gollum/css/gollum.css | 11 ----------- lib/gollum/frontend/public/gollum/css/template.css | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css index 7da4f2af..e8847dcb 100755 --- a/lib/gollum/frontend/public/gollum/css/gollum.css +++ b/lib/gollum/frontend/public/gollum/css/gollum.css @@ -10,17 +10,6 @@ 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; diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css index 196fa4c0..119c2395 100644 --- a/lib/gollum/frontend/public/gollum/css/template.css +++ b/lib/gollum/frontend/public/gollum/css/template.css @@ -331,6 +331,7 @@ a.absent { background-color: #f8f8f8; border-radius: 3px; } +.markdown-body pre>tt, .markdown-body pre>code { margin: 0; padding: 0; From 1cc263acfb3191a5e3453e54b07318fd804e7554 Mon Sep 17 00:00:00 2001 From: kristi Date: Tue, 8 May 2012 17:22:39 -0700 Subject: [PATCH 8/9] Make footer editor font normal sized --- lib/gollum/frontend/public/gollum/css/editor.css | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/editor.css b/lib/gollum/frontend/public/gollum/css/editor.css index 9687a3a8..9003bc01 100755 --- a/lib/gollum/frontend/public/gollum/css/editor.css +++ b/lib/gollum/frontend/public/gollum/css/editor.css @@ -226,22 +226,21 @@ a#function-help:hover span { background-position: -405px -28px; } } #gollum-editor #gollum-editor-function-bar - #gollum-editor-format-selector label:after { +#gollum-editor-format-selector label:after { content: ':'; } /* @section form-fields */ -#gollum-editor textarea#gollum-editor-sidebar, -#gollum-editor textarea#gollum-editor-body { +#gollum-editor textarea { background: #fff; border: 1px solid #ddd; font-size: 1em; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; line-height: 1.4em; margin: 1em 0 0.4em; - padding: 0.5em; /* I don't really like mixing pct & em here… */ + padding: 0.5em; width: 98%; height: 20em; } @@ -295,7 +294,7 @@ a#function-help:hover span { background-position: -405px -28px; } border-bottom: 1px solid #ddd; display: block; overflow: hidden; - padding: 1em 0 0.5em; + padding: 0.5em 0 0; } #gollum-editor #gollum-editor-body + .collapsed, @@ -382,10 +381,10 @@ a#function-help:hover span { background-position: -405px -28px; } border: 1px solid #ddd; clear: both; display: block; - font-size: 1.3em; + font-size: 1em; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; height: 7em; - line-height: 1.8em; + line-height: 1.4em; margin: 0.7em 0; padding: 0.5em; width: 98%; From 4e5f2c95871e002de516376329ed0cf3f85483c5 Mon Sep 17 00:00:00 2001 From: kristi Date: Tue, 8 May 2012 17:29:28 -0700 Subject: [PATCH 9/9] Add header to editor --- lib/gollum/frontend/templates/editor.mustache | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/gollum/frontend/templates/editor.mustache b/lib/gollum/frontend/templates/editor.mustache index 168b9fbc..1ae57779 100644 --- a/lib/gollum/frontend/templates/editor.mustache +++ b/lib/gollum/frontend/templates/editor.mustache @@ -86,6 +86,14 @@ + {{#header}} + + {{/header}} + {{#footer}} \ No newline at end of file +