From e100eea2d8ca5effe453480a1bef5bc374d3e50d Mon Sep 17 00:00:00 2001
From: Mathias Meyer <meyer@paperplanes.de>
Date: Fri, 9 May 2014 18:01:22 +0200
Subject: [PATCH] A lousy attempt at vertically aligning the footer.
There's gotta be a better way!
---
assets/scripts/app/templates/builds/show.hbs | 12 +++++-------
assets/scripts/app/templates/jobs/show.hbs | 13 +++++--------
assets/styles/main/summary.sass | 16 +++++++++++-----
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs
index caff8109..1df7e292 100644
--- a/assets/scripts/app/templates/builds/show.hbs
+++ b/assets/scripts/app/templates/builds/show.hbs
@@ -31,26 +31,24 @@
<div class="footer">
<div class="author">
{{#if commit.authorName}}
- <div class="authored"><img {{bind-attr src="view.urlAuthorGravatarImage"}}/>{{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}}</div>
+ <div class="authored"><img {{bind-attr src="view.urlAuthorGravatarImage"}}/><div class="text">{{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}}</div></div>
{{/if}}
{{#unless commit.authorIsCommitter}}
{{#if commit.committerName}}
- <div class="committed"><img {{bind-attr src="view.urlCommitterGravatarImage"}}/>{{commit.committerName}} committed</div>
+ <div class="committed"><img {{bind-attr src="view.urlCommitterGravatarImage"}}/><div class="text">{{commit.committerName}} committed</div></div>
{{/if}}
{{/unless}}
</div>
<div class="commit-changes">
- <div><a class="commit" {{bind-attr href="controller.urlGithubCommit"}}>Commit {{formatSha commit.sha}}</a></div><img src="/images/icons/github.png"/>
- <div>
+ <div class="text"><a class="commit" {{bind-attr href="controller.urlGithubCommit"}}>Commit {{formatSha commit.sha}}</a></div><img src="/images/icons/github.png"/>
{{#if build.pullRequest}}
- <a class="compare" {{bind-attr href="build.commit.compareUrl"}} >#{{build.pullRequestNumber}}: {{build.pullRequestTitle}}</a><img src="/images/icons/github.png"/>
+ <div class="text"><a class="compare" {{bind-attr href="build.commit.compareUrl"}}>#{{build.pullRequestNumber}}: {{build.pullRequestTitle}}</a></div><img src="/images/icons/github.png"/>
{{else}}
{{#if build.commit.compareUrl}}
- <a class="compare" {{bind-attr href="build.commit.compareUrl"}}>Compare {{shortCompareShas build.commit.compareUrl}}</a><img src="/images/icons/github.png"/>
+ <div class="text"><a class="compare" {{bind-attr href="build.commit.compareUrl"}}>Compare {{shortCompareShas build.commit.compareUrl}}</a></div><img src="/images/icons/github.png"/>
{{/if}}
{{/if}}
- </div>
</div>
</div>
</div>
diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs
index a996ec21..a258f889 100644
--- a/assets/scripts/app/templates/jobs/show.hbs
+++ b/assets/scripts/app/templates/jobs/show.hbs
@@ -30,27 +30,24 @@
<div class="footer">
<div class="author">
{{#if job.commit.authorName}}
- <div class="authored"><img {{bind-attr src="view.urlAuthorGravatarImage"}}/>{{job.commit.authorName}} authored{{#if job.commit.authorIsCommitter}} and committed{{/if}}</div>
+ <div class="authored"><img {{bind-attr src="view.urlAuthorGravatarImage"}}/><div class="text">{{job.commit.authorName}} authored{{#if job.commit.authorIsCommitter}} and committed{{/if}}</div></div>
{{/if}}
{{#unless job.commit.authorIsCommitter}}
{{#if job.commit.committerName}}
- <div class="committed"><img {{bind-attr src="view.urlCommitterGravatarImage"}}/>{{job.commit.committerName}} committed</div>
+ <div class="committed"><img {{bind-attr src="view.urlCommitterGravatarImage"}}/><div class="text">{{job.commit.committerName}} committed</div></div>
{{/if}}
{{/unless}}
</div>
<div class="commit-changes">
- <div><a class="commit" {{bind-attr href="controller.urlGithubCommit"}}>Commit {{formatSha job.commit.sha}}</a><img src="/images/icons/github.png" height="15"/></div>
- <div>
+ <div class="text"><a class="commit" {{bind-attr href="controller.urlGithubCommit"}}>Commit {{formatSha job.commit.sha}}</a></div><img src="/images/icons/github.png" height="15"/>
{{#if job.build.pullRequest}}
- <a class="compare" {{bind-attr href="job.commit.compareUrl"}} >#{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}</a><img src="/images/icons/github.png"/>
+ <div class="text"><a class="compare" {{bind-attr href="job.commit.compareUrl"}} >#{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}</a></div><img src="/images/icons/github.png"/>
{{else}}
{{#if job.commit.compareUrl}}
- <a class="compare" {{bind-attr href="job.commit.compareUrl"}}>Compare {{shortCompareShas job.commit.compareUrl}}</a><img src="/images/icons/github.png"/>
+ <div class="text"><a class="compare" {{bind-attr href="job.commit.compareUrl"}}>Compare {{shortCompareShas job.commit.compareUrl}}</a></div><img src="/images/icons/github.png"/>
{{/if}}
{{/if}}
- </div>
-
</div>
</div>
</div>
diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass
index 67ab701b..af1901d9 100644
--- a/assets/styles/main/summary.sass
+++ b/assets/styles/main/summary.sass
@@ -17,7 +17,7 @@
@include border-radius(5px)
background-color: #fafafa
min-height: 30px
- padding: 5px 15px
+ padding: 2px 11px
margin-bottom: 20px
padding-bottom: 10px
@@ -94,6 +94,12 @@
img
vertical-align: middle
+ .text
+ line-height: 15px
+ display: inline-block
+ position: relative
+ top: 2px
+
.commit-changes
text-align: right
width: inherit
@@ -107,8 +113,8 @@
img
margin-right: 2px
margin-left: 4px
- height: 15px
- width: 15px
+ height: 16px
+ width: 16px
.author
float: left
@@ -118,8 +124,8 @@
clear: none
img
- height: 15px
- width: 15px
+ height: 16px
+ width: 16px
margin-right: 4px
margin-left: 2px