Merge pull request #11 from arcticicestudio/feature/ghi-#8-workbench-…

…theming

Workbench theming

.editorconfig

@@ -1,6 +1,6 @@
-# ++++++++++++++++++++++
+# +--------------------+
 # + Base Configuration +
-# ++++++++++++++++++++++
+# +--------------------+
 [*]
 charset = utf-8
 end_of_line = lf
@@ -10,9 +10,9 @@ insert_final_newline = true
 max_line_length = 160
 trim_trailing_whitespace = true
 
-# +++++++++++++
+# +-----------+
 # + Languages +
-# +++++++++++++
-# +++ Markdown +++
+# +-----------+
+# +--- Markdown ---+
 [*.{md,gfm}]
 trim_trailing_whitespace = false

.eslintrc.js

@@ -0,0 +1,78 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+title      ESLint Configuration                                       +
+project    nord-visual-studio-code                                    +
+repository https://github.com/arcticicestudio/nord-visual-studio-code +
+author     Arctic Ice Studio                                          +
+email      development@arcticicestudio.com                            +
+copyright  Copyright (C) 2017                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+[References]
+ESLint
+  http://eslint.org/docs/rules
+  http://eslint.org/docs/user-guide/configuring
+  http://eslint.org/docs/user-guide/configuring#using-configuration-files
+  http://eslint.org/docs/user-guide/configuring#specifying-environments
+  http://eslint.org/docs/user-guide/configuring.html#specifying-globals
+*/
+module.exports = {
+  "env": {
+    "node": true,
+    "es6": true,
+    "browser": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "ecmaFeatures": {}
+  },
+  "plugins": [
+    "json"
+  ],
+  "extends": [
+    "eslint:recommended"
+  ],
+  "rules": {
+    // Style Guide
+    "array-bracket-spacing": ["error", "never"],
+    "comma-dangle": ["error", "never"],
+    "curly":["error", "all"],
+    "func-call-spacing": ["error", "never"],
+    "indent": ["error", 2],
+    "linebreak-style": ["error", "unix"],
+    "no-duplicate-imports": "error",
+    "no-floating-decimal": "error",
+    "no-tabs": "error",
+    "no-trailing-spaces": ["error", {
+      "skipBlankLines": false
+    }],
+    "no-var": "error",
+    "no-whitespace-before-property": "error",
+    "quotes": ["error", "double"],
+    "semi": ["error", "always"],
+    // Error Prevention
+    "no-cond-assign": ["error", "always"],
+    "no-console": "off",
+    // Code Performance
+    "global-require": "warn",
+    // Documentation
+    "require-jsdoc": ["warn", {
+      "require": {
+        "FunctionDeclaration": true,
+        "MethodDefinition": false,
+        "ClassDeclaration": true,
+        "ArrowFunctionExpression": false
+      }
+    }],
+    "valid-jsdoc": ["error", {
+      "prefer": {
+        "arg": "param",
+        "argument": "param",
+        "class": "constructor",
+        "virtual": "abstract"
+      },
+      "requireParamDescription": true,
+      "requireReturnDescription": true
+    }]
+  }
+};

.npmrc

@@ -0,0 +1 @@
+save-exact=true

.travis.yml

@@ -11,12 +11,17 @@
 # Travis CI Documentation
 #   (https://docs.travis-ci.com)
 language: node_js
+dist: trusty
+sudo: false
 node_js:
+  - "4"
   - "6"
-cache:
- directories:
-    - $HOME/node_modules
+  - "7"
+before_install:
+  - rm -rf ./node_modules
 before_script:
-  - npm install -g gulp
+  - npm install -g gulp-cli
+  - npm install gulp
   - npm install
-script: gulp lint
+script:
+  - gulp --harmony lint

CHANGELOG.md

@@ -1,6 +1,6 @@
 <p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord-visual-studio-code/develop/assets/nord-visual-studio-code-banner.svg"/></p>
 
