Skip to content

Release 0.6.3 #98

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

Merged
merged 7 commits into from
Dec 8, 2020
Merged

Release 0.6.3 #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
42ef6e7
Customization bug fix (#88)
alexnatalia Nov 11, 2020
8ef86b4
Fix imports (#90)
stefashkaa Nov 17, 2020
a78c2a8
Border Radius Configuration (#85)
alexnatalia Nov 18, 2020
ebf3e35
Font Size Configuration and Disabled Button Color Fix (#93)
alexnatalia Dec 1, 2020
c60647f
Fix select placeholder when zero values are set as a model (#95)
stefashkaa Dec 8, 2020
d32d121
Make half-second delay for pressed color, drop current state (#96)
stefashkaa Dec 8, 2020
aa5d65b
Merge branch 'develop' into release/0.6.3-0
stefashkaa Dec 8, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@soramitsu/soramitsu-js-ui",
"version": "0.6.1",
"version": "0.6.3",
"private": false,
"publishConfig": {
"registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/"
Expand Down
8 changes: 8 additions & 0 deletions src/components/Button/SButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export default class SButton extends Mixins(SizeMixin, BorderRadiusMixin) {

private iconLeftOffset = 0
elementIcon = ''
pressed = false

get computedType (): string {
if (this.type === ButtonTypes.PRIMARY) {
Expand Down Expand Up @@ -127,6 +128,9 @@ export default class SButton extends Mixins(SizeMixin, BorderRadiusMixin) {
if (this.alternative) {
cssClasses.push('s-alternative')
}
if (this.pressed) {
cssClasses.push('s-pressed')
}
return cssClasses
}

Expand Down Expand Up @@ -159,6 +163,10 @@ export default class SButton extends Mixins(SizeMixin, BorderRadiusMixin) {

handleClick (): void {
this.$emit('click')
this.pressed = true
setTimeout(() => {
this.pressed = false
}, 500)
}

mounted (): void {
Expand Down
7 changes: 6 additions & 1 deletion src/components/Select/SSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,12 @@ export default class SSelect extends Mixins(BorderRadiusMixin) {
if (this.inputType !== InputTypes.INPUT) {
return false
}
return !!(this.model && this.model.length !== 0 && this.placeholder)
return !!(
this.model !== null &&
this.model !== undefined &&
(!Array.isArray(this.model) || this.model.length !== 0) &&
this.placeholder
)
}

handleBlur (event: Event): void {
Expand Down
201 changes: 102 additions & 99 deletions src/styles/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,118 +38,120 @@ $s-color-button-tertiary-background-focused: var(--s-color-base-background) !def
color: transparent;
}
}
.s-primary {
background-color: var(--s-color-theme-accent);
border-color: var(--s-color-theme-accent);
color: var(--s-color-base-on-accent);
&:hover {
background-color: var(--s-color-theme-accent-hover);
border-color: var(--s-color-theme-accent-hover);
}
&:active {
background-color: var(--s-color-theme-accent-pressed);
border-color: var(--s-color-theme-accent-pressed);
}
&:focus {
background-color: var(--s-color-theme-accent-focused);
border-color: var(--s-color-theme-accent-focused);
}
@include disabled;
}
.s-secondary {
background-color: var(--s-color-base-on-accent);
color: var(--s-color-base-content-primary);
border-color: var(--s-color-base-border-primary);
&:hover, &:active, &:focus {
color: var(--s-color-theme-accent);
background-color: var(--s-color-base-on-accent);
.el-button {
&.s-primary {
background-color: var(--s-color-theme-accent);
border-color: var(--s-color-theme-accent);
color: var(--s-color-base-on-accent);
&.focusing {
background-color: var(--s-color-theme-accent-focused);
border-color: var(--s-color-theme-accent-focused);
}
&:hover {
background-color: var(--s-color-theme-accent-hover);
border-color: var(--s-color-theme-accent-hover);
}
&.s-pressed {
background-color: var(--s-color-theme-accent-pressed);
border-color: var(--s-color-theme-accent-pressed);
}
@include disabled;
}
@include disabled;
&.s-alternative {
&:hover, &:active, &:focus {
color: var(--s-color-base-content-primary);
background-color: var(--s-color-base-background);
border-color: var(--s-color-base-background);
&.s-secondary {
background-color: var(--s-color-base-on-accent);
color: var(--s-color-base-content-primary);
border-color: var(--s-color-base-border-primary);
&.focusing, &:hover, &.s-pressed {
color: var(--s-color-theme-accent);
background-color: var(--s-color-base-on-accent);
border-color: var(--s-color-theme-accent);
}
@include disabled;
&.s-alternative {
&.focusing, &:hover, &.s-pressed {
color: var(--s-color-base-content-primary);
background-color: var(--s-color-base-background);
border-color: var(--s-color-base-background);
}
@include disabled;
}
}
}
.s-link {
color: var(--s-color-base-content-primary);
border: none;
background-color: transparent;
&:hover, &:active, &:focus {
color: var(--s-color-theme-accent);
&.s-link {
color: var(--s-color-base-content-primary);
border: none;
background-color: transparent;
}
&:disabled, &:disabled:hover {
color: var(--s-color-base-on-disabled);
}
}
.s-tertiary {
color: var(--s-color-button-tertiary-color);
border-color: var(--s-color-button-tertiary-background);
background-color: var(--s-color-button-tertiary-background);
&:hover, &:active, &:focus {
color: var(--s-color-button-tertiary-color-active);
}
&:hover {
background-color: var(--s-color-button-tertiary-background-hover);
border-color: var(--s-color-button-tertiary-background-hover);
}
&:active {
background-color: var(--s-color-button-tertiary-background-pressed);
border-color: var(--s-color-button-tertiary-background-pressed);
}
&:focus {
background-color: var(--s-color-button-tertiary-background-focused);
border-color: var(--s-color-button-tertiary-background-focused);
}
@include disabled;
}
.s-action {
&.s-big {
width: $s-size-big;
padding: 12px;
i {
font-size: var(--s-icon-font-size-medium);
&.focusing, &:hover, &.s-pressed {
color: var(--s-color-theme-accent);
background-color: transparent;
}
}
&.s-medium {
width: $s-size-medium;
padding: 10px;
i {
font-size: var(--s-icon-font-size-small);
&:disabled, &:disabled:hover {
color: var(--s-color-base-on-disabled);
}
}
&.s-small {
width: $s-size-small;
padding: 9px;
i {
font-size: var(--s-icon-font-size-mini);
margin-left: -2px;
margin-top: -2px;
&.s-tertiary {
color: var(--s-color-button-tertiary-color);
border-color: var(--s-color-button-tertiary-background);
background-color: var(--s-color-button-tertiary-background);
&.focusing, &:hover, &.s-pressed {
color: var(--s-color-button-tertiary-color-active);
}
&.focusing {
background-color: var(--s-color-button-tertiary-background-focused);
border-color: var(--s-color-button-tertiary-background-focused);
}
&:hover {
background-color: var(--s-color-button-tertiary-background-hover);
border-color: var(--s-color-button-tertiary-background-hover);
}
&.s-pressed {
background-color: var(--s-color-button-tertiary-background-pressed);
border-color: var(--s-color-button-tertiary-background-pressed);
}
@include disabled;
}
color: var(--s-color-base-content-primary);
background-color: var(--s-color-base-background);
border-color: var(--s-color-base-background);
&:hover, &:active, &:focus {
&.s-action {
&.s-big {
width: $s-size-big;
padding: 12px;
i {
font-size: var(--s-icon-font-size-medium);
}
}
&.s-medium {
width: $s-size-medium;
padding: 10px;
i {
font-size: var(--s-icon-font-size-small);
}
}
&.s-small {
width: $s-size-small;
padding: 9px;
i {
font-size: var(--s-icon-font-size-mini);
margin-left: -2px;
margin-top: -2px;
}
}
color: var(--s-color-base-content-primary);
background-color: var(--s-color-base-background-hover);
border-color: var(--s-color-base-background-hover);
}
@include disabled;
&.s-alternative {
background-color: var(--s-color-base-on-accent);
border-color: var(--s-color-base-border-primary);
&:hover, &:active, &:focus {
background-color: var(--s-color-base-background);
border-color: var(--s-color-base-background);
&.focusing, &:hover, &.s-pressed {
color: var(--s-color-base-content-primary);
background-color: var(--s-color-base-background);
border-color: var(--s-color-base-background);
background-color: var(--s-color-base-background-hover);
border-color: var(--s-color-base-background-hover);
}
@include disabled;
&.s-alternative {
background-color: var(--s-color-base-on-accent);
border-color: var(--s-color-base-border-primary);
&.focusing, &:hover, &.s-pressed {
color: var(--s-color-base-content-primary);
background-color: var(--s-color-base-background);
border-color: var(--s-color-base-background);
}
@include disabled;
}
}
}
button {
Expand All @@ -165,10 +167,11 @@ button {
}
}
}
.el-button-group .el-button--plain {
.el-button-group .el-button.el-button--plain {
color: var(--s-color-base-content-primary);
border-color: var(--s-color-base-border-primary);
&:hover, &:active, &:focus {
background-color: var(--s-color-base-on-accent);
&.focusing, &:hover, &.s-pressed {
color: var(--s-color-theme-accent);
background-color: var(--s-color-base-on-accent);
border-color: var(--s-color-theme-accent);
Expand Down