diff --git a/package.json b/package.json index 4e95f040..6624b9c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.30", + "version": "1.0.32", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/stories/SImage.stories.ts b/src/stories/SImage.stories.ts index 3150d3d9..06d1f05c 100644 --- a/src/stories/SImage.stories.ts +++ b/src/stories/SImage.stories.ts @@ -1,4 +1,4 @@ -import { text, boolean, number, select, withKnobs } from '@storybook/addon-knobs' +import { text, boolean, number, select, withKnobs, array } from '@storybook/addon-knobs' import { SImage, ImageFit } from '../components/Image' @@ -16,6 +16,7 @@ export const configurable = () => ({ :fit="fit" :alt="alt" :lazy="lazy" + :src-list="srcList" :z-index="zIndex" :has-skeleton="hasSkeleton" :animated="animated" @@ -42,6 +43,9 @@ export const configurable = () => ({ }, animated: { default: boolean('Skeleton has Animation', true) + }, + srcList: { + default: array('Src List', ['https://picsum.photos/1024', 'https://picsum.photos/1024/300']) } } }) diff --git a/src/styles/common.scss b/src/styles/common.scss index c42f2bc0..a2693664 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -251,6 +251,14 @@ button > span { } } +@mixin use-blur { + background-color: var(--s-color-utility-overlay); + opacity: 0.75; + backdrop-filter: blur(4px); + // TODO: Fix FF behaviour + filter: blur(4px); +} + .el-message-box { background-color: var(--s-color-base-on-accent); border-radius: var(--s-border-radius-small); diff --git a/src/styles/neumorphism/dialog.scss b/src/styles/neumorphism/dialog.scss index 48bd27b2..5f690617 100644 --- a/src/styles/neumorphism/dialog.scss +++ b/src/styles/neumorphism/dialog.scss @@ -4,8 +4,5 @@ } } [design-system="neumorphic"] .v-modal { - opacity: 0.75; - backdrop-filter: blur(4px); - // TODO: Fix FF behaviour - filter: blur(4px); + @include use-blur; } diff --git a/src/styles/neumorphism/image.scss b/src/styles/neumorphism/image.scss new file mode 100644 index 00000000..bbcfb669 --- /dev/null +++ b/src/styles/neumorphism/image.scss @@ -0,0 +1,53 @@ +[design-system="neumorphic"] { + $class: '.el-image-viewer'; + + #{$class}__mask { + @include use-blur; + } + #{$class}__btn { + &#{$class} { + &__close, &__next, &__prev, &__actions { + background: var(--s-color-utility-body); + border-color: transparent; + border-style: solid; + border-width: 0; + color: var(--s-color-base-content-tertiary); + transition: opacity .3s; + &:hover { + opacity: 1; + } + } + &__close, &__next, &__prev { + &:hover { + background: var(--s-color-utility-body); + border-color: transparent; + color: var(--s-color-base-content-secondary); + } + } + &__actions { + cursor: default; + } + } + #{$class}__actions__inner { + color: inherit; + .el-icon { + &-zoom-in, + &-zoom-out, + &-full-screen, + &-refresh-left, + &-refresh-right, + &-c-scale-to-original { + cursor: pointer; + &:hover { + color: var(--s-color-base-content-secondary); + } + } + } + } + .el-icon-close { + font-family: var(--s-font-family-icons) !important; + @extend .s-icon-x-16; + font-size: var(--s-icon-font-size-mini); + } + } +} diff --git a/src/styles/neumorphism/index.scss b/src/styles/neumorphism/index.scss index 54e77027..6088d16b 100644 --- a/src/styles/neumorphism/index.scss +++ b/src/styles/neumorphism/index.scss @@ -7,3 +7,4 @@ @import "./switch"; @import "./tooltip"; @import "./dialog"; +@import "./image";