Skip to content

Commit 8e4fbc2

Browse files
woothuwoothu
committed
refactor: update icons to version 2, rtl fixes
1 parent 1df8c15 commit 8e4fbc2

File tree

6 files changed

+63
-31
lines changed

6 files changed

+63
-31
lines changed

‎package-lock.json

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"dependencies": {
2626
"@coreui/chartjs": "^2.0.0",
2727
"@coreui/coreui": "^3.2.0",
28-
"@coreui/icons": "^1.0.1",
29-
"@coreui/icons-react": "^1.0.0",
30-
"@coreui/react": "^3.0.0",
28+
"@coreui/icons": "2.0.0-beta.4",
29+
"@coreui/icons-react": "^1.0.1",
30+
"@coreui/react": "^3.0.1",
3131
"@coreui/react-chartjs": "^1.0.0",
3232
"@coreui/utils": "^1.3.1",
3333
"classnames": "^2.2.6",

‎src/assets/icons/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
cibTumblr,
1212
cibXing,
1313
cibGithub,
14-
cibStackOverflow,
14+
cibStackoverflow,
1515
cibYoutube,
1616
cibDribbble,
1717
cibInstagram,
@@ -242,7 +242,7 @@ export const icons = Object.assign({}, {
242242
cibTumblr,
243243
cibXing,
244244
cibGithub,
245-
cibStackOverflow,
245+
cibStackoverflow,
246246
cibYoutube,
247247
cibDribbble,
248248
cibInstagram,

‎src/containers/TheFooter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const TheFooter = () => {
88
<a href="https://coreui.io" target="_blank" rel="noopener noreferrer">CoreUI</a>
99
<span className="ml-1">&copy; 2020 creativeLabs.</span>
1010
</div>
11-
<div className="ml-auto">
11+
<div className="mfs-auto">
1212
<span className="mr-1">Powered by</span>
1313
<a href="https://coreui.io/react" target="_blank" rel="noopener noreferrer">CoreUI for React</a>
1414
</div>

‎src/containers/TheHeaderDropdown.js

+41-9
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,26 @@ const TheHeaderDropdown = () => {
3434
>
3535
<strong>Account</strong>
3636
</CDropdownItem>
37-
<CDropdownItem><CIcon name="cil-bell" className="mr-2" /> Updates<CBadge color="info" className="ml-auto">42</CBadge></CDropdownItem>
38-
<CDropdownItem><CIcon name="cil-envelope-open" className="mr-2" /> Messages<CBadge color="success" className="ml-auto">42</CBadge></CDropdownItem>
39-
<CDropdownItem><CIcon name="cil-task" className="mr-2" /> Tasks<CBadge color="danger" className="ml-auto">42</CBadge></CDropdownItem>
40-
<CDropdownItem><CIcon name="cil-comment-square" className="mr-2" /> Comments<CBadge color="warning" className="ml-auto">42</CBadge></CDropdownItem>
37+
<CDropdownItem>
38+
<CIcon name="cil-bell" className="mfe-2" />
39+
Updates
40+
<CBadge color="info" className="mfs-auto">42</CBadge>
41+
</CDropdownItem>
42+
<CDropdownItem>
43+
<CIcon name="cil-envelope-open" className="mfe-2" />
44+
Messages
45+
<CBadge color="success" className="mfs-auto">42</CBadge>
46+
</CDropdownItem>
47+
<CDropdownItem>
48+
<CIcon name="cil-task" className="mfe-2" />
49+
Tasks
50+
<CBadge color="danger" className="mfs-auto">42</CBadge>
51+
</CDropdownItem>
52+
<CDropdownItem>
53+
<CIcon name="cil-comment-square" className="mfe-2" />
54+
Comments
55+
<CBadge color="warning" className="mfs-auto">42</CBadge>
56+
</CDropdownItem>
4157
<CDropdownItem
4258
header
4359
tag="div"
@@ -46,12 +62,28 @@ const TheHeaderDropdown = () => {
4662
>
4763
<strong>Settings</strong>
4864
</CDropdownItem>
49-
<CDropdownItem><CIcon name="cil-user" className="mr-2" /> Profile</CDropdownItem>
50-
<CDropdownItem><CIcon name="cil-settings" className="mr-2" /> Settings</CDropdownItem>
51-
<CDropdownItem><CIcon name="cil-credit-card" className="mr-2" /> Payments<CBadge color="secondary" className="ml-auto">42</CBadge></CDropdownItem>
52-
<CDropdownItem><CIcon name="cil-file" className="mr-2" /> Projects<CBadge color="primary" className="ml-auto">42</CBadge></CDropdownItem>
65+
<CDropdownItem>
66+
<CIcon name="cil-user" className="mfe-2" />Profile
67+
</CDropdownItem>
68+
<CDropdownItem>
69+
<CIcon name="cil-settings" className="mfe-2" />
70+
Settings
71+
</CDropdownItem>
72+
<CDropdownItem>
73+
<CIcon name="cil-credit-card" className="mfe-2" />
74+
Payments
75+
<CBadge color="secondary" className="mfs-auto">42</CBadge>
76+
</CDropdownItem>
77+
<CDropdownItem>
78+
<CIcon name="cil-file" className="mfe-2" />
79+
Projects
80+
<CBadge color="primary" className="mfs-auto">42</CBadge>
81+
</CDropdownItem>
5382
<CDropdownItem divider />
54-
<CDropdownItem><CIcon name="cil-lock-locked" className="mr-2" /> Lock Account</CDropdownItem>
83+
<CDropdownItem>
84+
<CIcon name="cil-lock-locked" className="mfe-2" />
85+
Lock Account
86+
</CDropdownItem>
5587
</CDropdownMenu>
5688
</CDropdown>
5789
)

‎src/views/buttons/brand-buttons/BrandButtons.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const BrandButtons = () => {
2929
<CButton size="sm" className="btn-tumblr btn-brand mr-1 mb-1"><CIcon name="cib-tumblr" /><span>Tumblr</span></CButton>
3030
<CButton size="sm" className="btn-xing btn-brand mr-1 mb-1"><CIcon name="cib-xing" /><span>Xing</span></CButton>
3131
<CButton size="sm" className="btn-github btn-brand mr-1 mb-1"><CIcon name="cib-github" /><span>Github</span></CButton>
32-
<CButton size="sm" className="btn-stack-overflow btn-brand mr-1 mb-1"><CIcon name="cib-stack-overflow" /><span>StackOverflow</span></CButton>
32+
<CButton size="sm" className="btn-stack-overflow btn-brand mr-1 mb-1"><CIcon name="cib-stackoverflow" /><span>StackOverflow</span></CButton>
3333
<CButton size="sm" className="btn-youtube btn-brand mr-1 mb-1"><CIcon name="cib-youtube" /><span>YouTube</span></CButton>
3434
<CButton size="sm" className="btn-dribbble btn-brand mr-1 mb-1"><CIcon name="cib-dribbble" /><span>Dribbble</span></CButton>
3535
<CButton size="sm" className="btn-instagram btn-brand mr-1 mb-1"><CIcon name="cib-instagram" /><span>Instagram</span></CButton>
@@ -49,7 +49,7 @@ const BrandButtons = () => {
4949
<CButton className="btn-tumblr btn-brand mr-1 mb-1"><CIcon name="cib-tumblr" /><span>Tumblr</span></CButton>
5050
<CButton className="btn-xing btn-brand mr-1 mb-1"><CIcon name="cib-xing" /><span>Xing</span></CButton>
5151
<CButton className="btn-github btn-brand mr-1 mb-1"><CIcon name="cib-github" /><span>Github</span></CButton>
52-
<CButton className="btn-stack-overflow btn-brand mr-1 mb-1"><CIcon name="cib-stack-overflow" /><span>StackOverflow</span></CButton>
52+
<CButton className="btn-stack-overflow btn-brand mr-1 mb-1"><CIcon name="cib-stackoverflow" /><span>StackOverflow</span></CButton>
5353
<CButton className="btn-youtube btn-brand mr-1 mb-1"><CIcon name="cib-youtube" /><span>YouTube</span></CButton>
5454
<CButton className="btn-dribbble btn-brand mr-1 mb-1"><CIcon name="cib-dribbble" /><span>Dribbble</span></CButton>
5555
<CButton className="btn-instagram btn-brand mr-1 mb-1"><CIcon name="cib-instagram" /><span>Instagram</span></CButton>
@@ -71,7 +71,7 @@ const BrandButtons = () => {
7171
<CButton size="lg" className="btn-tumblr btn-brand mr-1 mb-1"><CIcon name="cib-tumblr" /><span>Tumblr</span></CButton>
7272
<CButton size="lg" className="btn-xing btn-brand mr-1 mb-1"><CIcon name="cib-xing" /><span>Xing</span></CButton>
7373
<CButton size="lg" className="btn-github btn-brand mr-1 mb-1"><CIcon name="cib-github" /><span>Github</span></CButton>
74-
<CButton size="lg" className="btn-stack-overflow btn-brand mr-1 mb-1"><CIcon name="cib-stack-overflow" /><span>StackOverflow</span></CButton>
74+
<CButton size="lg" className="btn-stack-overflow btn-brand mr-1 mb-1"><CIcon name="cib-stackoverflow" /><span>StackOverflow</span></CButton>
7575
<CButton size="lg" className="btn-youtube btn-brand mr-1 mb-1"><CIcon name="cib-youtube" /><span>YouTube</span></CButton>
7676
<CButton size="lg" className="btn-dribbble btn-brand mr-1 mb-1"><CIcon name="cib-dribbble" /><span>Dribbble</span></CButton>
7777
<CButton size="lg" className="btn-instagram btn-brand mr-1 mb-1"><CIcon name="cib-instagram" /><span>Instagram</span></CButton>
@@ -104,7 +104,7 @@ const BrandButtons = () => {
104104
<CButton size="sm" className="btn-tumblr btn-brand mr-1 mb-1"><CIcon name="cib-tumblr" /></CButton>
105105
<CButton size="sm" className="btn-xing btn-brand mr-1 mb-1"><CIcon name="cib-xing" /></CButton>
106106
<CButton size="sm" className="btn-github btn-brand mr-1 mb-1"><CIcon name="cib-github" /></CButton>
107-
<CButton size="sm" className="btn-stack-overflow btn-brand mr-1 mb-1"><CIcon name="cib-stack-overflow" /></CButton>
107+
<CButton size="sm" className="btn-stack-overflow btn-brand mr-1 mb-1"><CIcon name="cib-stackoverflow" /></CButton>
108108
<CButton size="sm" className="btn-youtube btn-brand mr-1 mb-1"><CIcon name="cib-youtube" /></CButton>
109109
<CButton size="sm" className="btn-dribbble btn-brand mr-1 mb-1"><CIcon name="cib-dribbble" /></CButton>
110110
<CButton size="sm" className="btn-instagram btn-brand mr-1 mb-1"><CIcon name="cib-instagram" /></CButton>
@@ -124,7 +124,7 @@ const BrandButtons = () => {
124124
<CButton className="btn-tumblr btn-brand mr-1 mb-1"><CIcon name="cib-tumblr" /></CButton>
125125
<CButton className="btn-xing btn-brand mr-1 mb-1"><CIcon name="cib-xing" /></CButton>
126126
<CButton className="btn-github btn-brand mr-1 mb-1"><CIcon name="cib-github" /></CButton>
127-
<CButton className="btn-stack-overflow btn-brand mr-1 mb-1"><CIcon name="cib-stack-overflow" /></CButton>
127+
<CButton className="btn-stack-overflow btn-brand mr-1 mb-1"><CIcon name="cib-stackoverflow" /></CButton>
128128
<CButton className="btn-youtube btn-brand mr-1 mb-1"><CIcon name="cib-youtube" /></CButton>
129129
<CButton className="btn-dribbble btn-brand mr-1 mb-1"><CIcon name="cib-dribbble" /></CButton>
130130
<CButton className="btn-instagram btn-brand mr-1 mb-1"><CIcon name="cib-instagram" /></CButton>
@@ -146,7 +146,7 @@ const BrandButtons = () => {
146146
<CButton size="lg" className="btn-tumblr btn-brand mr-1 mb-1"><CIcon name="cib-tumblr" /></CButton>
147147
<CButton size="lg" className="btn-xing btn-brand mr-1 mb-1"><CIcon name="cib-xing" /></CButton>
148148
<CButton size="lg" className="btn-github btn-brand mr-1 mb-1"><CIcon name="cib-github" /></CButton>
149-
<CButton size="lg" className="btn-stack-overflow btn-brand mr-1 mb-1"><CIcon name="cib-stack-overflow" /></CButton>
149+
<CButton size="lg" className="btn-stack-overflow btn-brand mr-1 mb-1"><CIcon name="cib-stackoverflow" /></CButton>
150150
<CButton size="lg" className="btn-youtube btn-brand mr-1 mb-1"><CIcon name="cib-youtube" /></CButton>
151151
<CButton size="lg" className="btn-dribbble btn-brand mr-1 mb-1"><CIcon name="cib-dribbble" /></CButton>
152152
<CButton size="lg" className="btn-instagram btn-brand mr-1 mb-1"><CIcon name="cib-instagram" /></CButton>

0 commit comments

Comments
 (0)