From eb0f7ea03074bb45c67d2ad877af3c5c85e6b3fc Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 03 Mar 2014 11:33:24 -0500 Subject: [PATCH] Fix compare page exception when a submodule changes (issue-375) --- src/main/resources/gitblit.css | 136 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 125 insertions(+), 11 deletions(-) diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css index 53113ac..cd5c57b 100644 --- a/src/main/resources/gitblit.css +++ b/src/main/resources/gitblit.css @@ -34,6 +34,10 @@ vertical-align: text-bottom; } +a.bugtraq { + font-weight: bold; +} + [class^="icon-"], [class*=" icon-"] i { /* override for a links that look like bootstrap buttons */ vertical-align: text-bottom; @@ -101,6 +105,16 @@ padding-bottom: 1px; border-bottom: 3px solid #ff9900; margin-bottom: -1px; +} + +ul.nav { + border-color: #ccc; +} + +.nav-tabs > .active > a, +.nav-tabs > .active > a:hover { + border: 1px solid #ccc; + border-bottom-color: transparent; } .navbar .active a { @@ -504,6 +518,18 @@ th { vertical-align: middle; text-align: left; +} + +div.featureWelcome { + padding: 15px; + background-color: #fbfbfb; + border: 1px solid #ccc; + border-radius: 5px; +} + +div.featureWelcome div.icon { + color: #ccc; + font-size: 144px; } div.sourceview { @@ -1277,6 +1303,11 @@ } table.palette td.pane { padding: 0px; + width: 250px !important; +} + +table.palette td.pane select { + width: 250px !important; } table.gitnotes { @@ -1308,6 +1339,7 @@ } table.annotated { + width: 100%; border:1px solid #ddd; } @@ -1322,6 +1354,24 @@ table.annotated td { padding: 0px; border: 0; +} + +table.annotated td.lineCommit { + padding-left: 5px; + padding-right: 5px; +} + +table.annotated td.lineNumber { + border-right: 1px solid #ddd; + border-left: 1px solid #ddd; + padding-left: 5px; + padding-right: 5px; + text-align: right; +} + +table.annotated td.lineContent { + padding-left: 5px; + font: monospace; } table.activity { @@ -1369,7 +1419,7 @@ white-space: nowrap; } -span.sha1, span.sha1 a, span.sha1 a span, .commit_message, span.shortsha1 { +span.sha1, span.sha1 a, span.sha1 a span, .commit_message, span.shortsha1, td.sha1 { font-family: consolas, monospace; font-size: 13px; } @@ -1507,18 +1557,67 @@ li.L7, li.L9 { background: #fafafa !important; } -div.markdown { - max-width: 900px; +div.docs { + max-width: 880px; +} + +div.docs ul.nav { + margin-bottom: 0px !important; +} + +div.docs div.docnav { + display: inline-block; + padding: 6px 5px 6px 5px; + border-left: 1px solid #ccc; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; + border-radius: 0px 0px 3px 3px; + background-color: #ECF1F4; + color: #666; + text-align: left; + margin-top: -10px; +} + +div.docs .content { + margin-top: 10px; +} + +div.docs div.markdown { + margin-top: 10px; +} + +div.markdown { + line-height: 1.4; +} + +div.markdown h1 { + padding: 0px 0px 4px; + border-bottom: 1px solid rgb(221, 221, 221); + margin: 4px 0px 8px; +} + +div.markdown h2 { + padding: 4px 0px; + border-bottom: 1px solid rgb(238, 238, 238); + margin: 4px 0px 8px; +} + +div.markdown h3 { + padding: 8px 0px 4px; +} + +div.markdown li { + line-height: 1.4; } div.markdown pre { - background-color: rgb(251, 251, 251); + 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; } @@ -1530,18 +1629,33 @@ } div.markdown code { - background-color: rgb(251, 251, 251); + background-color: rgb(250, 250, 250); border: 1px solid rgb(221, 221, 221); border-radius: 3px; - padding: 0 0.2em; + padding: 0 0.4em; } -div.markdown a { - text-decoration: underline; +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 em { - color: #b05000; +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