Merge pull request #429 from ConsenSys/development

merge v0.11.1 release

README.md

@@ -35,8 +35,16 @@ class Example extends Component {
 
 ## Change log
 
+### 0.11.1
+
+🐛 Bug Fix
+- Fixed icon background color on `ToastMessage` component. #381
+- fixed display prop not rendering correctly for `Icon` component. #380
+- fixed disabled styling for `Slider` component. #414
+
+
 ### 0.11.0
- 
+
 🚀 New Feature
 - Added `BaseStyles` component
 

demo/src/App.js

@@ -55,6 +55,28 @@ const selectOptions = [
 
 const testComponents = props => (
   <React.Fragment>
+
+    <h1>H1 - Quick zephyrs blow, vexing daft Jim.</h1>
+    <h2>H1 - Quick zephyrs blow, vexing daft Jim.</h2>
+    <h3>H1 - Quick zephyrs blow, vexing daft Jim.</h3>
+    <h4>H1 - Quick zephyrs blow, vexing daft Jim.</h4>
+    <h5>H1 - Quick zephyrs blow, vexing daft Jim.</h5>
+    <h6>H1 - Quick zephyrs blow, vexing daft Jim.</h6>
+
+    <Heading as={'h1'}>H1 - Quick zephyrs blow, vexing daft Jim.</Heading>
+    <Heading as={'h2'}>H2 - Quick zephyrs blow, vexing daft Jim.</Heading>
+    <Heading as={'h3'}>H3 - Quick zephyrs blow, vexing daft Jim.</Heading>
+    <Heading as={'h4'}>H4 - Quick zephyrs blow, vexing daft Jim.</Heading>
+    <Heading as={'h5'}>H5 - Quick zephyrs blow, vexing daft Jim.</Heading>
+    <Heading as={'h6'}>H6 - Quick zephyrs blow, vexing daft Jim.</Heading>
+
+    <Heading as={'h1'} fontSize={1}>H1 - Quick zephyrs blow, vexing daft Jim.</Heading>
+    <Heading as={'h2'} fontSize={2}>H2 - Quick zephyrs blow, vexing daft Jim.</Heading>
+    <Heading as={'h3'} fontSize={3}>H3 - Quick zephyrs blow, vexing daft Jim.</Heading>
+    <Heading as={'h4'} fontSize={4}>H4 - Quick zephyrs blow, vexing daft Jim.</Heading>
+    <Heading as={'h5'} fontSize={5}>H5 - Quick zephyrs blow, vexing daft Jim.</Heading>
+    <Heading as={'h6'} fontSize={6}>H6 - Quick zephyrs blow, vexing daft Jim.</Heading>
+
     <Heading fontSize={7}>XL - Quick zephyrs blow, vexing daft Jim.</Heading>
 
     <Heading as={'h1'} fontSize={6}>H1 - Quick zephyrs blow, vexing daft Jim.</Heading>
@@ -126,6 +148,7 @@ const testComponents = props => (
     <Avatar size="large" />
     <Textarea rows={4} defaultValue="Type here…" />
     <Slider />
+    <Slider disabled />
     <Select>
       <optgroup label="4-legged pets">
         <option value="dog">Dog</option>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rimble-ui",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Rimble Design System react component library.",
   "author": "ConsenSys Design",
   "homepage": "https://rimble.consensys.design/",

src/Button/__snapshots__/Button.test.js.snap

@@ -1,6 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Button Icon component sanity matches default snapshot 1`] = `
+.c1 {
+  display: -webkit-inline-box;
+  display: -webkit-inline-flex;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+}
+
+.c1 {
+  box-sizing: border-box;
+}
+
 .c0 {
   color: #fff;
   background-color: #999;
@@ -142,11 +153,11 @@ exports[`Button Icon component sanity matches default snapshot 1`] = `
   height="3rem"
 >
   <div
-    class=""
+    class="c1"
+    display="inline-flex"
   >
     <svg
       class=""
-      display="block"
       fill="currentcolor"
       height="24px"
       viewBox="0 0 24 24"
@@ -161,6 +172,17 @@ exports[`Button Icon component sanity matches default snapshot 1`] = `
 `;
 
 exports[`Button Icon component sanity matches themed snapshot 1`] = `
+.c1 {
+  display: -webkit-inline-box;
+  display: -webkit-inline-flex;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+}
+
+.c1 {
+  box-sizing: border-box;
+}
+
 .c0 {
   color: #fff;
   background-color: #999;
@@ -302,11 +324,11 @@ exports[`Button Icon component sanity matches themed snapshot 1`] = `
   height="3rem"
 >
   <div
-    class=""
+    class="c1"
+    display="inline-flex"
   >
     <svg
       class=""
-      display="block"
       fill="currentcolor"
       height="24px"
       viewBox="0 0 24 24"
@@ -321,6 +343,17 @@ exports[`Button Icon component sanity matches themed snapshot 1`] = `
 `;
 
 exports[`Button Icon only component sanity matches default snapshot 1`] = `
+.c1 {
+  display: -webkit-inline-box;
+  display: -webkit-inline-flex;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+}
+
+.c1 {
+  box-sizing: border-box;
+}
+
 .c0 {
   color: #fff;
   background-color: #999;
@@ -463,11 +496,11 @@ exports[`Button Icon only component sanity matches default snapshot 1`] = `
   height="3rem"
 >
   <div
-    class=""
+    class="c1"
+    display="inline-flex"
   >
     <svg
       class=""
-      display="block"
       fill="currentcolor"
       height="24px"
       viewBox="0 0 24 24"
@@ -482,6 +515,17 @@ exports[`Button Icon only component sanity matches default snapshot 1`] = `
 `;
 
 exports[`Button Icon with position prop component sanity matches default snapshot 1`] = `
+.c1 {
+  display: -webkit-inline-box;
+  display: -webkit-inline-flex;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+}
+
+.c1 {
+  box-sizing: border-box;
+}
+
 .c0 {
   color: #fff;
   background-color: #999;
@@ -623,11 +667,11 @@ exports[`Button Icon with position prop component sanity matches default snapsho
   height="3rem"
 >
   <div
-    class=""
+    class="c1"
+    display="inline-flex"
   >
     <svg
       class=""
-      display="block"
       fill="currentcolor"
       height="24px"
       viewBox="0 0 24 24"
@@ -2996,6 +3040,17 @@ exports[`Loading Button component sanity matches default snapshot 1`] = `
 `;
 
 exports[`Loading Button component sanity matches default snapshot 2`] = `
+.c1 {
+  display: -webkit-inline-box;
+  display: -webkit-inline-flex;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+}
+
+.c1 {
+  box-sizing: border-box;
+}
+
 .c0 {
   color: #fff;
   background-color: #999;
@@ -3138,11 +3193,11 @@ exports[`Loading Button component sanity matches default snapshot 2`] = `
   height="3rem"
 >
   <div
-    class=""
+    class="c1"
+    display="inline-flex"
   >
     <svg
       class=""
-      display="block"
       fill="currentcolor"
       height="24px"
       viewBox="0 0 24 24"