From 3daba4304dba818d54eb9b74d8d35df5aab8fee5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 22 Nov 2013 10:36:05 -0500
Subject: [PATCH] Add pull request linking in changelog to generated documentation
---
src/main/resources/gitblit.css | 626 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 547 insertions(+), 79 deletions(-)
diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css
index 811b08a..b785327 100644
--- a/src/main/resources/gitblit.css
+++ b/src/main/resources/gitblit.css
@@ -1,6 +1,6 @@
body {
- /* 50px to start the container 10px below the navbar */
- padding-top: 60px;
+ /* 47px is the header height */
+ padding-top: 47px;
}
footer {
@@ -16,11 +16,25 @@
ul, ol {
margin-bottom: 10px !important;
}
+
+a {
+ color: #2F58A0;
+}
+
+a:hover {
+ color: #002060;
+}
+
a:focus {
outline: none;
}
-[class^="icon-"], [class*=" icon-"] a i {
+a.btn i {
+ /* override for a links that look like bootstrap buttons */
+ vertical-align: text-bottom;
+}
+
+[class^="icon-"], [class*=" icon-"] i {
/* override for a links that look like bootstrap buttons */
vertical-align: text-bottom;
}
@@ -45,7 +59,10 @@
}
.navbar .brand {
- padding: 10px 20px;
+ padding: 0px 10px 0px 20px;
+}
+.navbar .btn-navbar {
+ margin-top: 10px;
}
.navbar .pull-right {
@@ -73,28 +90,27 @@
}
.navbar-inner {
- background-color:#000050;
- background-repeat:repeat-x;
- background-image:-khtml-gradient(linear, left top, left bottom, from(#000060), to(#000040));
- background-image:-moz-linear-gradient(top, #000060, #000040);
- background-image:-ms-linear-gradient(top, #000060, #000040);
- background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #000060), color-stop(100%, #000040));
- background-image:-webkit-linear-gradient(top, #000060, #000040);
- background-image:-o-linear-gradient(top, #000060, #000040);
- background-image:linear-gradient(top, #000060, #000040);
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000060', endColorstr='#000040', GradientType=0);
- -webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);
- -moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);
- box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);
- border-bottom: 2px solid #ff9900 !important;
+ background-color: #002060;
+ background-image: none;
+ box-shadow: none;
+ border-bottom: 1px solid #002060 !important;
}
.navbar ul li:focus, .navbar .active {
- background-repeat:no-repeat;
- background-image: url(arrow_page.png);
- background-position: center bottom;
- outline: 0;
- padding-bottom:3px;
+ outline: 0;
+ 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 {
@@ -117,9 +133,163 @@
color: #ffffff !important;
}
+.nav-pills > .active > a, .nav-pills > .active > a:hover {
+ color: #fff;
+ background-color: #002060;
+}
+
+div.reflog {
+ border-bottom: 1px solid #ddd;
+ margin-bottom: 5px;
+ padding-bottom: 5px;
+}
+
+div.reflog .icon {
+ font-size: 42px;
+ line-height: 42px;
+}
+
+div.reflog .when {
+ color: #aaa;
+}
+
+div.reflog i {
+ font-size: 42px;
+ color: #bbb;
+ vertical-align: middle;
+}
+
+div.reflog td.header {
+ padding-left: 7px;
+ vertical-align:middle;
+}
+
+div.reflog td.commits {
+ padding-left: 7px;
+}
+
+div.reflog tr.commit td {
+ vertical-align:top;
+ padding-left: 5px;
+}
+
+div.reflog tr.commit img {
+ max-width: none;
+}
+
+div.dashboardTitle {
+ font-size: 1.75em;
+ padding: 10px 0px 5px 0px;
+ margin: 10px 0px;
+ border-bottom: 1px solid #ccc;
+}
+
+div.dashboardTitle small {
+ color: #888;
+ font-size: 0.7em;
+}
+
+.repositorynavbar {
+ background-color: #fbfbfb;
+ border-bottom: 1px solid #ccc;
+ margin-bottom: 10px;
+}
+
+.repositorynavbar .title {
+ line-height: 32px;
+ padding: 5px 0px;
+}
+
+.repositorynavbar .repository {
+ font-weight: bold;
+}
+
+.title .repository a, .repositorynavbar .project a, .repositorynavbar .repository a {
+ font-family: Helvetica,arial,freesans,clean,sans-serif;
+ font-size: 22px;
+ color: #002060;
+}
+
+.repositorynavbar .repositorynavbar-inner {
+ padding-top: 2px;
+}
+
+.repositorynavbar ul {
+ list-style: none outside;
+ display: block;
+ position: relative;
+ border-top: 1px solid #ccc;
+}
+
+.repositorynavbar ul li {
+ display: block;
+ float: left;
+ padding: 10px;
+}
+
+.repositorynavbar ul li:focus, .repositorynavbar .active {
+ color: black;
+ background-repeat:no-repeat;
+ background-image: url(arrow_project.png);
+ background-position: center bottom;
+ font-weight: bold;
+ outline: 0;
+}
+
+.repositorynavbar ul a {
+ color: #002060;
+}
+
+.repositorynavbar ul li:hover {
+ background-color: #eee;
+}
+
+.repositorynavbar ul li a:hover {
+ background-color: inherit;
+ text-decoration: underline;
+}
+
+@media (max-width: 767px) {
+ .repositorynavbar {
+ margin-right: -20px;
+ margin-left: -20px;
+ padding: 0px 5px;
+ }
+}
+
+.btn-appmenu {
+ border-radius: 4px !important;
+ background-color: #002060;
+ background-image:-khtml-gradient(linear, left top, left bottom, from(#4060A0), to(#002060));
+ background-image:-moz-linear-gradient(center top, #4060A0, #002060);
+ background-image:-ms-linear-gradient(top, #4060A0, #002060);
+ background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #4060A0), color-stop(100%, #002060));
+ background-image:-webkit-linear-gradient(top, #4060A0, #002060);
+ background-image:-o-linear-gradient(top, #4060A0, #002060);
+ background-image:linear-gradient(top, #4060A0, #002060);
+
+ background-repeat: repeat-x;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-appmenu:hover, .btn-appmenu:active, .btn-appmenu.active, .btn-appmenu.disabled, .btn-appmenu[disabled] {
+ background-color: #002060;
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+
+.btn-appmenu .caret {
+ border-bottom-color: #FFFFFF;
+ border-top-color: #FFFFFF;
+ opacity: 0.75;
+}
+
.breadcrumb {
- margin-top: 5px !important;
- margin-bottom: 5px !important;
+ margin-top: 10px !important;
+ margin-bottom: 10px !important;
}
.pageTitle {
@@ -179,6 +349,124 @@
vertical-align: middle;
}
+div.repositoryUrlContainer {
+ padding: 2px;
+ background-color: #F5F5F5;
+ background-image: -moz-linear-gradient(center top , #FFFFFF, #E6E6E6);
+ background-repeat: repeat-x;
+ border-color: #E6E6E6 #E6E6E6 #B3B3B3;
+ border-image: none;
+ border-radius: 4px;
+ border-style: solid;
+ border-width: 1px;
+ box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
+ color: #333333;
+ vertical-align: middle;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+div.repositoryUrlContainer:hover {
+ background-color: #E6E6E6;
+ background-position: 0 -15px;
+ color: #333333;
+ text-decoration: none;
+ transition: background-position 0.1s linear 0s;
+}
+
+div.repositoryUrlContainer:hover .caret {
+ opacity: 1;
+}
+
+div.repositoryUrlContainer:hover a:hover {
+ text-decoration: none;
+}
+
+span.repositoryUrlLeftCap, span.repositoryUrlRightCap {
+ text-align: center;
+ color: black;
+ padding: 3px;
+ font-size: 11px;
+}
+
+span.repositoryUrlRightCap {
+ font-weight: bold;
+ font-family:menlo,consolas,monospace;
+}
+
+div.repositoryUrl {
+ display: inline-block;
+ font-size: 1em;
+ padding: 1px 4px 2px 4px;
+ background-color: #fff;
+ border: 1px solid #ddd;
+ margin: 1px;
+}
+
+div.repositoryIndicator {
+ display:inline;
+ padding-top:0px;
+ margin-bottom:0px;
+}
+
+div.repositoryIndicator span.alert {
+ padding: 2px 7px 2px 7px;
+ vertical-align: middle;
+ font-size:0.85em;
+ font-weight:normal;
+}
+
+ul.urlMenu {
+ min-width: 350px;
+}
+
+ul.urlMenu li.url {
+ background-color: white;
+ padding: 0px 5px;
+ line-height: 24px;
+}
+
+ul.applicationMenu {
+ background-color: whiteSmoke;
+ min-width: 400px;
+}
+
+ul.applicationMenu li.action {
+ background-color: white;
+ padding: 0px 5px;
+ line-height: 24px;
+}
+
+span.applicationTitle, span.applicationTitle a {
+ display: inline;
+ font-weight: bold;
+ font-size:1.1em;
+ color: black !important;
+ padding: 0px;
+}
+
+div.applicationHeaderMenuItem {
+ padding-left: 10px;
+ color: black;
+}
+
+div.applicationLegalMenuItem {
+ padding-left: 10px;
+ color: #999;
+ font-size: 0.85em;
+}
+
+a.applicationMenuItem, span.commandMenuItem {
+ padding: 3px 10px;
+ color: black;
+ display: inline;
+ padding: 0px;
+}
+
+span.commandMenuItem {
+ font-size: 0.85em;
+ font-family: menlo,consolas,monospace;
+}
+
div.odd {
}
@@ -212,7 +500,6 @@
border:0px;
padding: 0;
line-height: 1.35em;
- vertical-align:top;
}
table {
@@ -261,21 +548,29 @@
}
/* 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;
+#nums .jump {
+ border-top: 50px solid transparent;
+ margin-top: -50px;
+ background: url(arrow_line.png) no-repeat scroll bottom right transparent;
+}
+#nums .jump:target {
+ border-left: 7px solid transparent;
+ margin-right: 3px;
+}
+
+#lines .line {
+ padding-left: 5px;
color: #888;
}
-#nums span:target {
+#nums a:hover {
background-color: #ffffbf;
color: black;
font-weight: bold;
+ border-top: 1px solid red;
border-bottom: 1px solid red;
+ text-decoration: none;
}
#lines table {
@@ -290,11 +585,6 @@
padding-left: 5px;
}
-#lines a:hover {
- background-color: #ffffbf;
- text-decoration: none;
-}
-
#lines tr:hover {
background-color: #ffffbf;
}
@@ -306,7 +596,44 @@
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 {
color: #888;
@@ -399,12 +726,23 @@
font-size: 11px;
}
-span.repositorySwatch {
- border-radius: 3px;
- padding: 1px 4px 2px 4px;
+span.activitySwatch {
+ border-radius: 3px;
+ padding: 1px 4px 2px 4px;
color: #ffffff;
vertical-align: center;
}
+
+span.activitySwatch a {
+ color: inherit;
+}
+
+span.repositorySwatch {
+ padding: 1px 1px 2px 1px;
+ color: #ffffff;
+ vertical-align: center;
+}
+
span.repositorySwatch a {
color: inherit;
}
@@ -424,6 +762,10 @@
border: 1px solid #ddd;
border-radius: 5px;
padding: 2px;
+}
+
+img.navbarGravatar {
+ border: 1px solid #fff;
}
div.searchResult {
@@ -481,36 +823,30 @@
}
div.header, div.commitHeader, table.repositories th {
- background-color:#e0e0e0;
- background-repeat:repeat-x;
- background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#e0e0e0));
- background-image:-moz-linear-gradient(top, #ffffff, #e0e0e0);
- background-image:-ms-linear-gradient(top, #ffffff, #e0e0e0);
- background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e0e0e0));
- background-image:-webkit-linear-gradient(top, #ffffff, #e0e0e0);
- background-image:-o-linear-gradient(top, #ffffff, #e0e0e0);
- background-image:linear-gradient(top, #ffffff, #e0e0e0);
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e0e0e0', GradientType=0);
- -webkit-box-shadow:inset 0 1px 0 #ffffff;
- -moz-box-shadow:inset 0 1px 0 #ffffff;
- box-shadow:inset 0 1px 0 #ffffff;
+ background-color: #fbfbfb;
}
div.header {
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;
+}
+
+div.diffHeader {
+ /* CSS trick to workaround #link topOfWindow offset problem */
+ border-top: 65px solid transparent;
+ margin-top: -65px;
+ -webkit-background-clip: padding-box;
+ -moz-background-clip: padding;
+ background-clip: padding-box;
}
div.commitHeader {
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 {
@@ -524,7 +860,19 @@
}
div.page_nav2 {
- padding: 2px 5px 7px 5px;
+ padding: 5px 10px;
+ margin: -10px 0px 10px;
+ 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;
+}
+
+div.page_nav2 a {
+ color: #002060;
}
div.admin_nav {
@@ -588,6 +936,9 @@
.commit_message {
padding: 8px;
+}
+
+.topborder {
border: solid #ddd;
border-width: 1px 0px 0px;
border-radius: 0px;
@@ -643,6 +994,10 @@
background-color: #F6F5EE;
padding: 2px 0;
font-family: inherit;
+}
+
+div.diff table {
+ border: 1px solid #ddd;
}
span.diff.add {
@@ -737,7 +1092,7 @@
div.diff table td {
border-left: 1px solid #bbb;
- background-color: #f5f5f5;
+ background-color: #fbfbfb;
}
td.changeType {
@@ -786,15 +1141,26 @@
text-align: right;
}
-table.plain {
+table.plain, table.summary {
width: 0 !important;
border: 0;
}
-table.plain th, table.plain td {
+table.plain th, table.plain td, table.summary th, table.summary td {
white-space: nowrap;
padding: 1px 3px;
border: 0;
+}
+
+table.summary {
+ margin: 0px;
+}
+
+table.summary th {
+ color: #999;
+ padding-right: 10px;
+ text-align: right;
+ font-weight: normal;
}
table.pretty {
@@ -810,7 +1176,7 @@
}
table.pretty td.icon img {
- vertical-align: top;
+ vertical-align: middle;
}
table.pretty td {
@@ -826,6 +1192,34 @@
width: 100%;
margin-left: 4px !important;
margin-bottom: 0px !important;
+}
+
+table.pretty td.graph {
+ border-right: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
+ padding: 0px;
+ /*width: 1px;*/
+}
+
+table.pretty tr.commit {
+ /* must match branch graph servlet row height definition */
+ height: 24px;
+}
+
+@media (min-width: 979px) {
+ td.ellipsize {
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
+}
+
+@media (max-width: 979px) {
+ td.ellipsize {
+ text-overflow: inherit;
+ overflow: visible;
+ white-space: wrap;
+ }
}
table.comments td {
@@ -886,7 +1280,7 @@
font-weight: bold;
background-color: #ffffff !important;
padding-top: 0px !important;
- margin-bottom: 0 !imporant;
+ margin-bottom: 0 !important;
border: 0 !important;
border-radius: 0 !important;
line-height: 1em;
@@ -960,13 +1354,13 @@
}
tr.dark {
- background-color: #f5f5f5;
+ background-color: #f6f6f6;
}
/* currently both use the same, but it can change */
tr.light:hover,
tr.dark:hover {
- background-color: #000070;
+ background-color: #002060;
color: white;
}
@@ -977,6 +1371,7 @@
td.author {
font-style: italic !important;
+ white-space: nowrap;
}
td.date {
@@ -1023,7 +1418,7 @@
font-size: 2em;
}
-.tagRef, .headRef, .localBranch, .remoteBranch, .otherRef {
+.tagRef, .headRef, .localBranch, .remoteBranch, .otherRef, .pullRef {
padding: 0px 3px;
margin-right:2px;
font-family: sans-serif;
@@ -1033,13 +1428,13 @@
color: black;
}
-.tagRef a, .headRef a, .localBranch a, .remoteBranch a, .otherRef a {
+.tagRef a, .headRef a, .localBranch a, .remoteBranch a, .otherRef a, .pullRef a {
font-size: 9px;
text-decoration: none;
color: black !important;
}
-.tagRef a:hover, .headRef a:hover, .localBranch a:hover, .remoteBranch a:hover, .otherRef a:hover {
+.tagRef a:hover, .headRef a:hover, .localBranch a:hover, .remoteBranch a:hover, .otherRef a:hover, .pullRef a:hover {
color: black !important;
text-decoration: underline;
}
@@ -1047,6 +1442,11 @@
.otherRef {
background-color: #b0e0f0;
border-color: #80aaaa;
+}
+
+.pullRef {
+ background-color: rgb(255, 221, 136);
+ border-color: rgb(136, 136, 136);
}
.remoteBranch {
@@ -1117,14 +1517,67 @@
li.L7,
li.L9 { background: #fafafa !important; }
+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: #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;
}
@@ -1136,18 +1589,33 @@
}
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;
+ 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