From c05da657ec71c46d0e5bc32b074ddcd9d8b76353 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 12 Nov 2013 17:56:46 -0500 Subject: [PATCH] Add markup support for confluence, mediawiki, textile, trac, and twiki --- src/main/resources/gitblit.css | 81 ++++++++++++++++++++++++++++++++++------ 1 files changed, 69 insertions(+), 12 deletions(-) diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css index a69b988..9e75fa6 100644 --- a/src/main/resources/gitblit.css +++ b/src/main/resources/gitblit.css @@ -490,7 +490,6 @@ border:0px; padding: 0; line-height: 1.35em; - vertical-align:top; } table { @@ -585,6 +584,45 @@ #lines .even { background-color: #fafafa; +} + +.diffstat { + padding: 1px 5px; + font-size: smaller; + background-color: #f5f5f5; + border: 1px solid #ccc; + color: #ccc; + font-weight:bold; +} + +.diffstat-inline { + font-size: smaller; + color: #ccc; + font-weight:bold; +} + +.diffstat .diffstat-total { + color: black; + border-right: 1px solid #ccc; + padding-right: 4px; + margin-right: 2px; +} + +.diffstat-inline .diffstat-total { + color: #999; + padding-right: 2px; +} + +.diffstat-segments { + vertical-align: baseline; +} + +.diffstat-insert { + color: #629E62; +} + +.diffstat-delete { + color: #B9583B; } h1 small, h2 small, h3 small, h4 small, h5 small, h6 small { @@ -782,7 +820,6 @@ padding: 3px; border: 1px solid #ddd; border-bottom: 0; - border-radius: 3px 3px 0 0; font-weight: bold; font-family: Helvetica,arial,freesans,clean,sans-serif; } @@ -800,9 +837,6 @@ margin:0 0 2px; padding:7px 14px; border:1px solid #ddd; - border-radius: 3px; - -webkit-border-radius:3px; - -moz-border-radius:3px;border-radius:3px; } div.header a, div.commitHeader a { @@ -1473,14 +1507,18 @@ li.L7, li.L9 { background: #fafafa !important; } +div.markdown { + max-width: 900px; +} + div.markdown pre { - background-color: #F5F5F5; - border: 1px solid rgba(0, 0, 0, 0.15); + background-color: rgb(250, 250, 250); + border: 1px solid rgb(221, 221, 221); border-radius: 4px 4px 4px 4px; display: block; font-size: 12px; line-height: 18px; - margin: 0 0 9px; + margin: 9px 0; padding: 8.5px; white-space: pre-wrap; } @@ -1492,8 +1530,8 @@ } div.markdown code { - background-color: #ffffe0; - border: 1px solid orange; + background-color: rgb(250, 250, 250); + border: 1px solid rgb(221, 221, 221); border-radius: 3px; padding: 0 0.2em; } @@ -1502,8 +1540,27 @@ text-decoration: underline; } -div.markdown em { - color: #b05000; +div.markdown table { + max-width: 100%; + background-color: transparent; + border-collapse: collapse; + border-spacing: 0px; + font-size: inherit; + border-width: 0px 1px 1px 0px; + border-style: solid solid solid none; + border-color: rgb(221, 221, 221); + border-image: none; + border-collapse: separate; + margin: 10px 0px 20px; +} + +div.markdown table td, div.markdown table th { + padding: 8px; + line-height: 20px; + text-align: left; + vertical-align: top; + border-top: 1px solid rgb(221, 221, 221); + border-left: 1px solid rgb(221, 221, 221); } div.markdown table.text th, div.markdown table.text td { -- Gitblit v1.9.1