From 3a067e5b667bb30b7ddd18f7860358d725f01219 Mon Sep 17 00:00:00 2001 From: Florian Zschocke <florian.zschocke@cycos.com> Date: Mon, 26 Aug 2013 06:39:57 -0400 Subject: [PATCH] Add new property git.createRepositoriesShared. --- src/main/resources/gitblit.css | 128 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 104 insertions(+), 24 deletions(-) diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css index 0a1c3b0..4db1548 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 { @@ -29,7 +29,12 @@ 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; } @@ -54,7 +59,10 @@ } .navbar .brand { - padding: 10px 20px; + padding: 0px 10px 0px 20px; +} +.navbar .btn-navbar { + margin-top: 10px; } .navbar .pull-right { @@ -83,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 { @@ -124,28 +128,80 @@ 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-top: -8px; margin-bottom: 10px; } .repositorynavbar .title { line-height: 32px; + padding: 5px 0px; } .repositorynavbar .repository { font-weight: bold; } -.repositorynavbar .project a, .repositorynavbar .repository a { +.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 .repositorynavbar-inner { + padding-top: 2px; } .repositorynavbar ul { @@ -181,6 +237,14 @@ .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 { @@ -613,12 +677,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; } @@ -969,7 +1044,7 @@ div.diff table td { border-left: 1px solid #bbb; - background-color: #f5f5f5; + background-color: #fbfbfb; } td.changeType { @@ -1266,7 +1341,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; @@ -1276,13 +1351,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; } @@ -1292,6 +1367,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