From 69420cb184c29527fd83fa5f594b6bc90d90c711 Mon Sep 17 00:00:00 2001 From: Tom Preston-Werner Date: Tue, 20 Jul 2010 13:14:26 -0500 Subject: [PATCH] Initial work on help sections. --- lib/gollum/frontend/public/css/editbar.css | 86 +- lib/gollum/frontend/public/css/screen.css | 27 +- lib/gollum/frontend/public/images/example.png | Bin 0 -> 1124 bytes .../frontend/public/javascript/gollum.js | 24 +- lib/gollum/frontend/templates/edit.mustache | 26 +- .../frontend/templates/editbar.mustache | 918 ++++++++++++++++++ 6 files changed, 1048 insertions(+), 33 deletions(-) create mode 100644 lib/gollum/frontend/public/images/example.png create mode 100644 lib/gollum/frontend/templates/editbar.mustache diff --git a/lib/gollum/frontend/public/css/editbar.css b/lib/gollum/frontend/public/css/editbar.css index 1696d48e..45b78143 100644 --- a/lib/gollum/frontend/public/css/editbar.css +++ b/lib/gollum/frontend/public/css/editbar.css @@ -3,12 +3,18 @@ border-top: 1px solid #888; border-right: 1px solid #888; width: 100%; - background: white; - background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#EBF1FF)); - background: -moz-linear-gradient(top, #fff, #EBF1FF); overflow: hidden; + font-family: sans-serif; + font-size: 13px; } + #editbar .menu { + overflow: hidden; + background: white; + background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#EBF1FF)); + background: -moz-linear-gradient(top, #fff, #EBF1FF); + } + #editbar .group { float: left; height: 26px; @@ -59,8 +65,6 @@ #editbar .tab { float: left; display: block; - font-family: sans-serif; - font-size: 13px; } #editbar .tab a { @@ -89,4 +93,74 @@ #editbar .tab a:hover { text-decoration: underline; - } \ No newline at end of file + } + + #editbar .sections { + clear: both; + float: left; + width: 100%; + overflow: visible; + border-top: 1px solid #888; + height: 1750px; + } + + #editbar .sections .toc { + float: left; + width: 20%; + overflow: auto; + } + + #editbar .sections .toc div { + cursor: pointer; + padding: 4px 4px 4px 6px; + background-color: #E0EEF7; + color: blue; + } + + #editbar .sections .toc div.current { + cursor: default; + background-color: white; + color: #333; + } + + #editbar .sections .pages { + overflow: auto; + background-color: white; + float: right; + width: 80%; + height: 1750px; + } + + #editbar .sections .page { + display: none; + } + + #editbar .sections .page.current { + display: block; + } + + #editbar .sections .pages th { + color: #999; + font-weight: bold; + padding: 5px; + text-align: left; + } + + #editbar .sections .pages td { + color: black; + padding: 5px; + border-top: 1px solid #eee; + } + + #editbar .sections .pages span.invisible { + color: #bbb; + padding-left: 1px; + } + + #editbar .sections .pages .shortcodes th { + text-align: center; + } + + #editbar .sections .pages .shortcodes ul { + list-style-type: none; + } \ No newline at end of file diff --git a/lib/gollum/frontend/public/css/screen.css b/lib/gollum/frontend/public/css/screen.css index dd9dd232..bd174078 100644 --- a/lib/gollum/frontend/public/css/screen.css +++ b/lib/gollum/frontend/public/css/screen.css @@ -342,4 +342,29 @@ html {overflow-y: scroll;} .wikistyle pre.console span.command { color: yellow !important; - } \ No newline at end of file + } + +/* Special markup considerations */ + +/* asciidoc */ + +.wikistyle .ulist p, +.wikistyle .olist p { + margin: 0 !important; +} + +.wikistyle .loweralpha { + list-style-type: lower-alpha; +} + +.wikistyle .lowerroman { + list-style-type: lower-roman; +} + +.wikistyle .upperalpha { + list-style-type: upper-alpha; +} + +.wikistyle .upperroman { + list-style-type: upper-roman; +} \ No newline at end of file diff --git a/lib/gollum/frontend/public/images/example.png b/lib/gollum/frontend/public/images/example.png new file mode 100644 index 0000000000000000000000000000000000000000..a385368367c9da91850f10a38f6ab13929a66384 GIT binary patch literal 1124 zcmV-q1e^PbP)NC3Lkkj(Cv{r>vp zSq1<7{PS`oIf%qKg}^t0ygQA{;Z*?LQvfu5wAD}mJ(ALx);E>WHj&FT=2rmEP5_L> zGl8}*oZLA-me_{8FhH5zGkLClvM$F<0PI-+`uzBdw?o!j63$TuOLCI?=iB}F^VIRC zsmgVs+DG!8X~$O*!0LVNWfI?cJo?we-&+iu#aXE0PS#=@?1)R*=)v-{jgn?i;`PP% z&9wgi{jlL+b8BzI+Moab|MsqCK>z>)I!Q!9RCwC#m|;`eKoEu@AVLz7Kte*mBuERj zplA^ZQpErNue!H)dv~bqBs9~R&baEQI6m{d@7|HI_WBQ|_6hkfAy<4xI6WL2rqi)I zX0?#fm1NkQ0hFpCjL}mbi0GKrLPm;V+dM4Bu&RdikixSPj7m+k%4Jq&$F!^pO<3t4 zWCdwe38AcbSX_j8R0xr!>${5#w^B$?oe$fVS-F-AkN5k(fz+FaLmVF#j4^uK2YN7* zTDx647jkj)7{l~ow5tT~66L{6^2sDW6Y|UueFpLSBW`f4&+)z5-7IfHrh zeN~9?5C}$jT~1(@=RodaJ`CaeXrb?}Ngi%82gG2~nwN((W9i`|#MbXblL&5-ByC{8 zv`a&tW9kD6@dIB!f*sl`K)}z8c}xb~!M-Hq;*p}_A_48LEj(O70h0|E>309P#veSp zQG4YhM0DPf4D1}TN?w=E66Gcg3~@+Q8|3iTEe62I6vxTAkWB%6(e8_ zTVq(%`VKvi;doDFAWhn0Z6${Jp9Ot0~ruBwx6PBM_dq`BvP7`alRU zB8tkjlm@ge7@PtVhRYHVU(X65;=XcSvd!M`5%c-$T{;%fB^u}B9qE(6CY^+0000