-<p align="center"><img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-visual-studio-code/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-visual-studio-code.svg?style=flat-square"/></a> <a href="https://github.com/arcticicestudio/nord/releases/tag/v0.2.0"><img src="https://img.shields.io/badge/Nord-v0.2.0-88C0D0.svg?style=flat-square"/></a> <img src="https://marketplace.visualstudio.com/favicon.ico" width=24 height=24/> <a href="https://code.visualstudio.com/updates/v1_9"><img src="https://img.shields.io/badge/VS_Code-v1.9+-373277.svg?style=flat-square"/></a> <a href="https://marketplace.visualstudio.com/items/arcticicestudio.nord-visual-studio-code"><img src="http://vsmarketplacebadge.apphb.com/version/arcticicestudio.nord-visual-studio-code.svg?style=flat-square"/></a> <a href="https://marketplace.visualstudio.com/items/arcticicestudio.nord-visual-studio-code"><img src="http://vsmarketplacebadge.apphb.com/installs/arcticicestudio.nord-visual-studio-code.svg?style=flat-square"/></a> <a href="https://marketplace.visualstudio.com/items/arcticicestudio.nord-visual-studio-code"><img src="http://vsmarketplacebadge.apphb.com/rating-short/arcticicestudio.nord-visual-studio-code.svg?style=flat-square"/></a></p>
+<p align="center"><img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-visual-studio-code/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-visual-studio-code.svg?style=flat-square"/></a> <a href="https://github.com/arcticicestudio/nord/releases/tag/v0.2.0"><img src="https://img.shields.io/badge/Nord-v0.2.0-88C0D0.svg?style=flat-square"/></a> <img src="https://marketplace.visualstudio.com/favicon.ico" width=24 height=24/> <a href="https://code.visualstudio.com/updates/v1_12"><img src="https://img.shields.io/badge/VS_Code-v1.12+-373277.svg?style=flat-square"/></a> <a href="https://marketplace.visualstudio.com/items/arcticicestudio.nord-visual-studio-code"><img src="http://vsmarketplacebadge.apphb.com/version/arcticicestudio.nord-visual-studio-code.svg?style=flat-square"/></a> <a href="https://marketplace.visualstudio.com/items/arcticicestudio.nord-visual-studio-code"><img src="http://vsmarketplacebadge.apphb.com/installs/arcticicestudio.nord-visual-studio-code.svg?style=flat-square"/></a> <a href="https://marketplace.visualstudio.com/items/arcticicestudio.nord-visual-studio-code"><img src="http://vsmarketplacebadge.apphb.com/rating-short/arcticicestudio.nord-visual-studio-code.svg?style=flat-square"/></a></p>
 
 ---
 

README.md

@@ -1,13 +1,15 @@
 <p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord-visual-studio-code/develop/assets/nord-visual-studio-code-banner.svg"/></p>
 
