Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(vicon.ts): svg size didn't match default icon size #10507

Merged
merged 24 commits into from
Feb 13, 2020
Merged

fix(vicon.ts): svg size didn't match default icon size #10507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ca68533
fix(vicon.ts): svg size didn't match default icon size
epicpants64 Feb 7, 2020
e4f28f4
fix(vchip_variables.scss): update default to match other icons
epicpants64 Feb 7, 2020
e10c74f
Merge branch 'master' of github.com:vuetifyjs/vuetify into fix/svgSizing
epicpants64 Feb 10, 2020
dbcf517
fix conditional
epicpants64 Feb 10, 2020
46745b7
take out iconfont in index
epicpants64 Feb 10, 2020
5be75f3
take out console logs
epicpants64 Feb 10, 2020
5b122fe
add to vchip test
epicpants64 Feb 10, 2020
7326117
updating vIcon test
epicpants64 Feb 10, 2020
ef3ff9e
take out change to vchip test
epicpants64 Feb 10, 2020
86bf80b
fix(vicon.ts): svg size didn't match default icon size
epicpants64 Feb 7, 2020
281d686
fix(vchip_variables.scss): update default to match other icons
epicpants64 Feb 7, 2020
55bbcbc
fix conditional
epicpants64 Feb 10, 2020
2277486
take out iconfont in index
epicpants64 Feb 10, 2020
99a815c
take out console logs
epicpants64 Feb 10, 2020
4bae7a8
add to vchip test
epicpants64 Feb 10, 2020
0937436
updating vIcon test
epicpants64 Feb 10, 2020
4a5152c
take out change to vchip test
epicpants64 Feb 10, 2020
f9806be
removed test 3 due to not using it
epicpants64 Feb 10, 2020
7c0c42b
take out unnecessary test from snap and test
epicpants64 Feb 10, 2020
b850834
change to size 18 in props instead of attrs
epicpants64 Feb 11, 2020
872b3eb
take out console log and extra spaces and update to master
epicpants64 Feb 12, 2020
93c0818
missed one space
epicpants64 Feb 12, 2020
63f8d56
Merge branch 'master' into fix/svgSizing
rachael-smith Feb 12, 2020
a4925ae
Merge branch 'master' into fix/svgSizing
rachael-smith Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/vuetify/src/components/VChip/VChip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ export default mixins(
staticClass: 'v-chip__close',
props: {
right: true,
size: 18,
},
on: {
click: (e: Event) => {
Expand Down
1 change: 1 addition & 0 deletions packages/vuetify/src/components/VChip/__tests__/__snapshots__/VChip.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ exports[`VChip.ts should be removable 1`] = `
<span class="v-chip__content">
<button type="button"
class="v-icon notranslate v-chip__close v-icon--link v-icon--right material-icons theme--light"
style="font-size: 18px;"
>
$delete
</button>
Expand Down
4 changes: 2 additions & 2 deletions packages/vuetify/src/components/VIcon/VIcon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ const VIcon = mixins(
attrs: {
xmlns: 'http://www.w3.org/2000/svg',
viewBox: '0 0 24 24',
height: fontSize || '32',
width: fontSize || '32',
height: fontSize || '24',
width: fontSize || '24',
role: 'img',
'aria-hidden': true,
},
Expand Down
4 changes: 2 additions & 2 deletions packages/vuetify/src/components/VIcon/__tests__/__snapshots__/VIcon.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ exports[`VIcon for component icon should render an svg icon 1`] = `
>
<svg xmlns="http://www.w3.org/2000/svg"
viewbox="0 0 24 24"
height="32"
width="32"
height="24"
width="24"
role="img"
aria-hidden="true"
>
Expand Down