Merge branch 'products'

ksxatompackages · Oct 23, 2016 · 1c23f1e · 1c23f1e
2 parents 5ac6576 + a4d1ca6
commit 1c23f1e
Show file tree

Hide file tree

Showing 23 changed files with 8 additions and 0 deletions.
diff --git a/sh/build.sh b/sh/build.sh
diff --git a/sh/clean-all.sh b/sh/clean-all.sh
diff --git a/sh/clean-artifacts.sh b/sh/clean-artifacts.sh
diff --git a/sh/clean.sh b/sh/clean.sh
diff --git a/sh/fix.sh b/sh/fix.sh
diff --git a/sh/init-env.sh b/sh/init-env.sh
diff --git a/sh/lib/clean-list.sh b/sh/lib/clean-list.sh
diff --git a/sh/lib/init-dir-list.sh b/sh/lib/init-dir-list.sh
diff --git a/sh/lib/package-json-config.json b/sh/lib/package-json-config.json
diff --git a/sh/lib/preview.css b/sh/lib/preview.css
diff --git a/sh/lib/preview.pug b/sh/lib/preview.pug
diff --git a/sh/lib/split.js b/sh/lib/split.js
diff --git a/sh/preview.js b/sh/preview.js
diff --git a/sh/preview.sh b/sh/preview.sh
diff --git a/sh/remake-package-json.js b/sh/remake-package-json.js
diff --git a/sh/test.sh b/sh/test.sh
diff --git a/sh/travis-ci/after-deploy.sh b/sh/travis-ci/after-deploy.sh
diff --git a/sh/travis-ci/artifacts-directory.sh b/sh/travis-ci/artifacts-directory.sh
diff --git a/sh/travis-ci/before-deploy.sh b/sh/travis-ci/before-deploy.sh
diff --git a/sh/travis-ci/before-script.sh b/sh/travis-ci/before-script.sh
diff --git a/sh/travis-ci/deploy.sh b/sh/travis-ci/deploy.sh
diff --git a/src/variants/optional.js b/src/variants/optional.js
@@ -0,0 +1,4 @@
+'use strict'
+const text = 'optional'
+const color = 'orange'
+module.exports = {text, color}
diff --git a/src/variants/required.js b/src/variants/required.js
@@ -0,0 +1,4 @@
+'use strict'
+const text = 'required'
+const color = 'cyan'
+module.exports = {text, color}