-<p align="center"><img src="https://cdn.travis-ci.org/images/favicon-c566132d45ab1a9bcae64d8d90e4378a.svg" width=24 height=24/> <a href="https://travis-ci.org/arcticicestudio/nord-visual-studio-code"><img src="https://img.shields.io/travis/arcticicestudio/nord-visual-studio-code/develop.svg?style=flat-square"/></a> <img src="https://circleci.com/favicon.ico" width=24 height=24/> <a href="https://circleci.com/gh/arcticicestudio/nord-visual-studio-code"><img src="https://img.shields.io/circleci/project/github/arcticicestudio/nord-visual-studio-code/develop.svg?style=flat-square"/></a> <img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-visual-studio-code/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-visual-studio-code.svg?style=flat-square"/></a> <a href="https://github.com/arcticicestudio/nord/releases/tag/v0.2.0"><img src="https://img.shields.io/badge/Nord-v0.2.0-88C0D0.svg?style=flat-square"/></a> <img src="https://marketplace.visualstudio.com/favicon.ico" width=24 height=24/> <a href="https://code.visualstudio.com/updates/v1_9"><img src="https://img.shields.io/badge/VS_Code-v1.9+-373277.svg?style=flat-square"/></a> <a href="https://marketplace.visualstudio.com/items/arcticicestudio.nord-visual-studio-code"><img src="http://vsmarketplacebadge.apphb.com/version/arcticicestudio.nord-visual-studio-code.svg?style=flat-square"/></a> <a href="https://marketplace.visualstudio.com/items/arcticicestudio.nord-visual-studio-code"><img src="http://vsmarketplacebadge.apphb.com/installs/arcticicestudio.nord-visual-studio-code.svg?style=flat-square"/></a> <a href="https://marketplace.visualstudio.com/items/arcticicestudio.nord-visual-studio-code"><img src="http://vsmarketplacebadge.apphb.com/rating-short/arcticicestudio.nord-visual-studio-code.svg?style=flat-square"/></a></p>
+<p align="center"><img src="https://cdn.travis-ci.org/images/favicon-c566132d45ab1a9bcae64d8d90e4378a.svg" width=24 height=24/> <a href="https://travis-ci.org/arcticicestudio/nord-visual-studio-code"><img src="https://img.shields.io/travis/arcticicestudio/nord-visual-studio-code/develop.svg?style=flat-square"/></a> <img src="https://circleci.com/favicon.ico" width=24 height=24/> <a href="https://circleci.com/gh/arcticicestudio/nord-visual-studio-code"><img src="https://img.shields.io/circleci/project/github/arcticicestudio/nord-visual-studio-code/develop.svg?style=flat-square"/></a> <img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-visual-studio-code/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-visual-studio-code.svg?style=flat-square"/></a> <a href="https://github.com/arcticicestudio/nord/releases/tag/v0.2.0"><img src="https://img.shields.io/badge/Nord-v0.2.0-88C0D0.svg?style=flat-square"/></a> <img src="https://marketplace.visualstudio.com/favicon.ico" width=24 height=24/> <a href="https://code.visualstudio.com/updates/v1_12"><img src="https://img.shields.io/badge/VS_Code-v1.12+-373277.svg?style=flat-square"/></a> <a href="https://marketplace.visualstudio.com/items/arcticicestudio.nord-visual-studio-code"><img src="http://vsmarketplacebadge.apphb.com/version/arcticicestudio.nord-visual-studio-code.svg?style=flat-square"/></a> <a href="https://marketplace.visualstudio.com/items/arcticicestudio.nord-visual-studio-code"><img src="http://vsmarketplacebadge.apphb.com/installs/arcticicestudio.nord-visual-studio-code.svg?style=flat-square"/></a> <a href="https://marketplace.visualstudio.com/items/arcticicestudio.nord-visual-studio-code"><img src="http://vsmarketplacebadge.apphb.com/rating-short/arcticicestudio.nord-visual-studio-code.svg?style=flat-square"/></a></p>
 
 <p align="center">An arctic, north-bluish clean and elegant <a href="https://code.visualstudio.com">Visual Studio Code</a> theme.</p>
 
 <p align="center">Designed for a fluent and clear workflow.<br>
 Based on the <a href="https://github.com/arcticicestudio/nord">Nord</a> color palette.</p>
 
-<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-top.png"/><br><blockquote>Icons provided by <a href="https://marketplace.visualstudio.com/items?itemName=PKief.material-icon-theme">Material Icon Theme</a>.<br>Font: <a href="https://adobe-fonts.github.io/source-code-pro">Source Code Pro</a> 20px</blockquote></p>
+---
+
+<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-preview.png"/><br><blockquote>Icons provided by <a href="https://marketplace.visualstudio.com/items?itemName=PKief.material-icon-theme">Material Icon Theme</a>.<br>Font: <a href="https://adobe-fonts.github.io/source-code-pro">Source Code Pro</a> 20px</blockquote></p>
 
 ## Getting started
 ### Installation
@@ -62,10 +64,38 @@ run the `Preferences: Color Theme` command and select `Nord` from the drop-down
 The color theme drop-down can alternatively be opened via *File* (*Code* on macOS) > *Preferences* > *Color Theme*.
 
 ## Features
+### Editor
 <p align="center"><strong>Non-obtrusive cusror line and search marker.</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-cursorline.png"/><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-search.png"/><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrcast-feature-search.gif"/></p>
 
 <p align="center"><strong>Colors of selected code can still be easily recognized.</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrcast-feature-selection.gif"/></p>
 
