From 2a8ea034b63736708839c140e53121026c19b9a8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 19 Sep 2013 09:03:04 -0400
Subject: [PATCH] Fix support for implied SSH urls in web.otherUrls (issue-311)
---
src/main/resources/gitblit.css | 349 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 289 insertions(+), 60 deletions(-)
diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css
index 131fc00..a69b988 100644
--- a/src/main/resources/gitblit.css
+++ b/src/main/resources/gitblit.css
@@ -1,6 +1,6 @@
body {
- /* 50px to start the container 10px below the navbar */
- padding-top: 60px;
+ /* 47px is the header height */
+ padding-top: 47px;
}
footer {
@@ -16,11 +16,25 @@
ul, ol {
margin-bottom: 10px !important;
}
+
+a {
+ color: #2F58A0;
+}
+
+a:hover {
+ color: #002060;
+}
+
a:focus {
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;
}
@@ -45,7 +59,10 @@
}
.navbar .brand {
- padding: 10px 20px;
+ padding: 0px 10px 0px 20px;
+}
+.navbar .btn-navbar {
+ margin-top: 10px;
}
.navbar .pull-right {
@@ -74,20 +91,16 @@
.navbar-inner {
background-color: #002060;
- background-repeat: none;
background-image: none;
- -webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);
- -moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);
- box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);
- border-bottom: 2px solid #ff9900 !important;
+ box-shadow: none;
+ border-bottom: 1px solid #002060 !important;
}
.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;
+ outline: 0;
+ padding-bottom: 1px;
+ border-bottom: 3px solid #ff9900;
+ margin-bottom: -1px;
}
.navbar .active a {
@@ -108,6 +121,130 @@
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;
+}
+
+.nav-pills > .active > a, .nav-pills > .active > a:hover {
+ color: #fff;
+ background-color: #002060;
+}
+
+div.reflog {
+ border-bottom: 1px solid #ddd;
+ margin-bottom: 5px;
+ padding-bottom: 5px;
+}
+
+div.reflog .icon {
+ font-size: 42px;
+ line-height: 42px;
+}
+
+div.reflog .when {
+ color: #aaa;
+}
+
+div.reflog i {
+ font-size: 42px;
+ color: #bbb;
+ vertical-align: middle;
+}
+
+div.reflog td.header {
+ padding-left: 7px;
+ vertical-align:middle;
+}
+
+div.reflog td.commits {
+ padding-left: 7px;
+}
+
+div.reflog tr.commit td {
+ vertical-align:top;
+ padding-left: 5px;
+}
+
+div.reflog tr.commit img {
+ max-width: none;
+}
+
+div.dashboardTitle {
+ font-size: 1.75em;
+ padding: 10px 0px 5px 0px;
+ margin: 10px 0px;
+ border-bottom: 1px solid #ccc;
+}
+
+div.dashboardTitle small {
+ color: #888;
+ font-size: 0.7em;
+}
+
+.repositorynavbar {
+ background-color: #fbfbfb;
+ border-bottom: 1px solid #ccc;
+ margin-bottom: 10px;
+}
+
+.repositorynavbar .title {
+ line-height: 32px;
+ padding: 5px 0px;
+}
+
+.repositorynavbar .repository {
+ font-weight: bold;
+}
+
+.title .repository a, .repositorynavbar .project a, .repositorynavbar .repository a {
+ font-family: Helvetica,arial,freesans,clean,sans-serif;
+ font-size: 22px;
+ color: #002060;
+}
+
+.repositorynavbar .repositorynavbar-inner {
+ padding-top: 2px;
+}
+
+.repositorynavbar ul {
+ list-style: none outside;
+ display: block;
+ position: relative;
+ border-top: 1px solid #ccc;
+}
+
+.repositorynavbar ul li {
+ display: block;
+ float: left;
+ padding: 10px;
+}
+
+.repositorynavbar ul li:focus, .repositorynavbar .active {
+ color: black;
+ background-repeat:no-repeat;
+ background-image: url(arrow_project.png);
+ background-position: center bottom;
+ font-weight: bold;
+ outline: 0;
+}
+
+.repositorynavbar ul a {
+ color: #002060;
+}
+
+.repositorynavbar ul li:hover {
+ background-color: #eee;
+}
+
+.repositorynavbar ul li a:hover {
+ background-color: inherit;
+ text-decoration: underline;
+}
+
+@media (max-width: 767px) {
+ .repositorynavbar {
+ margin-right: -20px;
+ margin-left: -20px;
+ padding: 0px 5px;
+ }
}
.btn-appmenu {
@@ -141,8 +278,8 @@
}
.breadcrumb {
- margin-top: 5px !important;
- margin-bottom: 5px !important;
+ margin-top: 10px !important;
+ margin-bottom: 10px !important;
}
.pageTitle {
@@ -246,12 +383,26 @@
font-family:menlo,consolas,monospace;
}
-span.repositoryUrl {
+div.repositoryUrl {
+ display: inline-block;
font-size: 1em;
- padding: 2px 4px 3px 4px;
+ padding: 1px 4px 2px 4px;
background-color: #fff;
- border-left: 1px solid #ddd;
- border-right: 1px solid #ddd;
+ border: 1px solid #ddd;
+ margin: 1px;
+}
+
+div.repositoryIndicator {
+ display:inline;
+ padding-top:0px;
+ margin-bottom:0px;
+}
+
+div.repositoryIndicator span.alert {
+ padding: 2px 7px 2px 7px;
+ vertical-align: middle;
+ font-size:0.85em;
+ font-weight:normal;
}
ul.urlMenu {
@@ -388,21 +539,29 @@
}
/* 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;
+#nums .jump {
+ border-top: 50px solid transparent;
+ margin-top: -50px;
+ background: url(arrow_line.png) no-repeat scroll bottom right transparent;
+}
+#nums .jump:target {
+ border-left: 7px solid transparent;
+ margin-right: 3px;
+}
+
+#lines .line {
+ padding-left: 5px;
color: #888;
}
-#nums span:target {
+#nums a:hover {
background-color: #ffffbf;
color: black;
font-weight: bold;
+ border-top: 1px solid red;
border-bottom: 1px solid red;
+ text-decoration: none;
}
#lines table {
@@ -417,11 +576,6 @@
padding-left: 5px;
}
-#lines a:hover {
- background-color: #ffffbf;
- text-decoration: none;
-}
-
#lines tr:hover {
background-color: #ffffbf;
}
@@ -432,8 +586,6 @@
#lines .even {
background-color: #fafafa;
}
-
-
h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
color: #888;
@@ -526,12 +678,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;
}
@@ -551,6 +714,10 @@
border: 1px solid #ddd;
border-radius: 5px;
padding: 2px;
+}
+
+img.navbarGravatar {
+ border: 1px solid #fff;
}
div.searchResult {
@@ -608,19 +775,7 @@
}
div.header, div.commitHeader, table.repositories th {
- background-color:#e0e0e0;
- background-repeat:repeat-x;
- background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#e0e0e0));
- background-image:-moz-linear-gradient(top, #ffffff, #e0e0e0);
- background-image:-ms-linear-gradient(top, #ffffff, #e0e0e0);
- background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e0e0e0));
- background-image:-webkit-linear-gradient(top, #ffffff, #e0e0e0);
- background-image:-o-linear-gradient(top, #ffffff, #e0e0e0);
- background-image:linear-gradient(top, #ffffff, #e0e0e0);
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e0e0e0', GradientType=0);
- -webkit-box-shadow:inset 0 1px 0 #ffffff;
- -moz-box-shadow:inset 0 1px 0 #ffffff;
- box-shadow:inset 0 1px 0 #ffffff;
+ background-color: #fbfbfb;
}
div.header {
@@ -629,6 +784,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 {
@@ -651,7 +816,19 @@
}
div.page_nav2 {
- padding: 2px 5px 7px 5px;
+ padding: 5px 10px;
+ margin: -10px 0px 10px;
+ border-left: 1px solid #ccc;
+ border-right: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
+ border-radius: 0px 0px 3px 3px;
+ background-color: #ECF1F4;
+ color: #666;
+ text-align: left;
+}
+
+div.page_nav2 a {
+ color: #002060;
}
div.admin_nav {
@@ -715,6 +892,9 @@
.commit_message {
padding: 8px;
+}
+
+.topborder {
border: solid #ddd;
border-width: 1px 0px 0px;
border-radius: 0px;
@@ -770,6 +950,10 @@
background-color: #F6F5EE;
padding: 2px 0;
font-family: inherit;
+}
+
+div.diff table {
+ border: 1px solid #ddd;
}
span.diff.add {
@@ -864,7 +1048,7 @@
div.diff table td {
border-left: 1px solid #bbb;
- background-color: #f5f5f5;
+ background-color: #fbfbfb;
}
td.changeType {
@@ -913,15 +1097,26 @@
text-align: right;
}
-table.plain {
+table.plain, table.summary {
width: 0 !important;
border: 0;
}
-table.plain th, table.plain td {
+table.plain th, table.plain td, table.summary th, table.summary td {
white-space: nowrap;
padding: 1px 3px;
border: 0;
+}
+
+table.summary {
+ margin: 0px;
+}
+
+table.summary th {
+ color: #999;
+ padding-right: 10px;
+ text-align: right;
+ font-weight: normal;
}
table.pretty {
@@ -937,7 +1132,7 @@
}
table.pretty td.icon img {
- vertical-align: top;
+ vertical-align: middle;
}
table.pretty td {
@@ -953,6 +1148,34 @@
width: 100%;
margin-left: 4px !important;
margin-bottom: 0px !important;
+}
+
+table.pretty td.graph {
+ border-right: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
+ padding: 0px;
+ /*width: 1px;*/
+}
+
+table.pretty tr.commit {
+ /* must match branch graph servlet row height definition */
+ height: 24px;
+}
+
+@media (min-width: 979px) {
+ td.ellipsize {
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
+}
+
+@media (max-width: 979px) {
+ td.ellipsize {
+ text-overflow: inherit;
+ overflow: visible;
+ white-space: wrap;
+ }
}
table.comments td {
@@ -1013,7 +1236,7 @@
font-weight: bold;
background-color: #ffffff !important;
padding-top: 0px !important;
- margin-bottom: 0 !imporant;
+ margin-bottom: 0 !important;
border: 0 !important;
border-radius: 0 !important;
line-height: 1em;
@@ -1087,7 +1310,7 @@
}
tr.dark {
- background-color: #f5f5f5;
+ background-color: #f6f6f6;
}
/* currently both use the same, but it can change */
@@ -1104,6 +1327,7 @@
td.author {
font-style: italic !important;
+ white-space: nowrap;
}
td.date {
@@ -1150,7 +1374,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;
@@ -1160,13 +1384,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;
}
@@ -1176,6 +1400,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