Skip to content

Commit

Permalink
Merge pull request #522 from storyblok/develop
Browse files Browse the repository at this point in the history
fix: update empty state size
  • Loading branch information
gustavomelki authored Mar 21, 2024
2 parents eb6e8d9 + 77c85a7 commit 672ddd7
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 4 deletions.
6 changes: 5 additions & 1 deletion src/assets/styles/mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,12 @@
}
}

@mixin transition($props) {
// TODO replace $base-transition with this mixin. $base-transition is using `all` which is:
// 1) is highly unperformant,
// 2) can cause unexpected transitions
@mixin transition($props...) {
transition-duration: 100ms;
transition-property: $props;
transition-timing-function: ease-in-out;
will-change: $props;
}
1 change: 0 additions & 1 deletion src/components/DataTable/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ const SbDataTable = {
this.deselectAll()
}
},

selectedRows(value) {
this.$emit('selected-rows', value)
},
Expand Down
1 change: 1 addition & 0 deletions src/components/EmptyState/empty.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
}

svg {
box-sizing: border-box;
width: 100%;
height: 100%;
}
Expand Down
2 changes: 2 additions & 0 deletions src/components/Icon/icon.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ $bg-colors: (

.sb-icon {
display: inline-block;
flex-shrink: 0;
vertical-align: middle;
user-select: none;

@include setIconSize($icon-default-size);
@include setIconColor(currentColor);
Expand Down
4 changes: 2 additions & 2 deletions src/components/Popover/SbPopover.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</template>

<script lang="ts">
import SbPortal from '../Portal'
import SbPortal from '../Portal/index.vue'
import { createPopper } from '@popperjs/core/lib/popper-lite'
import {
flip,
Expand Down Expand Up @@ -223,7 +223,7 @@ export default {
}
},
wrapClose(e) {
wrapClose(e: Event) {
const referenceIsString = typeof this.referenceEl === 'string'
const hasContains = typeof this.referenceEl?.contains === 'function'
const targetIsNode = e?.target instanceof Node
Expand Down
19 changes: 19 additions & 0 deletions src/lib/internal-icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@ const icons = {
</g>
`,
},
'status-small': {
viewBox: '0 0 24 24',
path: `
<g fill="none" fill-rule="evenodd">
<circle cx="12" cy="12" r="4" fill="currentColor"/>
</g>
`,
},
sync: {
viewBox: '0 0 24 24',
path: `
Expand Down Expand Up @@ -1043,6 +1051,17 @@ const fieldTypeIcons = {
</g>
`,
},
'fieldtype-references': {
viewBox: '0 0 24 24',
path: `
<rect width="24" height="24" rx="5" fill="#395ECE"/>
<path d="M10 12C10 9.79086 11.7909 8 14 8V11.9648C14 14.1797 12.2148 15.9806 10 16V12Z" fill="white"/>
<rect opacity="0.8" x="14" y="8" width="2" height="4" fill="white"/>
<rect opacity="0.8" x="8" y="12" width="2" height="4" fill="white"/>
<path d="M4 14L8 10L8 18L4 14Z" fill="white"/>
<path d="M20 10L16 14L16 6L20 10Z" fill="white"/>
`,
},
'fieldtype-richtext': {
viewBox: '0 0 24 24',
path: `
Expand Down

0 comments on commit 672ddd7

Please sign in to comment.