+### Workbench
+Fully supported [Workbench](https://code.visualstudio.com/docs/getstarted/theme-color-reference) styles.
+
+<p align="center"><strong>Activity Bar Badges</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-activity-bar-badge.png"/></p>
+
+<p align="center"><strong>Tabs</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-tab-bar.png"/></p>
+
+<p align="center"><strong>Status Bar</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-status-bar.png"/></p>
+
+<p align="center"><strong>Panels and terminal colors</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-panel-terminal-colors.png"/></p>
+
+<p align="center"><strong>Editor Widgets (Search)</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-editor-widget-search.png"/></p>
+
+<p align="center"><strong>Notifications</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-notification.png"/></p>
+
+<p align="center"><strong>Side Bar Views (Debug)</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-side-bar-debug.png"/></p>
+
+<p align="center"><strong>Peek View</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-peek-view.png"/></p>
+
+<p align="center"><strong>Diff Editor</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-diffeditor-inserted.png"/><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-diffeditor-removed.png"</p>
+
+<p align="center"><strong>Peek View</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-peek-view.png"/></p>
+
+<p align="center"><strong>Validations</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-validation-info.png"/><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-validation-warning.png"/><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-validation-error.png"/></p>
+
+<p align="center"><strong>Validations</strong><br><strong>Active selection</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-list-active-selection.png"/><br><strong>Inactive selection</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-list-inactive-selection.png"/><br><strong>Active selection with keyboard navigation marker</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-list-active-selection-keyboard.png"/><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrcast-feature-ui-list-active-selection-keyboard.gif"/><br><strong>Active- and inactive selection with hover marker</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrot-feature-ui-list-inactive-selection-hover.png"/><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-visual-studio-code/develop/assets/scrcast-feature-ui-list-hover.gif"/></p>
+
 ## Languages
 This theme contains optimized styles to achieve a consistent and uniform coloring across languages.  
 Detailed descriptions for supported languages can be found in the [project wiki](https://github.com/arcticicestudio/nord-visual-studio-code/wiki).

circle.yml

@@ -9,14 +9,20 @@
 #
 # [References]
 # Circle CI
-#   (https://circleci.com/docs)
+#   https://circleci.com/docs
+machine:
+  environment:
+    PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
 machine:
   node:
-    version: 6.1.0
+    version: 7
 dependencies:
+  pre:
+    - rm -rf ./node_modules
   override:
-    - npm install -g gulp
+    - npm install -g gulp-cli
+    - npm install gulp
     - npm install
 test:
   override:
-    - gulp lint
+    - gulp --harmony lint

gulpfile.js

@@ -1,3 +1,4 @@
+"use strict";
 /*
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 title      Project Gulp File                                           +
@@ -10,22 +11,20 @@ copyright  Copyright (C) 2017                                          +
 
 [References]
 Gulp
-  (http://gulpjs.com)
+  http://gulpjs.com
 npmjs
-  (https://www.npmjs.com)
+  https://www.npmjs.com
 */
-
-"use strict";
 /*+---------+
   + Imports +
   +---------+*/
 const gulp = require("gulp-help")(require("gulp"));
-const xmlValidator = require("gulp-xml-validator");
+const eslint = require("gulp-eslint");
 
 /*+---------------+
   + Configuration +
   +---------------+*/
-const tmThemeFiles = ["themes/*.tmTheme"];
+const jsonThemeFiles = ["themes/**/*.json"];
 
 /*+-------+
   + Tasks +
@@ -38,11 +37,20 @@ const tmThemeFiles = ["themes/*.tmTheme"];
 gulp.task("default", ["help"]);
 
 /**
- * Lints all color theme files.
+ * Runs all lint tasks.
  *
- * @since 0.1.0
+ * @since 0.2.0
+ */
+gulp.task("lint", "Runs all lint tasks", ["lint-json"]);
+
+/**
+ * Lints all JSON color theme sources.
+ *
+ * @since 0.2.0
  */
-gulp.task('lint', "Lints all color theme files", () => {
-  return gulp.src(tmThemeFiles)
-    .pipe(xmlValidator());
+gulp.task("lint-json", "Lints all JSON color theme sources", () => {
+  return gulp.src(jsonThemeFiles)
+    .pipe(eslint())
+    .pipe(eslint.format())
+    .pipe(eslint.failAfterError());
 });

package.json

@@ -18,7 +18,7 @@
   },
   "license": "(Apache-2.0 AND CC-BY-SA-4.0)",
   "engines": {
-    "vscode": "^1.9.0"
+    "vscode": "^1.12.0"
   },
   "galleryBanner": {
     "color": "#2E3440",
@@ -58,13 +58,15 @@
       {
         "label": "Nord",
         "uiTheme": "vs-dark",
-        "path": "./themes/Nord.tmTheme"
+        "path": "./themes/nord.json"
       }
     ]
   },
   "devDependencies": {
+    "eslint": "3.19.0",
+    "eslint-plugin-json": "1.2.0",
     "gulp": "3.9.1",
-    "gulp-help": "1.6.1",
-    "gulp-xml-validator": "0.1.2"
+    "gulp-eslint": "3.0.1",
+    "gulp-help": "1.6.1"
   }
 }