From f22a0633d08e38ac4bf92b5165a708e11b4d6598 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 03 Oct 2012 17:31:37 -0400
Subject: [PATCH] Implemented support for toggling User.canFork in Manager
---
resources/gitblit.css | 458 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 405 insertions(+), 53 deletions(-)
diff --git a/resources/bootstrap.gb.css b/resources/gitblit.css
similarity index 67%
rename from resources/bootstrap.gb.css
rename to resources/gitblit.css
index 32aac08..1d17dc8 100644
--- a/resources/bootstrap.gb.css
+++ b/resources/gitblit.css
@@ -1,3 +1,14 @@
+body {
+ /* 50px to start the container 10px below the navbar */
+ padding-top: 60px;
+}
+
+footer {
+ margin-top: 25px;
+ padding: 15px 0 16px;
+ border-top: 1px solid #E5E5E5;
+}
+
body, input, select {
color: #202020;
}
@@ -5,31 +16,64 @@
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;
}
-.page-header h1, .page-header h2 {
+.settings h3 {
+ margin-bottom: 0.5em;
+ border-bottom: 1px solid #000080 !important;
+}
+
+.pageTitle {
+ padding-bottom: 5px;
+ margin: 0;
+ border-bottom: 1px solid #eee;
+}
+
+.pageTitle h1, .pageTitle h2 {
color: #0069D6;
}
-.topbar {
- height:40px !important;
+.navbar .brand {
+ padding: 10px 20px;
}
-.topbar a {
+.navbar .pull-right {
+ margin: 0;
+}
+
+.navbar ul.nav {
+ margin: 0 !important;
+ padding: 4px 0px 0px 0px;
+}
+
+.navbar ul.nav li a {
color: white;
text-shadow: none;
+ outline: 0;
}
-.nav a:hover {
+.navbar ul.nav li a:hover {
color: #abd4ff !important;
+ text-decoration: underline;
}
-.topbar-inner,.topbar .fill{
- height:40px !important;
+.navbar .nav .active > a:hover {
+ text-decoration: underline;
+}
+
+.navbar-inner {
background-color:#000050;
background-repeat:repeat-x;
background-image:-khtml-gradient(linear, left top, left bottom, from(#000060), to(#000040));
@@ -46,14 +90,32 @@
border-bottom: 2px solid #ff9900 !important;
}
-.topbar ul li:focus, .topbar .active {
+.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;
}
-.topbar .active a {
+.navbar .active a {
background-color: transparent !important;
+ outline: 0;
+}
+
+.navbar div > ul .menu-dropdown .selected, .nav .menu-dropdown .selected, .navbar div > ul .dropdown-menu .selected, .nav .dropdown-menu .selected {
+ background-image: url("bullet_blue.png");
+ background-repeat: no-repeat;
+ background-position: left;
+}
+
+.navbar div>ul .dropdown-menu li a {
+ color: #555;
+}
+
+navbar div>ul .menu-dropdown li a:hover,.nav .menu-dropdown li a:hover,.navbar div>ul .dropdown-menu li a:hover,.nav .dropdown-menu li a:hover{
+ background-color: #000070;
+ color: #ffffff !important;
}
.breadcrumb {
@@ -61,13 +123,61 @@
margin-bottom: 5px !important;
}
-.page-header {
+.pageTitle {
margin-bottom: 5px;
}
-.page-header h2 small {
+.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.page_footer {
@@ -88,36 +198,151 @@
border:0px;
padding: 0;
line-height: 1.35em;
+ vertical-align:top;
}
table {
- margin-bottom:5px !important;
+ margin-bottom: 5px;
+ font-size: inherit;
+}
+
+.table th {
+ vertical-align: top;
+}
+
+th {
+ vertical-align: middle;
+ text-align: left;
+}
+
+div.sourceview {
+ overflow: hidden;
}
pre.prettyprint ol {
padding-left:25px;
}
-.age0, .age1, .age2 {
+#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;
+}
+
+.age0, .age1, .age2, .age3, .age4 {
font-size: 12px;
}
-/* age0: age < 60*60*2 */
+/* age0: age < 2 hours */
.age0 {
- color: #008000;
font-style: italic;
+ color: #008000;
font-weight: bold;
}
-/* age1: 60*60*2 <= age < 60*60*24*2 */
+/* age1: 2 hours <= age < 2 days */
.age1 {
- color: #008000;
font-style: italic;
+ color: #0000ff;
+ font-weight: bold;
}
-/* age2: 60*60*24*2 <= age */
+/* age2: 2 days < age <= 7 days */
.age2 {
font-style: italic;
+ color: #2b60de;
+}
+
+/* age3: 7 days < age <= 30 days */
+.age3 {
+ color: #800080;
+}
+
+/* age4: > 30 days */
+.age4 {
+}
+
+/* Ensure that hovered ages are white */
+tr.light:hover .age0,
+tr.light:hover .age1,
+tr.light:hover .age2,
+tr.light:hover .age3,
+tr.light:hover .age4,
+tr.dark:hover .age0,
+tr.dark:hover .age1,
+tr.dark:hover .age2,
+tr.dark:hover .age3,
+tr.dark:hover .age4 {
+ color: #ffffff !important;
}
a.list {
@@ -161,9 +386,10 @@
}
span.repositorySwatch {
- border-radius: 3px;
- padding: 2px 5px;
+ border-radius: 3px;
+ padding: 1px 4px 2px 4px;
color: #ffffff;
+ vertical-align: center;
}
span.repositorySwatch a {
color: inherit;
@@ -184,6 +410,60 @@
border: 1px solid #ddd;
border-radius: 5px;
padding: 2px;
+}
+
+div.searchResult {
+ padding: 10px 5px 10px 5px;
+}
+
+div.searchResult .summary {
+ font-weight: bold;
+}
+
+div.searchResult .branch {
+ color: #008000;
+}
+
+div.searchResult .author {
+ font-style: italic !important;
+}
+
+div.searchResult .date {
+ color:#999;
+}
+
+div.searchResult .body {
+ padding-left:20px;
+}
+
+div.searchResult .fragment {
+ padding: 7px 0;
+}
+
+div.searchResult .highlight {
+ background-color: #ccff66;
+ padding: 0 2px;
+}
+
+div.searchResult .ellipses {
+ padding-left:25px;
+ color: #aaa;
+}
+
+div.searchResult pre {
+ margin: 1px 0px;
+ border: 0px;
+}
+
+div.searchResult .text {
+ border-left: 2px solid #ccc;
+ border-radius: 0px;
+
+ padding: 0 0 0 15px;
+}
+
+div.searchResult ol {
+ margin-bottom: 0px !important;
}
div.header, div.commitHeader, table.repositories th {
@@ -207,6 +487,7 @@
border: 1px solid #ddd;
border-bottom: 0;
border-radius: 3px 3px 0 0;
+ font-weight: bold;
}
div.commitHeader {
@@ -246,12 +527,12 @@
text-decoration: underline;
}
-div.search {
+span.search {
height: 40px;
padding-top:2px;
}
-div.search input {
+span.search input {
-webkit-border-radius:0;-moz-border-radius:0x;border-radius:0;
vertical-align: top;
background: url(search-icon.png) no-repeat 4px center;
@@ -265,17 +546,16 @@
color: #ddd;
}
-div.search input:hover, div.search input:focus {
+span.search input:hover, span.search input:focus {
background-color: transparent;
border: 1px solid transparent;
padding: 2px 2px 2px 22px;
- text-shadow: none;
-
+ box-shadow: none;
color: #ddd;
border-bottom: 1px solid #ff9900;
}
-div.search input:focus {
+span.search input:focus {
color: white;
}
@@ -286,21 +566,17 @@
/* text-shadow: none; */
/* } */
-div.login input:focus {
+span.login input:focus {
background-color: rgba(255, 255, 255, 0.6);
text-shadow: none;
color: white;
}
-div.commit_message {
- font-family: monospace;
+.commit_message {
padding: 8px;
- border: solid #ccc;
+ border: solid #ddd;
border-width: 1px 0px 0px;
-}
-
-div.commit_message a {
- font-family: monospace;
+ border-radius: 0px;
}
div.bug_open, span.bug_open {
@@ -503,13 +779,14 @@
table.plain th, table.plain td {
white-space: nowrap;
- padding: 1px 6px;
+ padding: 1px 3px;
border: 0;
}
table.pretty {
border:1px solid #ddd;
- border-radius: 0 0 3px 3px;
+ border-radius: 0 0 3px 3px;
+ width: 100%;
}
table.pretty td.icon {
@@ -527,6 +804,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;
@@ -535,6 +822,7 @@
table.repositories {
border:1px solid #ddd;
border-spacing: 0px;
+ width: 100%;
}
table.repositories th {
@@ -542,13 +830,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 {
@@ -557,6 +850,8 @@
table.repositories tr.group {
background-color: #ccc;
+ border-left: 1px solid #ccc;
+ border-right: 1px solid #ccc;
}
table.repositories tr.group td {
@@ -566,6 +861,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; }
@@ -586,7 +885,7 @@
border: 0;
}
table.gitnotes td {
- border-top: 1px solid #ccc;
+ border-top: 1px solid #ddd;
padding-top: 3px;
vertical-align:top;
}
@@ -601,11 +900,13 @@
}
table.gitnotes td.info {
+ padding-right: 10px;
}
table.gitnotes td.message {
width: 65%;
- border-left: 1px solid #ccc;
+ border-left: 1px solid #ddd;
+ padding-left: 10px;
}
table.annotated {
@@ -623,6 +924,16 @@
table.annotated td {
padding: 0px;
border: 0;
+}
+
+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; }
@@ -655,11 +966,12 @@
}
td.date {
- font-style: italic !important;
+ /*font-style: italic !important;*/
+ white-space: nowrap;
}
-span.sha1, span.sha1 a, span.sha1 a span {
- font-family: monospace;
+span.sha1, span.sha1 a, span.sha1 a span, .commit_message {
+ font-family: consolas, monospace;
font-size: 13px;
}
@@ -685,11 +997,15 @@
width: 13em;
}
+span.help-inline {
+ color: #777;
+}
+
span.metricsTitle {
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;
@@ -699,41 +1015,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;
}
@@ -785,3 +1098,42 @@
li.L5,
li.L7,
li.L9 { background: #fafafa !important; }
+
+div.markdown pre {
+ background-color: #F5F5F5;
+ border: 1px solid rgba(0, 0, 0, 0.15);
+ border-radius: 4px 4px 4px 4px;
+ display: block;
+ font-size: 12px;
+ line-height: 18px;
+ margin: 0 0 9px;
+ padding: 8.5px;
+ white-space: pre-wrap;
+}
+
+div.markdown pre code {
+ background-color: inherit;
+ border: none;
+ padding: 0;
+}
+
+div.markdown code {
+ background-color: #ffffe0;
+ border: 1px solid orange;
+ border-radius: 3px;
+ padding: 0 0.2em;
+}
+
+div.markdown a {
+ text-decoration: underline;
+}
+
+div.markdown em {
+ color: #b05000;
+}
+
+div.markdown table.text th, div.markdown table.text td {
+ vertical-align: top;
+ border-top: 1px solid #ccc;
+ padding:5px;
+}
\ No newline at end of file
--
Gitblit v1.9.1