From ada1a326fa36ceb46922006f87d4cff0c49e071f Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 12 Jun 2013 17:19:15 -0400 Subject: [PATCH] Fixed double enumeration of repositories on dashboard page --- src/main/resources/gitblit.css | 56 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css index 0a1c3b0..351d43f 100644 --- a/src/main/resources/gitblit.css +++ b/src/main/resources/gitblit.css @@ -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; } @@ -124,6 +129,23 @@ background-color: #002060; } +div.push { + border-bottom: 1px solid #ddd; + margin-bottom: 5px; + padding-bottom: 5px; +} + +div.push .icon { + font-size: 42px; + line-height: 42px; +} + +div.push i { + font-size: 42px; + color: #bbb; + vertical-align: middle; +} + .repositorynavbar { background-color: #fbfbfb; border-bottom: 1px solid #ccc; @@ -139,7 +161,7 @@ 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; @@ -613,12 +635,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 +1002,7 @@ div.diff table td { border-left: 1px solid #bbb; - background-color: #f5f5f5; + background-color: #fbfbfb; } td.changeType { @@ -1266,7 +1299,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 +1309,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 +1325,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