add help icon to concurrency build setting

This commit is contained in:
Lisa Passing 2015-07-22 12:51:03 +02:00
parent 0efcaabc62
commit bed880019f
5 changed files with 36 additions and 6 deletions

View File

@ -10,4 +10,9 @@ SettingsController = Ember.Controller.extend
sshKeyDeleted: -> sshKeyDeleted: ->
@set('model.customSshKey', null) @set('model.customSshKey', null)
deactivate: ->
console.log('deactivate')
debugger
`export default SettingsController` `export default SettingsController`

View File

@ -68,7 +68,7 @@
overflow: hidden overflow: hidden
.job-id .job-id
width: grid-calc(3, 24) width: grid-calc(3, 24)
border-right: solid 1px $grey-lighter border-right: solid 1px $cream-dark
.job-os .job-os
width: grid-calc(1, 24) width: grid-calc(1, 24)
text-align: center text-align: center

View File

@ -1,6 +1,5 @@
%tooltip %tooltip
&:hover .tooltip-bubble, &:hover .tooltip-bubble
&:hover + .tooltip-bubble
transform: translateY(0) transform: translateY(0)
opacity: 1 opacity: 1
@ -8,7 +7,6 @@
position: absolute position: absolute
top: -3.2em top: -3.2em
width: auto width: auto
max-width: 8.6em
height: 1.9em height: 1.9em
margin: auto margin: auto
padding: .2em .4em .3em padding: .2em .4em .3em
@ -23,6 +21,11 @@
transform: translateY(20%) transform: translateY(20%)
opacity: 0 opacity: 0
a
color: $white
&:hover
text-decoration: underline
&:before &:before
content: "" content: ""
position: absolute position: absolute
@ -38,6 +41,7 @@
.tooltip-bubble .tooltip-bubble
right: 0 right: 0
left: 0 left: 0
max-width: 8.6em
&:before &:before
left: 46% left: 46%
@media #{$medium-up} @media #{$medium-up}
@ -50,6 +54,7 @@
left: 0 left: 0
top: -4em top: -4em
height: 3.2em height: 3.2em
max-width: 8.6em
&:before &:before
left: 46% left: 46%
@media #{$medium-up} @media #{$medium-up}
@ -61,7 +66,21 @@
position: relative position: relative
.tooltip-bubble .tooltip-bubble
top: -4.5em top: -4.5em
left: -2em left: -1.9em
height: 3.7em height: 3.7em
&:before &:before
left: 15% left: 15%
.tooltip--settings
@extend %tooltip
display: inline-block
position: relative
.icon
width: 1.2em
height: 1.2em
vertical-align: middle
.tooltip-bubble
top: -2.6em
left: -1.9em
&:before
left: 2em

View File

@ -1,4 +1,10 @@
{{travis-switch active=enabled description=description action="toggle"}} {{travis-switch active=enabled description=description action="toggle"}}
<div class="tooltip--settings">
<a href="http://blog.travis-ci.com/2014-07-18-per-repository-concurrency-setting/" title="about the concurrency setting">
<p class="tooltip-bubble">Read more about concurrent builds</p>
<span class="icon icon--question"></span>
</a>
</div>
{{#if enabled}} {{#if enabled}}
{{input pattern="/^[0-9]+$/" value=value on="key-up" action="limitChanged"}} {{input pattern="/^[0-9]+$/" value=value on="key-up" action="limitChanged"}}
{{/if}} {{/if}}

View File

@ -41,7 +41,7 @@
<section class="settings-section"> <section class="settings-section">
<h2 class="small-title">Deactivate Repository</h2> <h2 class="small-title">Deactivate Repository</h2>
<p>If you'd no longer like to run this project on Travis CI you can deactivate it now.<br>You will be able to reactivate it in the future if you'd like to.</p> <p>If you'd no longer like to run this project on Travis CI you can deactivate it now.<br>You will be able to reactivate it in the future if you'd like to.</p>
<a href="#" class="button--delete">Deactivate Repository</a> <a href="#" class="button--delete" {{action "deactivate"}}>Deactivate Repository</a>
</section> </section>
</div> </div>