diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -2342,9 +2342,17 @@ h3.files_location { } .right .merge { - vertical-align: top; - font-size: 0.75em; - font-weight: 700; + padding: 1px 3px 1px 3px; + background-color: #fca062; + font-size: 10px; + font-weight: bold; + color: #ffffff; + text-transform: uppercase; + white-space: nowrap; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + margin-right: 2px; } .right .parent { @@ -2354,9 +2362,9 @@ h3.files_location { padding: 2px 2px 2px 2px; } .right .logtags .branchtag,.logtags .branchtag { - padding: 1px 3px 2px; + padding: 1px 3px 1px 3px; background-color: #bfbfbf; - font-size: 9.75px; + font-size: 10px; font-weight: bold; color: #ffffff; text-transform: uppercase; @@ -2364,7 +2372,6 @@ h3.files_location { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - padding-left:4px; } .right .logtags .branchtag a:hover,.logtags .branchtag a{ color: #ffffff; @@ -2374,9 +2381,9 @@ h3.files_location { color: #ffffff; } .right .logtags .tagtag,.logtags .tagtag { - padding: 1px 3px 2px; + padding: 1px 3px 1px 3px; background-color: #62cffc; - font-size: 9.75px; + font-size: 10px; font-weight: bold; color: #ffffff; text-transform: uppercase; diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -65,10 +65,7 @@