From 32b539b9489c8504b364fff0415053e440af5235 Mon Sep 17 00:00:00 2001
From: Lisa Passing <mail@lislis.de>
Date: Tue, 17 Mar 2015 17:26:33 +0100
Subject: [PATCH] include old styles and fix resulting overlaps

---
 app/styles/app.scss                 | 6 +++---
 app/styles/app/layouts/sidebar.sass | 6 ++++--
 app/templates/repos.hbs             | 2 +-
 app/templates/repos/list/tabs.hbs   | 6 +++---
 app/views/repos-list-tabs.coffee    | 2 +-
 app/views/repos-list.coffee         | 2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/styles/app.scss b/app/styles/app.scss
index 1ee38582..439c22b4 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -15,8 +15,8 @@
 @import "app/getting_started";
 @import "app/github";
 
-// @import "app/left/list";
-// @import "app/left";
+@import "app/left/list";
+@import "app/left";
 @import "app/loading";
 @import "app/main/annotations";
 @import "app/main/list";
@@ -39,7 +39,7 @@
 @import "app/settings";
 // @import "app/stats";
 // @import "app/status";
-// @import "app/tabs";
+@import "app/tabs";
 @import "app/tipsy";
 
 @import "app/components/travis-switch";
diff --git a/app/styles/app/layouts/sidebar.sass b/app/styles/app/layouts/sidebar.sass
index 42853c74..0a2030cf 100644
--- a/app/styles/app/layouts/sidebar.sass
+++ b/app/styles/app/layouts/sidebar.sass
@@ -68,8 +68,10 @@ $sb-font-size: 14px
     &:after
       transform: translateX(35%)
       display: inline-block
-  a:hover .icon--plus:after
-    color: $teal1
+  a:hover
+    bottom: 0.05em
+    .icon--plus:after
+      color: $teal1
 
 .sidebar-list
   margin-top: 1.4rem
diff --git a/app/templates/repos.hbs b/app/templates/repos.hbs
index ec3c862b..879b1fbe 100644
--- a/app/templates/repos.hbs
+++ b/app/templates/repos.hbs
@@ -1,4 +1,4 @@
-<div id="search_box" class="search search--sidebar">
+<div class="search search--sidebar">
   <div class="search-inner">
     {{input value=controller.search placeholder="Search all repositories"}}
   </div>
diff --git a/app/templates/repos/list/tabs.hbs b/app/templates/repos/list/tabs.hbs
index 8ee3f89b..f54190af 100644
--- a/app/templates/repos/list/tabs.hbs
+++ b/app/templates/repos/list/tabs.hbs
@@ -4,11 +4,11 @@
       {{#link-to "main.repositories"}}My Repositories{{/link-to}}
     </li>
 
-{{!--     {{#unless config.pro}}
+    {{#unless config.pro}}
       <li id="tab_recent" {{bind-attr class="view.classRecent"}}>
-        <h5>{{#link-to "main.recent"}}Recent{{/link-to}}</h5>
+        {{#link-to "main.recent"}}Recent{{/link-to}}
       </li>
-    {{/unless}} --}}
+    {{/unless}}
 
     {{!-- <li id="tab_search" {{bind-attr class="view.classSearch"}}>
       <h5>Search</h5>
diff --git a/app/views/repos-list-tabs.coffee b/app/views/repos-list-tabs.coffee
index 6f70e6da..964f925a 100644
--- a/app/views/repos-list-tabs.coffee
+++ b/app/views/repos-list-tabs.coffee
@@ -15,7 +15,7 @@ View = Ember.View.extend
   classOwned: (->
     classes = []
     classes.push('active')  if @get('tab') == 'owned'
-    # classes.push('display-inline') if @get('currentUser')
+    classes.push('display-inline') if @get('currentUser')
     classes.join(' ')
   ).property('tab', 'currentUser')
 
diff --git a/app/views/repos-list.coffee b/app/views/repos-list.coffee
index 5352cd99..65239f90 100644
--- a/app/views/repos-list.coffee
+++ b/app/views/repos-list.coffee
@@ -2,7 +2,7 @@
 `import { colorForState } from 'travis/utils/helpers'`
 
 View = Ember.CollectionView.extend
-  elementId: 'repos'
+  elementId: ''
   tagName: 'ul'
 
   emptyView: Ember.View.extend