Improve styling and icon build

gulpfile.babel.js

@@ -36,7 +36,8 @@ gulp.task('test', ['build'], (cb) => {
 gulp.task('styles', () => {
   return pipe(
     './src/styles/octotree.less',
-    $.less(),
+    $.plumber(),
+    $.less({relativeUrls: true}),
     $.autoprefixer({cascade: true}),
     './tmp'
   )

package.json

@@ -1,6 +1,6 @@
 {
   "name": "octotree",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "Code tree for GitHub and GitLab",
   "main": "inject.js",
   "scripts": {
@@ -35,6 +35,7 @@
     "gulp-less": "^1.3.1",
     "gulp-load-plugins": "^0.5.3",
     "gulp-mocha": "2.0.0",
+    "gulp-plumber": "^1.1.0",
     "gulp-preprocess": "^1.1.1",
     "gulp-rename": "^1.2.0",
     "gulp-replace": "^0.5.4",

src/adapters/github.less

@@ -7,7 +7,10 @@
     a.octotree_toggle {
       right: 5px;
       &:not(.octotree_loading) > span:after {
-        content: data-uri('image/svg+xml;charset=UTF-8', '../../icons/github-icons/chevron-left.svg');
+        content: data-uri('image/svg+xml;charset=UTF-8', './octicons/chevron-left.svg');
+      }
+      &:not(.octotree_loading):hover > span:after {
+        content: data-uri('image/svg+xml;charset=UTF-8', './octicons/chevron-left-hover.svg');
       }
     }
   }
@@ -36,7 +39,7 @@
 
       .octotree_help {
         & > span:before {
-          content: data-uri('image/svg+xml;charset=UTF-8', '../../icons/github-icons/question.svg');
+          content: data-uri('image/svg+xml;charset=UTF-8', './octicons/question.svg');
         }
       }
     }
@@ -46,27 +49,34 @@
         font-size: 13px;
       }
       .octotree_header_repo:before {
-        content: data-uri('image/svg+xml;charset=UTF-8', '../../icons/github-icons/repo.svg');
+        position: relative;
+        top: 2px;
+        content: data-uri('image/svg+xml;charset=UTF-8', './octicons/repo.svg');
       }
       .octotree_header_branch {
         font-size: 11px;
       }
       .octotree_header_branch:before {
-        content: data-uri('image/svg+xml;charset=UTF-8','../../icons/github-icons/git-branch.svg');
+        position: relative;
+        top: 2px;
+        content: data-uri('image/svg+xml;charset=UTF-8', './octicons/git-branch.svg');
+      }
+      .jstree-icon {
+        margin-top: 3px;
       }
       .jstree-icon.tree:before {
-        content: data-uri('image/svg+xml;charset=UTF-8','../../icons/github-icons/file-directory.svg');
+        content: data-uri('image/svg+xml;charset=UTF-8', './octicons/file-directory.svg');
       }
       .jstree-icon.blob:before {
-        content: data-uri('image/svg+xml;charset=UTF-8','../../icons/github-icons/file-text.svg');
+        content: data-uri('image/svg+xml;charset=UTF-8', './octicons/file-text.svg');
       }
       .jstree-node.jstree-leaf:hover {
         .jstree-icon.blob:before {
-          content: data-uri('image/svg+xml;charset=UTF-8','../../icons/github-icons/cloud-download.svg');
+          content: data-uri('image/svg+xml;charset=UTF-8', './octicons/cloud-download.svg');
         }
       }
       .jstree-icon.commit:before {
-        content: data-uri('image/svg+xml;charset=UTF-8','../../icons/github-icons/file-submodule.svg');
+        content: data-uri('image/svg+xml;charset=UTF-8', './octicons/file-submodule.svg');
       }
       .jstree-anchor {
         color: #4183c4 !important;
@@ -98,11 +108,10 @@
     right: 38px;
     width: 14px;
     height: 14px;
-    background: data-uri('image/svg+xml;charset=UTF-8','../../icons/github-icons/gear.svg');
-  }
-
-  a.octotree_opts:hover {
-    background: data-uri('image/svg+xml;charset=UTF-8','../../icons/github-icons/gear-hover.svg');
+    background: data-uri('image/svg+xml;charset=UTF-8', './octicons/gear.svg');
+    &:hover {
+      background: data-uri('image/svg+xml;charset=UTF-8', './octicons/gear-hover.svg');
+    }
   }
 
   a.octotree_toggle {
@@ -110,7 +119,10 @@
     right: -35px;
 
     &:not(.octotree_loading) > span:after {
-      content: data-uri('image/svg+xml;charset=UTF-8','../../icons/github-icons/chevron-right.svg');
+      content: data-uri('image/svg+xml;charset=UTF-8', './octicons/chevron-right.svg');
+    }
+    &:not(.octotree_loading):hover > span:after {
+      content: data-uri('image/svg+xml;charset=UTF-8', './octicons/chevron-right-hover.svg');
     }
   }
 }

src/adapters/octicons/LICENSE

@@ -0,0 +1,9 @@
+(c) 2012-2016 GitHub
+
+When using the GitHub logos, be sure to follow the GitHub logo guidelines (https://github.com/logos)
+
+Font License: SIL OFL 1.1 (http://scripts.sil.org/OFL)
+Applies to all font files
+
+Code License: MIT (http://choosealicense.com/licenses/mit/)
+Applies to all other files

src/adapters/octicons/chevron-left-hover.svg

@@ -0,0 +1,3 @@
+<svg style="fill: #4183c4" height="16" width="8" xmlns="http://www.w3.org/2000/svg">
+  <path d="M5.5 3l1.5 1.5-3.75 3.5 3.75 3.5-1.5 1.5L0.5 8l5-5z" />
+</svg>

src/adapters/octicons/chevron-right-hover.svg

@@ -0,0 +1,3 @@
+<svg style="fill: #4183c4" height="16" width="8" xmlns="http://www.w3.org/2000/svg">
+  <path d="M7.5 8L2.5 13l-1.5-1.5 3.75-3.5L1 4.5l1.5-1.5 5 5z" />
+</svg>

src/adapters/octicons/cloud-download.svg

@@ -1,3 +1,3 @@
-<svg style="fill: #4183c4" height="16" width="16" xmlns="http://www.w3.org/2000/svg">
+<svg style="fill: #777" height="16" width="16" xmlns="http://www.w3.org/2000/svg">
   <path d="M9 13h2l-3 3-3-3h2V8h2v5z m3-8c0-0.44-0.91-3-4.5-3-2.42 0-4.5 1.92-4.5 4C1.02 6 0 7.52 0 9c0 1.53 1 3 3 3 0.44 0 2.66 0 3 0v-1.3H3C1.38 10.7 1.3 9.28 1.3 9c0-0.17 0.05-1.7 1.7-1.7h1.3v-1.3c0-1.39 1.56-2.7 3.2-2.7 2.55 0 3.13 1.55 3.2 1.8v1.2h1.3c0.81 0 2.7 0.22 2.7 2.2 0 2.09-2.25 2.2-2.7 2.2H10v1.3c0.38 0 1.98 0 2 0 2.08 0 4-1.16 4-3.5 0-2.44-1.92-3.5-4-3.5z" />
 </svg>

src/config/chrome/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "Octotree",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "manifest_version": 2,
   "author": "Buu Nguyen",
   "description": "Code tree for GitHub and GitLab",
@@ -19,8 +19,5 @@
   "background": {
     "scripts": [ "background.js" ],
     "persistent": false
-  },
-  "web_accessible_resources": [
-    "fonts/*.woff"
-  ]
+  }
 }

src/config/firefox/package.json

@@ -9,7 +9,7 @@
   "icon": "resource://jid1-Om7eJGwA1U8Akg-at-jetpack/data/icons/icon48.png",
   "icon64": "resource://jid1-Om7eJGwA1U8Akg-at-jetpack/data/icons/icon64.png",
   "license": "MIT",
-  "version": "2.0.3",
+  "version": "2.0.6",
   "permissions": {
     "cross-domain-content": ["https://api.github.com", "https://github.com", "https://gitlab.com"],
     "private-browsing": true

src/config/safari/Info.plist

@@ -13,9 +13,9 @@
 		<key>CFBundleInfoDictionaryVersion</key>
 		<string>6.0</string>
 		<key>CFBundleShortVersionString</key>
-		<string>2.0.3</string>
+		<string>2.0.6</string>
 		<key>CFBundleVersion</key>
-		<string>2.0.3</string>
+		<string>2.0.6</string>
 		<key>Chrome</key>
 		<dict/>
 		<key>Content</key>

src/template.html

@@ -19,7 +19,7 @@
       </div>
     </a>
 
-    <a class="octotree_opts" href="javascript:void(0)">
+    <a class="octotree_opts" href="#">
       <span></span>
     </a>