merging we're hiring styles

2014-12-10 10:53:28 +01:00 · 2014-12-10 10:53:28 +01:00 · 60a8cd5a40
commit 60a8cd5a40
parent ebbc93ff25 b51ca7e50a
2 changed files with 6 additions and 1 deletions
--- a/assets/scripts/app/templates/layouts/top.hbs
+++ b/assets/scripts/app/templates/layouts/top.hbs
@ -25,7 +25,7 @@
    </ul>
  </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 class="traviscicom">
    <a href="http://travis-ci.com">Travis CI for Private Repositories</a>
--- a/assets/styles/top.sass
+++ b/assets/styles/top.sass
@ -32,9 +32,14 @@
  a.werehiring
    background-color: #31363d
    border-radius: 4px
+<<<<<<< HEAD
    padding: 8px 16px
    line-height: 20px
    margin-right: 80px
+=======
+    padding: 6px 18px 6px 18px
+    display: inline
+>>>>>>> b51ca7e50adb765bd44d2ad4aaf52707e4378dfd

  li.traviscicom
    a