suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A lousy attempt at vertically aligning the footer.

Browse Source 
There's gotta be a better way!
This commit is contained in:
Mathias Meyer 2014-05-09 18:01:22 +02:00
parent 5f46ebbe35
commit e100eea2d8
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/scripts/app/templates/builds/show.hbs
View File

@ -31,26 +31,24 @@
<div class="footer"> <div class="footer">
<div class="author"> <div class="author">
{{#if commit.authorName}} {{#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}} {{/if}}
{{#unless commit.authorIsCommitter}} {{#unless commit.authorIsCommitter}}
{{#if commit.committerName}} {{#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}} {{/if}}
{{/unless}} {{/unless}}
</div> </div>
<div class="commit-changes"> <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 class="text"><a class="commit" {{bind-attr href="controller.urlGithubCommit"}}>Commit {{formatSha commit.sha}}</a></div><img src="/images/icons/github.png"/>
<div>
{{#if build.pullRequest}} {{#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}} {{else}}
{{#if build.commit.compareUrl}} {{#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}}
{{/if}} {{/if}}
</div>
</div> </div>
</div> </div>
</div> </div>

13
assets/scripts/app/templates/jobs/show.hbs
View File

@ -30,27 +30,24 @@
<div class="footer"> <div class="footer">
<div class="author"> <div class="author">
{{#if job.commit.authorName}} {{#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}} {{/if}}
{{#unless job.commit.authorIsCommitter}} {{#unless job.commit.authorIsCommitter}}
{{#if job.commit.committerName}} {{#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}} {{/if}}
{{/unless}} {{/unless}}
</div> </div>
<div class="commit-changes"> <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 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"/>
<div>
{{#if job.build.pullRequest}} {{#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}} {{else}}
{{#if job.commit.compareUrl}} {{#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}}
{{/if}} {{/if}}
</div>
</div> </div>
</div> </div>
</div> </div>

16
assets/styles/main/summary.sass
View File

@ -17,7 +17,7 @@
@include border-radius(5px) @include border-radius(5px)
background-color: #fafafa background-color: #fafafa
min-height: 30px min-height: 30px
padding: 5px 15px padding: 2px 11px
margin-bottom: 20px margin-bottom: 20px
padding-bottom: 10px padding-bottom: 10px
@ -94,6 +94,12 @@
img img
vertical-align: middle vertical-align: middle
.text
line-height: 15px
display: inline-block
position: relative
top: 2px
.commit-changes .commit-changes
text-align: right text-align: right
width: inherit width: inherit
@ -107,8 +113,8 @@
img img
margin-right: 2px margin-right: 2px
margin-left: 4px margin-left: 4px
height: 15px height: 16px
width: 15px width: 16px
.author .author
float: left float: left
@ -118,8 +124,8 @@
clear: none clear: none
img img
height: 15px height: 16px
width: 15px width: 16px
margin-right: 4px margin-right: 4px
margin-left: 2px margin-left: 2px