From 1eab821f9a4c296c9ae9faae18a6e2d2ef34ee38 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Thu, 25 May 2017 16:37:50 +0900 Subject: [PATCH] Fix size of buttons and labels in the branch liost view --- src/main/twirl/gitbucket/core/repo/branches.scala.html | 4 ++-- src/main/webapp/assets/common/css/gitbucket.css | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html index 3dcd2dbaf..65bf985fe 100644 --- a/src/main/twirl/gitbucket/core/repo/branches.scala.html +++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html @@ -57,13 +57,13 @@ helpers.urlEncode(parent) + ":" + helpers.encodeRefName(repository.repository.defaultBranch) }.getOrElse { helpers.encodeRefName(repository.repository.defaultBranch) - }}...@{helpers.encodeRefName(branch.name)}?expand=1" class="btn btn-default">New Pull request + }}...@{helpers.encodeRefName(branch.name)}?expand=1" class="btn btn-default btn-sm">New Pull request } else { Compare + }}...@{helpers.encodeRefName(branch.name)}" class="btn btn-default btn-sm">Compare } } @if(hasWritePermission){ diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index a0c2a9bf2..fd0f40375 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -479,6 +479,13 @@ table.branches>thead>tr>th, table.branches>tbody>tr>td{ .branches .a-b-count-widget .count-half .count-value{ padding: 0 3px; } +.branches .branch-a-b-count span.badge { + font-size: 100%; +} + +div.branch-action a.label { + font-size: 100%; +} td#upload-td { padding: 0px;