Merge branch 'master' into lp-ssh-key-permissions

This commit is contained in:
Lisa Passing 2015-07-28 12:15:08 +02:00
commit 584977e97d
3 changed files with 11 additions and 7 deletions

View File

@ -1,8 +1,4 @@
%tooltip
&:hover .tooltip-bubble
transform: translateY(0)
opacity: 1
.tooltip-bubble
position: absolute
top: -2.8em
@ -18,6 +14,7 @@
line-height: 1.3
text-align: center
white-space: nowrap
visibility: hidden
transition: all 100ms ease
transform: translateY(20%)
@ -27,7 +24,6 @@
color: $white
&:hover
text-decoration: underline
&:before
content: ""
position: absolute
@ -38,6 +34,11 @@
z-index: -1
background-color: #818383
&:hover .tooltip-bubble
transform: translateY(0)
opacity: 1
visibility: visible
.tooltip
@extend %tooltip
.tooltip-bubble

View File

@ -2,7 +2,7 @@
.feedback-button
display: none
position: fixed
right: 4%
right: 9%
left: auto
bottom: 0
margin: 0
@ -17,6 +17,9 @@
color: #399399
z-index: 89
@media #{$medium-up}
right: 5%
.feedback-button:hover
transform: translateY(5%)

View File

@ -1,6 +1,6 @@
{{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">
<a href="http://docs.travis-ci.com/user/customizing-the-build/#Limiting-Concurrent-Builds" title="about the concurrency setting">
<p class="tooltip-bubble">Read more about<br>concurrent builds</p>
<span class="icon icon--question"></span>
</a>