Prepared ftp.less for Sprint 38, improved less.

Author: FezVrasta

.gitignore

@@ -3,3 +3,4 @@
 /npm-debug.log
 /less/fonts/octicon.css
 /git.log
+/src/Ftp/styles/ftp.css

htmlContent/git-remotes-picker.html

@@ -2,7 +2,7 @@
 {{#remotes}}
 <li class="remote">
     <a href="#" data-remote-name="{{name}}" data-type="git" class="remote-name">
-        {{#deletable}}<span class="trash-icon remove-remote">&times;</span>{{/deletable}}
+        {{#deletable}}<span class="trash-icon hover-icon remove-remote">&times;</span>{{/deletable}}
         <span class="change-remote">{{name}}</span>
     </a>
 </li>

less/brackets-git.less

@@ -240,7 +240,7 @@
             display: inline-block;
             width: 100%;
         }
-        .trash-icon, .gitftp-init-remote {
+        .hover-icon {
             opacity: 0;
             background-image: none !important;
             width: 16px;
@@ -254,22 +254,11 @@
                 font-weight: bold;
             }
         }
-        .gitftp-init-remote {
-            position: relative;
-            top: 2px;
-            right: 4px;
-        }
-        &:hover .trash-icon, &:hover .gitftp-init-remote {
+        &:hover .hover-icon {
             opacity: 1;
         }
     }
 
-    a[data-type=ftp] .change-remote:before, span[data-type=ftp]:before {
-        content: "FTP:";
-        padding-right: 5px;
-        opacity: 0.5;
-    }
-
     .dropdown-menu {
         border: none;
         border-radius: @tc-control-border-radius;
@@ -304,7 +293,7 @@
             cursor: default;
         }
 
-        .gitftp-remote-new, .git-remote-new {
+        li:not(".remote"):not(".divider"):not(".dropdown-header") > a {
             font-style: italic;
         }
     }
@@ -344,6 +333,22 @@
         background-repeat: repeat;
         -webkit-animation: btn-loading 1s linear infinite;
     }
+
+    // Git-FTP styles, will be removed after S38, see /src/Ftp/styles/ftp.less
+    .git-remotes-dropdown {
+        .gitftp-init-remote {
+            position: relative;
+            top: 2px;
+            right: 4px;
+        }
+    }
+
+    a[data-type=ftp] .change-remote:before, span[data-type=ftp]:before {
+        content: "FTP:";
+        padding-right: 5px;
+        opacity: 0.5;
+    }
+
 }
 
 @-webkit-keyframes btn-loading {

src/Ftp/Ftp.js

@@ -24,7 +24,7 @@ define(function (require) {
 
     var attachEvents = _.once(function () {
         $gitPanel
-            .on("click", ".gitftp-remote-new", handleGitFtpScopeCreation)
+            .on("click", ".gitftp-remote-new", function () { handleGitFtpScopeCreation(); })
             .on("click", ".gitftp-remove-remote", function () { handleGitFtpScopeRemove($(this)); })
             .on("click", ".gitftp-init-remote", function () { handleGitFtpInitScope($(this)); })
             .on("click", ".gitftp-push", handleGitFtpPush);
@@ -150,8 +150,7 @@ define(function (require) {
             {booleanResponse: true}
         ).then(function (response) {
             if (response) {
-                return GitFtp.init(scopeName).then(function () {
-                }).catch(function (err) {
+                return GitFtp.init(scopeName).catch(function (err) {
                     ErrorHandler.showError(err, "Init scope failed");
                 });
             }

src/Ftp/styles/ftp.less

@@ -0,0 +1,17 @@
+#git-panel {
+
+    .git-remotes-dropdown {
+        .gitftp-init-remote {
+            position: relative;
+            top: 2px;
+            right: 4px;
+        }
+    }
+
+    a[data-type=ftp] .change-remote:before, span[data-type=ftp]:before {
+        content: "FTP:";
+        padding-right: 5px;
+        opacity: 0.5;
+    }
+
+}

src/Ftp/templates/remotes-picker.html

@@ -4,9 +4,9 @@
 {{#ftpScopes}}
 <li class="gitftp-remote">
     <a href="#" data-remote-name="{{name}}" data-type="ftp" class="remote-name">
-        <span class="trash-icon gitftp-remove-remote">&times;</span>
+        <span class="trash-icon hover-icon gitftp-remove-remote">&times;</span>
         <span class="change-remote">{{name}}</span>
-        <span class="octicon octicon-arrow-up gitftp-init-remote" title="{{Strings.INIT_GITFTP_SCOPE}}"></span>
+        <span class="octicon hover-icon octicon-arrow-up gitftp-init-remote" title="{{Strings.INIT_GITFTP_SCOPE}}"></span>
     </a>
 </li>
 {{/ftpScopes}}