From 68ae0d32ea896155e5b611d10c1663b674c3a220 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 23 May 2014 08:31:13 -0400
Subject: [PATCH] Merge branch 'ticket/84' into develop
---
src/main/resources/gitblit.css | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css
index 9c76378..748a319 100644
--- a/src/main/resources/gitblit.css
+++ b/src/main/resources/gitblit.css
@@ -55,7 +55,7 @@
white-space: nowrap;
vertical-align: baseline;
}
-
+
[class^="icon-"], [class*=" icon-"] i {
/* override for a links that look like bootstrap buttons */
vertical-align: text-bottom;
@@ -993,6 +993,11 @@
color: inherit;
}
+a.list-strikethrough {
+ text-decoration: line-through;
+ color: inherit;
+}
+
a.list.subject {
font-weight: bold;
}
@@ -1712,6 +1717,14 @@
color: white;
}
+.merge {
+ opacity: 0.5;
+}
+
+.merge:hover {
+ opacity: 1;
+}
+
td.author {
font-style: italic !important;
white-space: nowrap;
@@ -1768,7 +1781,7 @@
font-size: 9px;
font-weight: normal;
border: 1px solid;
- color: black;
+ color: black;
}
.tagRef a, .headRef a, .localBranch a, .remoteBranch a, .otherRef a, .pullRef a {
--
Gitblit v1.9.1