Merge branch 'master' into bugfix/#121

lerna.json

@@ -6,7 +6,7 @@
   ],
   "command": {
     "publish": {
-      "allowBranch": ["master", "release/*"],
+      "allowBranch": ["master", "release"],
       "conventionalCommits": true
     }
   },

package.json

@@ -16,7 +16,7 @@
     "lint": "yarn lint:js && yarn lint:style && yarn lint:hbs",
     "lint-staged": "lint-staged",
     "lerna:version": "lerna version --conventional-commits --yes",
-    "lerna:publish": "lerna publish --yes",
+    "lerna:publish": "lerna publish from-git --yes",
     "deploy": "yarn workspace nucleus deploy",
     "try": "ember try:each",
     "try:legacy": "ember try:one ember-lts-2.18"

packages/@nucleus/CHANGELOG.md

@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 0.5.0 (2020-02-18)
+
+
+### Bug Fixes
+
+* **button:** CSS code cleanup and enhancements ([#113](https://github.com/freshdesk/nucleus/issues/113)) ([2ea58af](https://github.com/freshdesk/nucleus/commit/2ea58afc6d1d68d685d87ecb8408b033885d63c2))
+
+
+### Features
+
+* **icon:** Implemented {{nucleus-icon}} ([#85](https://github.com/freshdesk/nucleus/issues/85)) ([a567468](https://github.com/freshdesk/nucleus/commit/a5674681147082f5f9790738cec1d632cac5debe))
+* **icon:** variant property ([#118](https://github.com/freshdesk/nucleus/issues/118)) ([7905cac](https://github.com/freshdesk/nucleus/commit/7905cac643897074a1276e79dc10f35d6a3003c4))
+
+
+
+
+
+## [0.4.5](https://github.com/freshdesk/nucleus/compare/[email protected]@0.4.5) (2020-02-14)
+
+
+### Bug Fixes
+
+* **button:** CSS code cleanup and enhancements ([#113](https://github.com/freshdesk/nucleus/issues/113)) ([2ea58af](https://github.com/freshdesk/nucleus/commit/2ea58afc6d1d68d685d87ecb8408b033885d63c2))
+
+
+
+
+
+## [0.4.4](https://github.com/freshdesk/nucleus/compare/[email protected]@0.4.4) (2020-02-10)
+
+**Note:** Version bump only for package nucleus
+
+
+
+
+
+## [0.4.3](https://github.com/freshdesk/nucleus/compare/[email protected]@0.4.3) (2020-02-07)
+
+**Note:** Version bump only for package nucleus
+
+
+
+
+
 # [0.2.0](https://github.com/freshdesk/nucleus/compare/[email protected]@0.2.0) (2020-01-09)
 
 

packages/@nucleus/app/styles/doc/_custom-addon-theme.scss

@@ -1,6 +1,31 @@
 :root {
-  // --brand-primary: #12344d;
-  font-size: 15px;
+  --brand-primary: #2c5cc5;
+  // eslint-disable-next-line
+  font-size: 14px;
+}
+
+.docs-bg-brand {
+  background-color: #2c5cc5 !important;
+}
+
+.docs-text-jumbo-1 span {
+  opacity: .5;
+  font-size: 1.5rem;
+  margin-bottom: 16px;
+}
+
+.docs-text-brand,
+h4 a.heading-anchor {
+  color: #2c5cc5 !important;
+  text-decoration: none;
+}
+
+.docs-shadow {
+  box-shadow: 0 2px 8px 0 rgba(166, 191, 217, .5);
+}
+
+.AddonDocs-DocsViewer-Nav {
+  border-color: #edf2f7;
 }
 
 .docs-list-reset .docs-capitalize {
@@ -9,6 +34,33 @@
   text-transform: uppercase;
 }
 
+.docs-viewer {
+  background-color: #f8fafc;
+}
+
+.docs-rounded {
+  margin: 1rem 0;
+}
+
+.docs-my-8 {
+  box-shadow: 0 2px 8px 0 rgba(166, 191, 217, .25);
+}
+
+.docs-rounded,
+.docs-bg-code-base {
+  background-color: #fff;
+}
+
+.docs-rounded .docs-p-4 {
+  border-bottom: 1px dashed #dbe6f0;
+}
+
+.docs-demo__snippets-nav.docs-tracking-tight {
+  background-color: #fff;
+  border-color: #dbe6f0;
+  border-style: dashed;
+}
+
 .docs-no-padding {
   padding: 0 !important; // to prevent blank spaces while rendering logic templates
 }
@@ -17,6 +69,29 @@
   color: #2c5cc5; // used in demos
 }
 
+button.docs-text-grey-lighter {
+  color: #12344d;
+  padding: 4px;
+  background: #edf2f7;
+
+  &:hover {
+    color: #fff;
+    background-color: #12344d;
+    border-radius: 2px;
+  }
+}
+
+button.docs-text-grey-dark {
+  color: #26587c;
+  padding: 4px;
+
+  &:hover {
+    color: #fff;
+    background-color: #12344d;
+    border-radius: 2px;
+  }
+}
+
 button,
 html [type=button],
 [type=reset],

packages/@nucleus/app/styles/doc/_custom-syntax-highlight.scss

@@ -1,102 +1,65 @@
 .hljs {
-  background: #12344d;
-  color: #cdd3d8;
   display: block;
-  font-family: "Fira Mono", monospace;
-  font-size: 1em;
   overflow-x: auto;
-  padding: 1em;
+  padding: .5em;
+  color: #383a42;
+  background: #fff;
 }
 
-.hljs > *::selection {
-  background-color: #3e4451;
-}
-
-.hljs-comment {
-  color: #656565;
+.hljs-comment,
+.hljs-quote {
+  color: #a0a1a7;
   font-style: italic;
 }
 
-.hljs-selector-tag {
-  color: #c792ea;
+.hljs-doctag,
+.hljs-keyword,
+.hljs-formula {
+  color: #a626a4;
 }
 
-.hljs-string,
+.hljs-section,
+.hljs-name,
+.hljs-selector-tag,
+.hljs-deletion,
 .hljs-subst {
-  color: #c3e88d;
-}
-
-.hljs-number,
-.hljs-regexp,
-.hljs-variable,
-.hljs-template-variable {
-  color: #f77669;
-}
-
-.hljs-keyword {
-  color: #c792ea;
-}
-
-.hljs-function > .hljs-title {
-  color: #75a5ff;
+  color: #e45649;
 }
 
-.hljs-tag {
-  color: #abb2bf;
+.hljs-literal {
+  color: #0184bb;
 }
 
-.hljs-name {
-  color: #e06c75;
+.hljs-string,
+.hljs-regexp,
+.hljs-addition,
+.hljs-attribute,
+.hljs-meta-string {
+  color: #50a14f;
 }
 
-.hljs-type {
-  color: #da4939;
+.hljs-built_in,
+.hljs-class .hljs-title {
+  color: #c18401;
 }
 
-.hljs-attribute {
-  color: #80cbbf;
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-type,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-number {
+  color: #986801;
 }
 
 .hljs-symbol,
 .hljs-bullet,
-.hljs-built_in,
-.hljs-builtin-name,
-.hljs-link {
-  color: #c792ea;
-}
-
-.hljs-params {
-  color: #eefff7;
-}
-
-.hljs-meta {
-  color: #75a5ff;
-}
-
-.hljs-section {
-  color: #ffc66d;
-}
-
-.hljs-addition {
-  background-color: #144212;
-  color: #e6e1dc;
-  display: inline-block;
-  width: 100%;
-}
-
-.hljs-deletion {
-  background-color: #600;
-  color: #e6e1dc;
-  display: inline-block;
-  width: 100%;
-}
-
-.hljs-selector-class {
-  color: #ffcb68;
-}
-
+.hljs-link,
+.hljs-meta,
 .hljs-selector-id {
-  color: #f77669;
+  color: #4078f2;
 }
 
 .hljs-emphasis {

packages/@nucleus/app/styles/nucleus-docs.scss

@@ -3,5 +3,5 @@
 
 /* ember-cli-addon customisations */
 @import "./doc/custom-addon-theme";
-// @import "./doc/custom-syntax-highlight";
+@import "./doc/custom-syntax-highlight";
 @import "./doc/nucleus-mod";

packages/@nucleus/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nucleus",
   "private": true,
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Umbrella package which holds the documentation",
   "keywords": [
     "ember-addon"
@@ -21,12 +21,12 @@
     "test:dev": "COVERAGE=TRUE ember test --server -launch=false"
   },
   "dependencies": {
-    "@freshworks/banner": "^0.3.0",
-    "@freshworks/button": "^0.3.0",
-    "@freshworks/icon": "^0.3.0",
-    "@freshworks/inline-banner": "^0.3.0",
-    "@freshworks/modal": "^0.3.0",
-    "@freshworks/toast-message": "^0.3.0",
+    "@freshworks/banner": "^0.5.0",
+    "@freshworks/button": "^0.5.0",
+    "@freshworks/icon": "^0.5.0",
+    "@freshworks/inline-banner": "^0.5.0",
+    "@freshworks/modal": "^0.5.0",
+    "@freshworks/toast-message": "^0.6.0",
     "ember-cli-autoprefixer": "^0.8.1",
     "ember-cli-babel": "^7.11.1",
     "ember-cli-htmlbars": "^4.0.0",

packages/@nucleus/tests/dummy/app/components/nucleus-inline-banner/demo-1.js

@@ -3,8 +3,8 @@ import Component from '@ember/component';
 
 export default Component.extend({
   actions: {
-    onClose(value) {
-      alert(value);
+    onClose() {
+      // Perform some action here
     }
   }
 });

packages/@nucleus/tests/dummy/app/components/nucleus-modal/demo-1.js

@@ -1,20 +1,21 @@
 // BEGIN-SNIPPET modal-component.js
 import Component from '@ember/component';
+import { inject } from '@ember/service';
 import RSVP from 'rsvp';
+import { get } from '@ember/object'
 
 export default Component.extend({
+  flashMessages: inject(),
   isModal1: false,
   actions: {
     onSubmit(value) {
       return new RSVP.Promise((resolve) => {
         let wait = setTimeout(() => {
           clearTimeout(wait);
+          get(this, 'flashMessages').success('Modal action complete.');
           resolve(value);
-        }, 1000)
+        }, 1000);
       });
-    },
-    onClose() {
-      alert('Modal closed');
     }
   }
 });