From c558deef274d838aae5c0366ff7dc2ebce27a981 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 20 Sep 2012 09:41:28 -0400 Subject: [PATCH] Support X-Forwarded-Context for subdomain proxy configs (issue 135) --- resources/gitblit.css | 192 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 159 insertions(+), 33 deletions(-) diff --git a/resources/gitblit.css b/resources/gitblit.css index 0e8e753..fc948b6 100644 --- a/resources/gitblit.css +++ b/resources/gitblit.css @@ -1,6 +1,6 @@ body { /* 50px to start the container 10px below the navbar */ - padding-top: 50px; + padding-top: 60px; } footer { @@ -15,6 +15,9 @@ ul, ol { margin-bottom: 10px !important; +} +a:focus { + outline: none; } hr { @@ -37,8 +40,17 @@ color: #0069D6; } -.navbar { - height:40px !important; +.navbar .brand { + padding: 10px 20px; +} + +.navbar .pull-right { + margin: 0; +} + +.navbar ul.nav { + margin: 0 !important; + padding: 4px 0px 0px 0px; } .navbar ul.nav li a { @@ -49,10 +61,14 @@ .navbar ul.nav li a:hover { color: #abd4ff !important; + text-decoration: underline; +} + +.navbar .nav .active > a:hover { + text-decoration: underline; } .navbar-inner { - height:40px !important; background-color:#000050; background-repeat:repeat-x; background-image:-khtml-gradient(linear, left top, left bottom, from(#000060), to(#000040)); @@ -74,6 +90,7 @@ background-image: url(arrow_page.png); background-position: center bottom; outline: 0; + padding-bottom:3px; } .navbar .active a { @@ -128,10 +145,11 @@ border:0px; padding: 0; line-height: 1.35em; + vertical-align:top; } table { - margin-bottom:5px !important; + margin-bottom: 5px; font-size: inherit; } @@ -144,9 +162,84 @@ text-align: left; } +div.sourceview { + overflow: hidden; +} + pre.prettyprint ol { padding-left:25px; } + +#nums { + text-align: right; + padding-right:10px; + border-right:1px solid #ddd; + font-family: monospace; + line-height: 1.35em; + vertical-align:top; +} + +#nums pre { + white-space: pre; +} + +#nums pre, #lines pre { + margin: 0; +} + +#lines pre { + padding: 0px !important; + border: 0px !important; + white-space: nowrap; +} + +/* CSS trick to workaround #link topOfWindow offset problem */ +#nums .num { + border-top: 160px solid transparent; + margin-top: -160px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + + color: #888; +} + +#nums span:target { + background-color: #ffffbf; + color: black; + font-weight: bold; + border-bottom: 1px solid red; +} + +#lines table { + margin: 0; +} + +#lines td { + padding: 0; +} + +#lines a { + padding-left: 5px; +} + +#lines a:hover { + background-color: #ffffbf; + text-decoration: none; +} + +#lines tr:hover { + background-color: #ffffbf; +} +#lines .odd { + background-color: white; +} + +#lines .even { + background-color: #fafafa; +} + + h1 small, h2 small, h3 small, h4 small, h5 small, h6 small { color: #888; @@ -267,7 +360,7 @@ } div.searchResult { - padding:5px; + padding: 10px 5px 10px 5px; } div.searchResult .summary { @@ -295,23 +388,29 @@ } div.searchResult .highlight { - background-color: #ffffaa; - border: 1px solid #ffcc00; + background-color: #ccff66; padding: 0 2px; } -div.searchResult .ellipses { - font-family: sans-serif; - font-size: 9px; - font-weight: normal; - background-color: #eee; - border: 1px solid #ccc; - padding: 0 3px; - margin: 0px; +div.searchResult .ellipses { + padding-left:25px; + color: #aaa; } div.searchResult pre { margin: 1px 0px; + border: 0px; +} + +div.searchResult .text { + border-left: 2px solid #ccc; + border-radius: 0px; + + padding: 0 0 0 15px; +} + +div.searchResult ol { + margin-bottom: 0px !important; } div.header, div.commitHeader, table.repositories th { @@ -335,6 +434,7 @@ border: 1px solid #ddd; border-bottom: 0; border-radius: 3px 3px 0 0; + font-weight: bold; } div.commitHeader { @@ -419,10 +519,11 @@ color: white; } -pre.commit_message { +.commit_message { padding: 8px; border: solid #ddd; border-width: 1px 0px 0px; + border-radius: 0px; } div.bug_open, span.bug_open { @@ -625,7 +726,7 @@ table.plain th, table.plain td { white-space: nowrap; - padding: 1px 6px; + padding: 1px 3px; border: 0; } @@ -650,6 +751,16 @@ border-left: 0; } +table.pretty td.message { + padding: 0px; +} + +table.pretty table.nestedTable { + width: 100%; + margin-left: 4px !important; + margin-bottom: 0px !important; +} + table.comments td { padding: 4px; line-height: 17px; @@ -666,13 +777,18 @@ border:0; } +table.repositories th.right { + border-right: 1px solid #ddd; +} + table.repositories td { padding: 2px; border-left: 0; } table.repositories td.rightAlign { - text-align: right; + text-align: right; + border-right: 1px solid #ddd; } table.repositories td.icon img { @@ -681,6 +797,8 @@ table.repositories tr.group { background-color: #ccc; + border-left: 1px solid #ccc; + border-right: 1px solid #ccc; } table.repositories tr.group td { @@ -690,6 +808,10 @@ padding-left: 5px; border-top: 1px solid #aaa; border-bottom: 1px solid #aaa; +} + +table.repositories tr.group td a { + color: black; } table.palette { border:0; width: 0 !important; } @@ -753,6 +875,12 @@ table.activity { width: 100%; + margin-top: 10px; +} + +table.activity td { + padding-top:7px; + padding-bottom:7px; } tr th a { background-position: right; padding-right: 15px; background-repeat:no-repeat; } @@ -785,11 +913,12 @@ } td.date { - /*font-style: italic !important;*/ + /*font-style: italic !important;*/ + white-space: nowrap; } -span.sha1, span.sha1 a, span.sha1 a span, pre.commit_message { - font-family: monospace; +span.sha1, span.sha1 a, span.sha1 a span, .commit_message { + font-family: consolas, monospace; font-size: 13px; } @@ -823,7 +952,7 @@ font-size: 2em; } -span .tagRef, span .headRef, span .localBranch, span .remoteBranch, span .otherRef { +.tagRef, .headRef, .localBranch, .remoteBranch, .otherRef { padding: 0px 3px; margin-right:2px; font-family: sans-serif; @@ -833,41 +962,38 @@ color: black; } -span .tagRef a span, span .headRef a span, span .localBranch a span, span .remoteBranch a span, span .otherRef a span { +.tagRef a, .headRef a, .localBranch a, .remoteBranch a, .otherRef a { font-size: 9px; -} - -span .tagRef a, span .headRef a, span .localBranch a, span .remoteBranch a, span .otherRef a { text-decoration: none; color: black !important; } -span .tagRef a:hover, span .headRef a:hover, span .localBranch a:hover, span .remoteBranch a:hover, span .otherRef a:hover { +.tagRef a:hover, .headRef a:hover, .localBranch a:hover, .remoteBranch a:hover, .otherRef a:hover { color: black !important; text-decoration: underline; } -span .otherRef { +.otherRef { background-color: #b0e0f0; border-color: #80aaaa; } -span .remoteBranch { +.remoteBranch { background-color: #cAc2f5; border-color: #6c6cbf; } -span .tagRef { +.tagRef { background-color: #ffffaa; border-color: #ffcc00; } -span .headRef { +.headRef { background-color: #ffaaff; border-color: #ff00ee; } -span .localBranch { +.localBranch { background-color: #ccffcc; border-color: #00cc33; } -- Gitblit v1.9.1