Merge pull request #410 from vtex/feature/button-danger-tertiary

Add "danger tertiary" Button variation
vtex · Nov 14, 2018 · d4801ce · d4801ce
2 parents 0f4f21e + 8c146b2
commit d4801ce
Show file tree

Hide file tree

Showing 8 changed files with 1,599 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [7.6.2] - 2018-11-14
+
+## [7.6.1] - 2018-11-14
+
+### Added
+
+- **Button** Add "danger tertiary" Button variation
+
 ## [7.6.0] - 2018-11-09
 
 ### Added

diff --git a/_releasy.json b/_releasy.json
@@ -1,4 +1,4 @@
 {
-"notes": true,
-"npm": true,
+  "notes": true,
+  "npm": true
 }
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "vendor": "vtex",
   "name": "styleguide",
-  "version": "7.6.0",
+  "version": "7.6.2",
   "title": "VTEX Styleguide",
   "description": "The VTEX Styleguide components for the Render framework",
   "builders": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vtex/styleguide",
-  "version": "7.6.0",
+  "version": "7.6.2",
   "scripts": {
     "test": "react-scripts test --env=jsdom",
     "test:codemod": "jest codemod",
@@ -63,7 +63,7 @@
     "react-docgen-displayname-handler": "^2.1.1",
     "react-responsive-modal": "^2.0.1",
     "react-virtualized": "^9.19.1",
-    "vtex-tachyons": "^2.7.0"
+    "vtex-tachyons": "^2.8.4"
   },
   "husky": {
     "hooks": {

diff --git a/react/components/Button/README.md b/react/components/Button/README.md
@@ -26,6 +26,9 @@ Types
     <span className="mr4">
       <Button variation="danger">Danger</Button>
     </span>
+    <span className="mr4">
+      <Button variation="danger-tertiary">Danger Tertiary</Button>
+    </span>
   </div>
   <div className="mt4">
     <span className="mr4">
@@ -40,6 +43,9 @@ Types
     <span className="mr4">
       <Button variation="danger" disabled>Danger</Button>
     </span>
+    <span className="mr4">
+      <Button variation="danger-tertiary" disabled>Danger Tertiary</Button>
+    </span>
   </div>
 </div>
 ```
@@ -116,6 +122,23 @@ Sizes
       </Button>
     </span>
   </div>
+  <div className="mb4">
+    <span className="mr4">
+      <Button variation="danger-tertiary" size="small">
+        Small
+      </Button>
+    </span>
+    <span className="mr4">
+      <Button variation="danger-tertiary" size="regular">
+        Default
+      </Button>
+    </span>
+    <span className="mr4">
+      <Button variation="danger-tertiary" size="large">
+        Large
+      </Button>
+    </span>
+  </div>
 </div>
 ```
 

diff --git a/react/components/Button/index.js b/react/components/Button/index.js
@@ -79,6 +79,15 @@ class Button extends Component {
         }
         break
       }
+      case 'danger-tertiary': {
+        if (disabled) {
+          classes += 'bg-transparent b--transparent c-disabled '
+        } else {
+          classes +=
+            'bg-transparent b--transparent c-danger hover-b--transparent hover-c-danger '
+        }
+        break
+      }
     }
 
     if (!disabled) {

diff --git a/react/package.json b/react/package.json
@@ -2,7 +2,7 @@
   "name": "vtex.styleguide",
   "dependencies": {
     "react-responsive-modal": "^2.0.1",
-    "vtex-tachyons": "^2.3.0",
+    "vtex-tachyons": "^2.8.4",
     "react-virtualized": "^9.19.1"
   }
 }