diff --git a/pylons_app/public/css/monoblue_custom.css b/pylons_app/public/css/monoblue_custom.css --- a/pylons_app/public/css/monoblue_custom.css +++ b/pylons_app/public/css/monoblue_custom.css @@ -476,6 +476,22 @@ canvas { .right .removed{ background: #FF8888; } + +.right .merge{ + float: right; + vertical-align: top; + font-size: 60%; + font-weight: bold; +} +.right .merge img{ + vertical-align: bottom; +} + +.right .parent{ +float:right; +font-size: 90%; +font-family: monospace; +} /** end of canvas **/ /* FILE BROWSER */ diff --git a/pylons_app/templates/changelog/changelog.html b/pylons_app/templates/changelog/changelog.html --- a/pylons_app/templates/changelog/changelog.html +++ b/pylons_app/templates/changelog/changelog.html @@ -40,7 +40,7 @@ from pylons_app.lib import filters