From 8e4fbc2aa8786b00a004282260c52986e1cd2430 Mon Sep 17 00:00:00 2001 From: woothu <32914662+woothu@users.noreply.github.com> Date: Mon, 8 Jun 2020 13:58:51 +0200 Subject: [PATCH] refactor: update icons to version 2, rtl fixes --- package-lock.json | 20 ++++---- package.json | 6 +-- src/assets/icons/index.js | 4 +- src/containers/TheFooter.js | 2 +- src/containers/TheHeaderDropdown.js | 50 +++++++++++++++---- .../buttons/brand-buttons/BrandButtons.js | 12 ++--- 6 files changed, 63 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index a4726eb..9e0eda7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1199,26 +1199,26 @@ "integrity": "sha512-/phj0z2DhbJ955bVCjoRbGG0qt0KdjUAG6erdLF14FPV410QbaW3J4PIe9kAZUz86CJ/lXUMzKSYYR3gr7dOAQ==" }, "@coreui/icons": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@coreui/icons/-/icons-1.0.1.tgz", - "integrity": "sha512-DAlvdHRC+HHecdy52vskbNzNKEpu6wHDvSlsHGrwOqNxQl1YLhGEtqAW4sKpyVE3GgysNCywUWZGFlLp8I3LgA==" + "version": "2.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@coreui/icons/-/icons-2.0.0-beta.4.tgz", + "integrity": "sha512-4BDmZYqcfGgoLRFgqJaOSsypoFykq8jFAmOHy9lyn2PB4lwrdAAuOMLLe6gjm6QFxZJLPXHcPRYZeEz7vsV4VQ==" }, "@coreui/icons-react": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@coreui/icons-react/-/icons-react-1.0.0.tgz", - "integrity": "sha512-rcd/Ezld2Eb8aBdzZ/mv+0lNZ5V0h5bp5ccxuF2jKsw/V77BXH6HP+8uxFwTDNODBovyD5vKNcSjPDk2xyhtqQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@coreui/icons-react/-/icons-react-1.0.1.tgz", + "integrity": "sha512-oEEey/BUoT8KMx5K2TDgCDvjv0/QzNzFAiNSokSomPvY4u1dymXK0H+8X4KOa4fv17DUfE4aQ0W6pa+SyTLN9Q==", "requires": { "classnames": "^2.2.6", "prop-types": "^15.7.2" } }, "@coreui/react": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@coreui/react/-/react-3.0.0.tgz", - "integrity": "sha512-5VwE8qL+6Jn86HFj+FpnPfD5RcjAEgkK7nXl91hwZhvlWV5zkKRPvaoKYM/nXxSDG6tqU6NSjkFLM87vrQqOXw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@coreui/react/-/react-3.0.1.tgz", + "integrity": "sha512-ckqTBvaRLZVsjV5ncE2Mz8SDxa4+iiBCm/uCbsmuQL2PMhgzofKmS4i52WWTTtkc//OQJ8ahBZRbKCFiOmW4VQ==", "requires": { "@coreui/icons": "2.0.0-beta.3", - "@coreui/icons-react": "^1.0.0", + "@coreui/icons-react": "^1.0.1", "@coreui/utils": "~1.3.1", "@popperjs/core": "~2.4.0", "classnames": "~2.2.6", diff --git a/package.json b/package.json index 74444c0..2c72b92 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ "dependencies": { "@coreui/chartjs": "^2.0.0", "@coreui/coreui": "^3.2.0", - "@coreui/icons": "^1.0.1", - "@coreui/icons-react": "^1.0.0", - "@coreui/react": "^3.0.0", + "@coreui/icons": "2.0.0-beta.4", + "@coreui/icons-react": "^1.0.1", + "@coreui/react": "^3.0.1", "@coreui/react-chartjs": "^1.0.0", "@coreui/utils": "^1.3.1", "classnames": "^2.2.6", diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index b268b23..8b016f5 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -11,7 +11,7 @@ import { cibTumblr, cibXing, cibGithub, - cibStackOverflow, + cibStackoverflow, cibYoutube, cibDribbble, cibInstagram, @@ -242,7 +242,7 @@ export const icons = Object.assign({}, { cibTumblr, cibXing, cibGithub, - cibStackOverflow, + cibStackoverflow, cibYoutube, cibDribbble, cibInstagram, diff --git a/src/containers/TheFooter.js b/src/containers/TheFooter.js index 0ea2e21..b7fb4ef 100644 --- a/src/containers/TheFooter.js +++ b/src/containers/TheFooter.js @@ -8,7 +8,7 @@ const TheFooter = () => { CoreUI © 2020 creativeLabs. -
+
Powered by CoreUI for React
diff --git a/src/containers/TheHeaderDropdown.js b/src/containers/TheHeaderDropdown.js index 7905080..3527f11 100644 --- a/src/containers/TheHeaderDropdown.js +++ b/src/containers/TheHeaderDropdown.js @@ -34,10 +34,26 @@ const TheHeaderDropdown = () => { > Account - Updates42 - Messages42 - Tasks42 - Comments42 + + + Updates + 42 + + + + Messages + 42 + + + + Tasks + 42 + + + + Comments + 42 + { > Settings - Profile - Settings - Payments42 - Projects42 + + Profile + + + + Settings + + + + Payments + 42 + + + + Projects + 42 + - Lock Account + + + Lock Account + ) diff --git a/src/views/buttons/brand-buttons/BrandButtons.js b/src/views/buttons/brand-buttons/BrandButtons.js index 58327d5..0805822 100644 --- a/src/views/buttons/brand-buttons/BrandButtons.js +++ b/src/views/buttons/brand-buttons/BrandButtons.js @@ -29,7 +29,7 @@ const BrandButtons = () => { Tumblr Xing Github - StackOverflow + StackOverflow YouTube Dribbble Instagram @@ -49,7 +49,7 @@ const BrandButtons = () => { Tumblr Xing Github - StackOverflow + StackOverflow YouTube Dribbble Instagram @@ -71,7 +71,7 @@ const BrandButtons = () => { Tumblr Xing Github - StackOverflow + StackOverflow YouTube Dribbble Instagram @@ -104,7 +104,7 @@ const BrandButtons = () => { - + @@ -124,7 +124,7 @@ const BrandButtons = () => { - + @@ -146,7 +146,7 @@ const BrandButtons = () => { - +