From ada1a326fa36ceb46922006f87d4cff0c49e071f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 12 Jun 2013 17:19:15 -0400
Subject: [PATCH] Fixed double enumeration of repositories on dashboard page
---
src/main/resources/gitblit.css | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 66 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css
index 26dc480..351d43f 100644
--- a/src/main/resources/gitblit.css
+++ b/src/main/resources/gitblit.css
@@ -29,7 +29,12 @@
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;
}
@@ -119,6 +124,28 @@
color: #ffffff !important;
}
+.nav-pills > .active > a, .nav-pills > .active > a:hover {
+ color: #fff;
+ background-color: #002060;
+}
+
+div.push {
+ border-bottom: 1px solid #ddd;
+ margin-bottom: 5px;
+ padding-bottom: 5px;
+}
+
+div.push .icon {
+ font-size: 42px;
+ line-height: 42px;
+}
+
+div.push i {
+ font-size: 42px;
+ color: #bbb;
+ vertical-align: middle;
+}
+
.repositorynavbar {
background-color: #fbfbfb;
border-bottom: 1px solid #ccc;
@@ -134,7 +161,7 @@
font-weight: bold;
}
-.repositorynavbar .project a, .repositorynavbar .repository a {
+.title .repository a, .repositorynavbar .project a, .repositorynavbar .repository a {
font-family: Helvetica,arial,freesans,clean,sans-serif;
font-size: 22px;
color: #002060;
@@ -608,12 +635,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;
}
@@ -703,6 +741,16 @@
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 {
@@ -858,6 +906,10 @@
font-family: inherit;
}
+div.diff table {
+ border: 1px solid #ddd;
+}
+
span.diff.add {
color: #008800;
font-family: inherit;
@@ -950,7 +1002,7 @@
div.diff table td {
border-left: 1px solid #bbb;
- background-color: #f5f5f5;
+ background-color: #fbfbfb;
}
td.changeType {
@@ -1247,7 +1299,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;
@@ -1257,13 +1309,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;
}
@@ -1273,6 +1325,11 @@
border-color: #80aaaa;
}
+.pullRef {
+ background-color: rgb(255, 221, 136);
+ border-color: rgb(136, 136, 136);
+}
+
.remoteBranch {
background-color: #cAc2f5;
border-color: #6c6cbf;
--
Gitblit v1.9.1