Skip to content

Commit

Permalink
fix(ui): various fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jkuri committed Oct 3, 2017
1 parent a64aa5a commit ca25a32
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ <h1 class="bold">
<img src="images/icons/git-commit.svg">
</span>
<span *ngIf="build?.data?.pull_request?.head?.sha">{{ build?.data?.pull_request?.head?.sha.slice(0, 7) }}</span>
<span *ngIf="!build?.data?.pull_request?.head?.sha && build?.data?.after">{{ build?.data?.after.slice(0, 7) }}</span>
<span *ngIf="!build?.data?.pull_request?.head?.sha && build?.data?.after">{{ build?.data?.after?.slice(0, 7) }}</span>
<span *ngIf="!build?.data?.pull_request?.head?.sha && !build?.data?.after && build?.data?.sha">{{ build?.data?.sha.slice(0, 7) }}</span>
<span *ngIf="!build?.data?.pull_request?.head?.sha && !build?.data?.after && !build?.data?.sha && build?.data?.object_attributes?.last_commit?.id">{{ build?.data?.object_attributes?.last_commit?.id.slice(0, 7) }}</span>
<span *ngIf="build?.data?.push?.changes">{{ build?.data?.push?.changes[0].commits[0].hash.slice(0, 7) }}</span>
<span *ngIf="build?.data?.pullrequest">{{ build?.data?.pullrequest?.source?.commit?.hash.slice(0, 7) }}</span>
<span *ngIf="build?.data?.commit">{{ build?.data?.commit?.id.slice(0, 7) }}</span>
<span *ngIf="build?.data?.commit">{{ build?.data?.commit?.id?.slice(0, 7) }}</span>
</p>
</div>
<div class="column is-4">
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/app-job/app-job.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ <h2 *ngIf="commitMessage">{{ commitMessage }}</h2>
<span *ngIf="!job?.build?.data?.pull_request && !job?.build?.data?.after && !job?.build?.data?.sha && job?.build?.data?.object_attributes?.last_commit?.id">{{ job?.build?.data?.object_attributes?.last_commit?.id.slice(0, 7) }}</span>
<span *ngIf="job?.build?.data?.push?.changes">{{ job?.build?.data?.push?.changes[0].commits[0].hash.slice(0, 7) }}</span>
<span *ngIf="job?.build?.data?.pullrequest">{{ job?.build?.data?.pullrequest?.source?.commit?.hash.slice(0, 7) }}</span>
<span *ngIf="job?.build?.data?.commit">{{ job?.build?.data?.commit?.id.slice(0, 7) }}</span>
<span *ngIf="job?.build?.data?.commit">{{ job?.build?.data?.commit?.id?.slice(0, 7) }}</span>
</p>
</div>
<div class="column is-4">
Expand Down
8 changes: 7 additions & 1 deletion src/app/styles/mobile.sass
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,9 @@

button
height: 30px
display: block
display: flex
align-items: center
justify-content: center
width: 200px
margin: 10px auto
color: $color
Expand All @@ -150,3 +152,7 @@
outline: none
font-weight: $weight-semibold
background-image: linear-gradient(0deg, #F2F4F7 0%, #FFFFFF 100%)

i
font-size: 16px
margin-left: 5px

0 comments on commit ca25a32

Please sign in to comment.