From ba6ae959b8e21c714c69f66254e82837d45a3ed2 Mon Sep 17 00:00:00 2001
From: mschaefers <mschaefers@scoop-gmbh.de>
Date: Mon, 03 Dec 2012 03:49:23 -0500
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap
---
resources/gitblit.css | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/resources/gitblit.css b/resources/gitblit.css
index fc948b6..811b08a 100644
--- a/resources/gitblit.css
+++ b/resources/gitblit.css
@@ -20,14 +20,18 @@
outline: none;
}
+[class^="icon-"], [class*=" icon-"] a i {
+ /* override for a links that look like bootstrap buttons */
+ vertical-align: text-bottom;
+}
+
hr {
margin-top: 10px;
margin-bottom: 10px;
}
-.settings h3 {
- margin-bottom: 0.5em;
- border-bottom: 1px solid #000080 !important;
+.settings th {
+ vertical-align: top;
}
.pageTitle {
@@ -125,6 +129,69 @@
.pageTitle h2 small {
font-size: 80%;
font-weight: bold;
+}
+
+.pageTitle {
+ color: #888;
+ font-size: 18px;
+ line-height: 27px;
+}
+.pageTitle .project, .pageTitle .repository {
+ font-family: Helvetica, arial, freesans, clean, sans-serif;
+ font-size: 22px;
+}
+
+.pageTitle .controls {
+ font-size: 12px;
+}
+
+.pageTitle .repository {
+ font-weight: bold;
+}
+
+.originRepository {
+ font-family: Helvetica, arial, freesans, clean, sans-serif;
+ color: #888;
+ font-size: 12px;
+ line-height: 14px;
+ margin: 0px;
+}
+
+.forkSource, .forkEntry {
+ color: #888;
+}
+
+.forkSource {
+ font-size: 18px;
+ line-height: 20px;
+ padding: 5px 0px;
+}
+
+.forkEntry {
+ font-size: 14px;
+ padding: 2px 0px;
+}
+
+.forkSource .forks, .forkEntry .forks {
+ font-size: 10px;
+ padding-left: 5px;
+ text-decoration: underline;
+ vertical-align: middle;
+}
+
+div.odd {
+
+}
+
+div.even {
+ background-color: whiteSmoke;
+ vertical-align: middle;
+}
+
+span.authorizationControl label {
+ display: inline;
+ color: #777;
+ padding:5px 0px 5px 10px;
}
div.page_footer {
@@ -917,11 +984,15 @@
white-space: nowrap;
}
-span.sha1, span.sha1 a, span.sha1 a span, .commit_message {
+span.sha1, span.sha1 a, span.sha1 a span, .commit_message, span.shortsha1 {
font-family: consolas, monospace;
font-size: 13px;
}
+span.shortsha1 {
+ font-size: 12px;
+}
+
td.mode {
text-align: right;
font-family: monospace;
--
Gitblit v1.9.1