merging in upstream changes and tweaking styles

Author: averydev

lib/go-toggle.js

@@ -49,10 +49,10 @@ export default class GoToggle {
     newPath;
 
     if (fromType === 0){
-      if(toType === 1){
-        //Controller to Route
-        newPath = origPath.replace(/controllers/g, "routes");
-      }
+      // if(toType === 1){
+      //   //Controller to Route
+      //   newPath = origPath.replace(/controllers/g, "routes");
+      // }
       if(toType === 2){
         //Controller to Template
         newPath = origPath.replace(/controllers/g, "templates").replace(/.js/g, ".hbs");
@@ -68,9 +68,10 @@ export default class GoToggle {
     if (fromType === 2){
       if (toType === 0) {
         newPath = origPath.replace(/templates/g, "controllers").replace(/.hbs/g, ".js");
-      }else if(toType === 1){
-        newPath = origPath.replace(/templates/g, "routes");
       }
+      // else if(toType === 1){
+      //   newPath = origPath.replace(/templates/g, "routes");
+      // }
     }
     if (fromType === 3){
       if (toType === 4) {

lib/tab-watcher.js

@@ -115,7 +115,6 @@ export default class TabWatcher {
   }
 
   getEmberPodName(item) {
-
     if (typeof item.getPath !== "function") {
       return false;
     }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ember-tabs",
   "main": "./lib/ember-tabs",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "Makes Atom work better with Ember pods.",
   "keywords": [
     "ember",

styles/ember-tabs.less

@@ -12,8 +12,13 @@
   overflow: hidden;
   white-space: pre;
   text-overflow: ellipsis;
+  line-height: 12px;
+  position: absolute;
+  top:3px;
+  left:0;
 }
 
+
 // Dave's stylesheet for default dark theme/Molokai
 .tab-bar .tab {
   max-width: 220px;
@@ -38,10 +43,17 @@ atom-workspace-axis.vertical .tab-bar .tab {
   height: 40px !important;
 }
 
+
 .pod-file-type {
   color: #ccc;
 }
-
+atom-dock .list-inline.tab-bar .tab[data-type="TreeView"].active::after
+{
+  background-color: black;
+}
+atom-workspace-axis.vertical .tab-bar .tab.active::after{
+  background: none;
+}
 .tab.active .pod-file-type {
   color: #66D9EF;
 }