Merge branch 'ember-cli' of github.com:travis-ci/travis-web into ember-cli

This commit is contained in:
Lisa Passing 2015-02-11 15:17:50 +01:00
commit 49ea505981
4 changed files with 22 additions and 17 deletions

View File

@ -68,8 +68,7 @@
float: none
& > div:first-child:nth-last-child(2) ~ div
width: 0
display: none
@media #{$large-up}
#left

View File

@ -1,22 +1,25 @@
#global-slider
display: none
.pro.maximized
#right
width: 0
*:not(#slider):not(.icon):not(.ember-view)
display: none
display: none
#slider
top: 45px
left: -20px
#global_slider
position: absolute
background-color: $color-bg-slider
cursor: pointer
background: transparent inline-image('ui/slider-open.svg') no-repeat 6px 5px
border-top-left-radius: 4px
top: 85px
right: 0
width: 20px
height: 20px
background-image: inline-image('ui/slider-open.svg')
background-position: 6px 5px
border-bottom-left-radius: 4px
display: block
// @media #{$medium-up}
// display: block
&:hover
background-color: $color-border-slider-hover
#top .profile
margin-right: 15px

View File

@ -150,10 +150,6 @@
&:hover
background-color: $color-border-slider-hover
.maximized
#slider
top: 45px
#right .show-more-jobs
text-decoration: underline
cursor: pointer

View File

@ -1 +1,8 @@
{{outlet}}
{{#if config.pro}}
<div id="global_slider" {{action toggle target=slider}}>
<div class='icon'></div>&nbsp;
</div>
{{/if}}