Merge remote-tracking branch 'origin/master' into icons-refactoring

# Conflicts: # packages/desktop/src/logo-block-link/LogoBlockLink.md
qiwi · Aug 23, 2019 · 2a878e9 · 2a878e9
2 parents b672730 + edbaa7b
commit 2a878e9
Show file tree

Hide file tree

Showing 19 changed files with 1,482 additions and 43 deletions.
diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md
@@ -1,3 +1,24 @@
+# [@qiwi/pijma-desktop-v1.69.1](https://github.com/qiwi/pijma/compare/v1.69.0...v1.69.1) (2019-08-22)
+
+
+### Bug Fixes
+
+* **desktop:** logo block link ([3f9040e](https://github.com/qiwi/pijma/commit/3f9040e))
+
+# [@qiwi/pijma-desktop-v1.69.0](https://github.com/qiwi/pijma/compare/v1.68.0...v1.69.0) (2019-08-22)
+
+
+### Features
+
+* logo block link improvements ([6006c08](https://github.com/qiwi/pijma/commit/6006c08))
+
+# [@qiwi/pijma-desktop-v1.68.0](https://github.com/qiwi/pijma/compare/v1.67.0...v1.68.0) (2019-08-20)
+
+
+### Features
+
+* logo link ([94d01e6](https://github.com/qiwi/pijma/commit/94d01e6))
+
 # [@qiwi/pijma-desktop-v1.67.0](https://github.com/qiwi/pijma/compare/v1.66.1...v1.67.0) (2019-08-16)
 
 

diff --git a/packages/desktop/package.json b/packages/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@qiwi/pijma-desktop",
-  "version": "1.67.0",
+  "version": "1.69.1",
   "main": "lib/es5/index.js",
   "types": "lib/es5/index.d.ts",
   "license": "MIT",

diff --git a/packages/desktop/src/button/Button.tsx b/packages/desktop/src/button/Button.tsx
@@ -230,6 +230,7 @@ export const Button: FunctionComponent<ButtonProps> = (props) => (
                           transition="all 300ms cubic-bezier(0.4, 0.0, 0.2, 1)"
                           children={React.cloneElement(props.icon, {
                             color: props.disabled ? '#666' : props.kind === 'brand' ? '#fff' : '#000',
+                            size: 1,
                           })}
                         />
                       ) : (

diff --git a/packages/desktop/src/index.ts b/packages/desktop/src/index.ts
@@ -19,6 +19,7 @@ export * from './pagination'
 export * from './header-menu'
 export * from './header'
 export * from './status'
+export * from './logo-link'
 
 export {TextField as MaskTextField} from './text-field'
 export {PasswordField as MaskPasswordField} from './password-field'