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 | 247 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 219 insertions(+), 28 deletions(-)
diff --git a/resources/gitblit.css b/resources/gitblit.css
index 0701a7c..811b08a 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 {
@@ -16,15 +16,22 @@
ul, ol {
margin-bottom: 10px !important;
}
+a:focus {
+ 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 {
@@ -37,8 +44,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 +65,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 +94,7 @@
background-image: url(arrow_page.png);
background-position: center bottom;
outline: 0;
+ padding-bottom:3px;
}
.navbar .active a {
@@ -110,6 +131,69 @@
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 {
clear: both;
height: 17px;
@@ -128,10 +212,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 +229,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;
@@ -295,8 +455,7 @@
}
div.searchResult .highlight {
- background-color: #ffffaa;
- border: 1px solid #ffcc00;
+ background-color: #ccff66;
padding: 0 2px;
}
@@ -311,7 +470,8 @@
}
div.searchResult .text {
- border-left: 5px solid #EEEEEE;
+ border-left: 2px solid #ccc;
+ border-radius: 0px;
padding: 0 0 0 15px;
}
@@ -341,6 +501,7 @@
border: 1px solid #ddd;
border-bottom: 0;
border-radius: 3px 3px 0 0;
+ font-weight: bold;
}
div.commitHeader {
@@ -425,10 +586,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 {
@@ -631,7 +793,7 @@
table.plain th, table.plain td {
white-space: nowrap;
- padding: 1px 6px;
+ padding: 1px 3px;
border: 0;
}
@@ -656,6 +818,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;
@@ -672,13 +844,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 {
@@ -687,6 +864,8 @@
table.repositories tr.group {
background-color: #ccc;
+ border-left: 1px solid #ccc;
+ border-right: 1px solid #ccc;
}
table.repositories tr.group td {
@@ -696,6 +875,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; }
@@ -759,6 +942,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; }
@@ -791,12 +980,17 @@
}
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, span.shortsha1 {
+ font-family: consolas, monospace;
font-size: 13px;
+}
+
+span.shortsha1 {
+ font-size: 12px;
}
td.mode {
@@ -829,7 +1023,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;
@@ -839,41 +1033,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