From 034e4bc7cd5ca3271e59ebdba1b25beb37b4b73c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 28 May 2013 07:39:01 -0400 Subject: [PATCH] Enabled SparkleShare client menu using 1.1.0 invite handler redesign --- src/main/resources/gitblit.css | 175 +++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 148 insertions(+), 27 deletions(-) diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css index 131fc00..40c1d69 100644 --- a/src/main/resources/gitblit.css +++ b/src/main/resources/gitblit.css @@ -16,6 +16,15 @@ ul, ol { margin-bottom: 10px !important; } + +a { + color: #2F58A0; +} + +a:hover { + color: #002060; +} + a:focus { outline: none; } @@ -110,6 +119,70 @@ color: #ffffff !important; } +.nav-pills > .active > a, .nav-pills > .active > a:hover { + color: #fff; + background-color: #002060; +} + +.repositorynavbar { + background-color: #fbfbfb; + border-bottom: 1px solid #ccc; + margin-top: -8px; + margin-bottom: 10px; +} + +.repositorynavbar .title { + line-height: 32px; +} + +.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 { +} + +.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; +} + .btn-appmenu { border-radius: 4px !important; background-color: #002060; @@ -141,8 +214,8 @@ } .breadcrumb { - margin-top: 5px !important; - margin-bottom: 5px !important; + margin-top: 10px !important; + margin-bottom: 10px !important; } .pageTitle { @@ -246,12 +319,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 { @@ -553,6 +640,10 @@ padding: 2px; } +img.navbarGravatar { + border: 1px solid #fff; +} + div.searchResult { padding: 10px 5px 10px 5px; } @@ -608,19 +699,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 +708,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 +740,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 { @@ -772,6 +873,10 @@ font-family: inherit; } +div.diff table { + border: 1px solid #ddd; +} + span.diff.add { color: #008800; font-family: inherit; @@ -864,7 +969,7 @@ div.diff table td { border-left: 1px solid #bbb; - background-color: #f5f5f5; + background-color: #fbfbfb; } td.changeType { @@ -913,15 +1018,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 { @@ -1087,7 +1203,7 @@ } tr.dark { - background-color: #f5f5f5; + background-color: #f6f6f6; } /* currently both use the same, but it can change */ @@ -1150,7 +1266,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 +1276,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 +1292,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