suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merging we're hiring styles

Browse Source
This commit is contained in:
Justine Arreche 2014-12-10 10:53:28 +01:00
commit 60a8cd5a40
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/scripts/app/templates/layouts/top.hbs
View File

@ -25,7 +25,7 @@
</ul> </ul>
</li> </li>
<li> <li>
<a href="#" class="werehiring" target="_blank">We're Hiring!</a> <a href="https://travisci.workable.com" class="werehiring" target="_blank">We're Hiring!</a>
</li> </li>
<li class="traviscicom"> <li class="traviscicom">
<a href="http://travis-ci.com">Travis CI for Private Repositories</a> <a href="http://travis-ci.com">Travis CI for Private Repositories</a>

5
assets/styles/top.sass
View File

@ -32,9 +32,14 @@
a.werehiring a.werehiring
background-color: #31363d background-color: #31363d
border-radius: 4px border-radius: 4px
<<<<<<< HEAD
padding: 8px 16px padding: 8px 16px
line-height: 20px line-height: 20px
margin-right: 80px margin-right: 80px
=======
padding: 6px 18px 6px 18px
display: inline
>>>>>>> b51ca7e50adb765bd44d2ad4aaf52707e4378dfd
li.traviscicom li.traviscicom
a a