Merge pull request #356 from travis-ci/small_fixes

Small fixes
This commit is contained in:
Piotr Sarnacki 2015-05-19 16:15:25 +02:00
commit 697f3bc56c
4 changed files with 19 additions and 24 deletions

View File

@ -13,7 +13,7 @@ Controller = Ember.ObjectController.extend(GithubUrlProperties,
).property('build.state') ).property('build.state')
urlAuthorGravatarImage: (-> urlAuthorGravatarImage: (->
gravatarImage(@get('build.commit.authorEmail'), 40) gravatarImage(@get('build.commit.committerEmail'), 40)
).property('build.commit.authorEmail') ).property('build.commit.authorEmail')
) )

View File

@ -44,12 +44,13 @@ $top-height: 55px
width: 100px width: 100px
height: $top-height height: $top-height
z-index: 999 z-index: 999
border: none !important outline: none
text-indent : -9999px text-indent: -9999px
transition: background-color 200ms ease transition: background-color 200ms ease
background : inline-image('svg/travis-ci-logo.svg') no-repeat 0 50% background: inline-image('svg/travis-ci-logo.svg') no-repeat 0 50%
&:hover &:hover
background : $cream-light inline-image('svg/travis-ci-logo-hover.svg') no-repeat 50% background: $cream-light inline-image('svg/travis-ci-logo-hover.svg') no-repeat 50%
.centered & .centered &
margin-left: 0 margin-left: 0
@ -80,16 +81,13 @@ $top-height: 55px
color: $grey1 color: $grey1
.navigation .navigation
padding: 0 $column-gutter/2
margin: 0
height: 0 height: 0
list-style: none
overflow: hidden overflow: hidden
&.is-open &.is-open
height: auto height: auto
a
padding: .5em 1em
.navigation,
.navigation-nested
@include resetul
.navigation-handle .navigation-handle
position: relative position: relative
@ -98,11 +96,13 @@ $top-height: 55px
.navigation-sub .navigation-sub
position: relative position: relative
.navigation-nested
@include resetul
a, a,
.navigation-handle span:not(.sync-spinner) .navigation-handle
display: block display: block
color: #898989 color: #898989
border-bottom: solid 1px #eff0ec
font-size: $font-size-m font-size: $font-size-m
cursor: pointer cursor: pointer
height: $top-height height: $top-height
@ -111,7 +111,8 @@ $top-height: 55px
&:hover &:hover
text-decoration: underline text-decoration: underline
.navigation--profile .profile
float: right
img img
border-radius: 50%; border-radius: 50%;
width: 2.7rem; width: 2.7rem;
@ -124,6 +125,7 @@ $top-height: 55px
height: $top-height height: $top-height
.navigation .navigation
padding: 0
height: $top-height height: $top-height
overflow: visible overflow: visible
> li > li
@ -138,13 +140,6 @@ $top-height: 55px
.navigation-handle span:not(.sync-spinner) .navigation-handle span:not(.sync-spinner)
padding: 0 .2em padding: 0 .2em
.navigation--profile
float: right
.navigation--profile.signed-out,
.navigation--profile.signing-in
line-height: $top-height - 5px
.navigation-nested .navigation-nested
display: none display: none
position: absolute position: absolute

View File

@ -10,7 +10,7 @@
<div class="media-body column medium-9"> <div class="media-body column medium-9">
<h2>Activate GitHub Repositories</h2> <h2>Activate GitHub Repositories</h2>
<p>Once you're signed in, and we've initially synchronized your repositories from GitHub, go to your {{#link-to "profile"}}profile{{/link-to}} page for open source or for your private projects.</p> <p>Once you're signed in, and we've initially synchronized your repositories from GitHub, go to your {{#link-to "profile"}}profile{{/link-to}} page for open source or for your private projects.</p>
<p>You'll see all the organizations you're a member of and all the repositories you have access to. The ones you administrative access to are the ones you can enable the service hook for.</p> <p>You'll see all the organizations you're a member of and all the repositories you have access to. The ones you have administrative access to are the ones you can enable the service hook for.</p>
<p>Flip the switch to on for all repositories you'd like to enable.</p> <p>Flip the switch to on for all repositories you'd like to enable.</p>
</div> </div>
</li> </li>

View File

@ -16,7 +16,7 @@
<ul class="navigation-nested"> <ul class="navigation-nested">
<li><a href="http://docs.travis-ci.com">Docs</a></li> <li><a href="http://docs.travis-ci.com">Docs</a></li>
<li><a href="http://stackoverflow.com/questions/ask?tags=travis-ci">Ask a Question</a></li> <li><a href="http://stackoverflow.com/questions/ask?tags=travis-ci">Ask a Question</a></li>
<li><a href="irc://irc.freenode.net/#travis">IRC</a></li> <li><a href="https://chat.travis-ci.com/">Live Chat</a></li>
<li><a href="mailto:support@travis-ci.com">E-Mail us</a></li> <li><a href="mailto:support@travis-ci.com">E-Mail us</a></li>
<li><a href="http://docs.travis-ci.com/imprint.html" alt="Imprint">Imprint</a></li> <li><a href="http://docs.travis-ci.com/imprint.html" alt="Imprint">Imprint</a></li>
</ul> </ul>
@ -41,7 +41,7 @@
</li> </li>
{{/if}} {{/if}}
<li {{bind-attr class="view.classProfile :navigation-sub :navigation--profile"}}> <li {{bind-attr class="view.classProfile :navigation-sub"}}>
<p class="handle navigation-handle"> <p class="handle navigation-handle">
{{#if auth.signedOut}} {{#if auth.signedOut}}
<button class="signed-out button--signin" {{action "signIn" target="auth"}}>Sign in with GitHub</button> <button class="signed-out button--signin" {{action "signIn" target="auth"}}>Sign in with GitHub</button>