Skip to content

Button rounded property #59

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 4 commits into from
Sep 30, 2020
Merged

Button rounded property #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08eae0b
Add rounded property for action buttons
stefashkaa Sep 27, 2020
736934f
Rename scss variables
stefashkaa Sep 27, 2020
2751faa
Fix css class names
stefashkaa Sep 30, 2020
102e1ca
Update version
stefashkaa Sep 30, 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.3.4",
"version": "0.3.5",
"private": false,
"publishConfig": {
"registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Breadcrumb/SBreadcrumb.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default class SBreadcrumb extends Vue {
<style lang="scss">
@import "../../styles/variables.scss";
.el-breadcrumb__separator {
color: $color-neutral-secondary;
color: $s-color-neutral-secondary;
font-weight: normal;
}
</style>
4 changes: 2 additions & 2 deletions src/components/Breadcrumb/SBreadcrumbItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ export default class SBreadcrumbItem extends Vue {
<style lang="scss">
@import "../../styles/variables.scss";
.el-breadcrumb__inner {
color: $color-neutral-secondary;
color: $s-color-neutral-secondary;
&.is-link {
color: $color-neutral-secondary;
color: $s-color-neutral-secondary;
font-weight: normal;
}
}
Expand Down
134 changes: 72 additions & 62 deletions src/components/Button/SButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
:disabled="disabled"
:loading="isLoading"
:autofocus="autofocus"
:circle="type === ButtonTypes.ACTION"
:circle="type === ButtonTypes.ACTION && rounded"
:icon="elementIcon"
@click="handleClick"
>
Expand Down Expand Up @@ -40,6 +40,12 @@ export default class SButton extends Vue {
* By default it's set to `"primary"`
*/
@Prop({ default: ButtonTypes.PRIMARY, type: String }) readonly type!: string
/**
* Rounded property for `type="action"` buttons.
*
* By default it's set to `false`
*/
@Prop({ default: false, type: Boolean }) readonly rounded!: boolean
/**
* Size of button. Possible values: `"big"`, `"medium"`, `"small"`.
*
Expand Down Expand Up @@ -117,18 +123,18 @@ export default class SButton extends Vue {
get computedClasses (): Array<string> {
const cssClasses: Array<string> = []
if ((this.elForm || this.elFormItem || {}).size) {
cssClasses.push((this.elForm || this.elFormItem).size)
cssClasses.push(`s-${(this.elForm || this.elFormItem).size}`)
} else if ((Object.values(ButtonSize) as Array<string>).includes(this.size)) {
cssClasses.push(this.size)
cssClasses.push(`s-${this.size}`)
}
if ((Object.values(ButtonTypes) as Array<string>).includes(this.type)) {
cssClasses.push(this.type)
cssClasses.push(`s-${this.type}`)
}
if (this.isLoading) {
cssClasses.push('loading')
cssClasses.push('s-loading')
}
if (this.alternative) {
cssClasses.push('alternative')
cssClasses.push('s-alternative')
}
return cssClasses
}
Expand Down Expand Up @@ -180,13 +186,13 @@ export default class SButton extends Vue {
<style lang="scss">
@import "../../styles/variables.scss";

.loading {
.s-loading {
padding: 12px 17.5px;
i {
position: absolute;
left: var(--s-button-loading-left);
}
&.small {
&.s-small {
padding: 9px 15px;
i {
left: calc(var(--s-button-loading-left) + 2px);
Expand All @@ -197,112 +203,116 @@ export default class SButton extends Vue {
}
}

.primary {
.s-primary {
&:hover, &:active, &:focus {
background-color: $color-main-hover;
border-color: $color-main-hover;
background-color: $s-color-main-hover;
border-color: $s-color-main-hover;
}
&:disabled, &:disabled:hover {
background-color: $color-main-inactive;
border-color: $color-main-inactive;
background-color: $s-color-main-inactive;
border-color: $s-color-main-inactive;
}
}

.secondary {
.s-secondary {
&:hover, &:active, &:focus {
color: $color-main-brand;
background-color: $color-basic-white;
border-color: $color-main-brand;
color: $s-color-main-brand;
background-color: $s-color-basic-white;
border-color: $s-color-main-brand;
}
&:disabled, &:disabled:hover {
color: $color-neutral-inactive;
border-color: $color-neutral-border;
color: $s-color-neutral-inactive;
border-color: $s-color-neutral-border;
}
&.alternative {
&.s-alternative {
&:hover, &:active, &:focus {
color: $color-basic-black;
background-color: $color-neutral-hover;
border-color: $color-neutral-hover;
color: $s-color-basic-black;
background-color: $s-color-neutral-hover;
border-color: $s-color-neutral-hover;
}
&:disabled, &:disabled:hover {
color: $color-neutral-inactive;
border-color: $color-neutral-border;
background-color: $color-basic-white;
color: $s-color-neutral-inactive;
border-color: $s-color-neutral-border;
background-color: $s-color-basic-white;
}
}
}

.link {
color: $color-basic-black;
.s-link {
color: $s-color-basic-black;
border: none;
background-color: transparent;
&:hover, &:active, &:focus {
color: $color-main-brand;
color: $s-color-main-brand;
background-color: transparent;
}
&:disabled, &:disabled:hover {
color: $color-neutral-inactive;
color: $s-color-neutral-inactive;
}
}

.tertiary {
color: $color-basic-black;
border-color: $color-neutral-placeholder;
background-color: $color-neutral-placeholder;
.s-tertiary {
color: $s-color-basic-black;
border-color: $s-color-neutral-placeholder;
background-color: $s-color-neutral-placeholder;
&:hover, &:active, &:focus {
color: $color-main-brand;
background-color: $color-neutral-placeholder;
border-color: $color-neutral-placeholder;
color: $s-color-main-brand;
background-color: $s-color-neutral-placeholder;
border-color: $s-color-neutral-placeholder;
}
&:disabled, &:disabled:hover {
color: $color-neutral-inactive;
background-color: $color-neutral-placeholder;
border-color: $color-neutral-placeholder;
color: $s-color-neutral-inactive;
background-color: $s-color-neutral-placeholder;
border-color: $s-color-neutral-placeholder;
}
}

.action {
&.big {
width: $size-big;
.s-action {
&.s-big {
width: $s-size-big;
padding: 12px;
i {
font-size: 20px;
}
}
&.medium {
width: $size-medium;
&.s-medium {
width: $s-size-medium;
padding: 10px;
i {
font-size: 18px;
}
}
&.small {
width: $size-small;
&.s-small {
width: $s-size-small;
padding: 9px;
i {
font-size: 16px;
margin-left: -2px;
margin-top: -2px;
}
}
color: $color-basic-black;
background-color: $color-neutral-placeholder;
border-color: $color-neutral-placeholder;
color: $s-color-basic-black;
background-color: $s-color-neutral-placeholder;
border-color: $s-color-neutral-placeholder;
border-radius: 8px;
&:hover, &:active, &:focus, &:disabled, &:disabled:hover {
color: $color-basic-black;
background-color: $color-neutral-hover;
border-color: $color-neutral-hover;
color: $s-color-basic-black;
background-color: $s-color-neutral-hover;
border-color: $s-color-neutral-hover;
}
&:disabled, &:disabled:hover {
color: $color-neutral-inactive;
color: $s-color-neutral-inactive;
}
&.alternative {
background-color: $color-basic-white;
border-color: $color-neutral-border;
&.s-alternative {
background-color: $s-color-basic-white;
border-color: $s-color-neutral-border;
&:hover, &:active, &:focus, &:disabled, &:disabled:hover {
color: $color-basic-black;
background-color: $color-neutral-placeholder;
border-color: $color-neutral-placeholder;
color: $s-color-basic-black;
background-color: $s-color-neutral-placeholder;
border-color: $s-color-neutral-placeholder;
}
&:disabled, &:disabled:hover {
color: $color-neutral-inactive;
color: $s-color-neutral-inactive;
}
}
}
Expand All @@ -314,7 +324,7 @@ button {
color: inherit;
}
}
&:not(.action) > span > i {
&:not(.s-action) > span > i {
&[class^=s-icon-], &[class^=el-icon-] {
margin-right: 6px;
}
Expand Down
12 changes: 6 additions & 6 deletions src/components/Card/SCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<el-card
class="s-card"
:class="{ clickable }"
:class="{ 's-clickable': clickable }"
:header="header"
:body-style="bodyStyle"
:shadow="shadow"
Expand Down Expand Up @@ -62,17 +62,17 @@ export default class SCard extends Vue {
@import "../../styles/variables.scss";

.s-card {
color: $color-basic-black;
color: $s-color-basic-black;
border-radius: 8px;
border-color: $color-neutral-border;
&.clickable {
border-color: $s-color-neutral-border;
&.s-clickable {
cursor: pointer;
}
&:hover, &:focus {
border-color: $color-basic-white;
border-color: $s-color-basic-white;
}
.el-card__header {
border-bottom-color: $color-basic-white;
border-bottom-color: $s-color-basic-white;
padding-bottom: 0;
text-align: left;
}
Expand Down
26 changes: 13 additions & 13 deletions src/components/Checkbox/SCheckbox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export default class SCheckbox extends Vue {
get computedClasses (): Array<string> {
const cssClasses: Array<string> = []
if ((Object.values(CheckboxSize) as Array<string>).includes(this.size)) {
cssClasses.push(this.size)
cssClasses.push(`s-${this.size}`)
}
return cssClasses
}
Expand All @@ -104,15 +104,15 @@ export default class SCheckbox extends Vue {
@import "../../styles/common.scss";

.el-checkbox {
&.big {
@extend .big;
&.s-big {
@extend .s-big;
padding: 17px 0 9px 0;
&.is-bordered {
padding: 17px 20px 9px 15px;
}
}
&.medium {
@extend .medium;
&.s-medium {
@extend .s-medium;
&, &.is-bordered {
padding: 9px 15px 7px 10px;
.el-checkbox__inner {
Expand All @@ -130,8 +130,8 @@ export default class SCheckbox extends Vue {
padding: 9px 0 7px 0;
}
}
&.small {
@extend .small;
&.s-small {
@extend .s-small;
border-radius: 4px;
.el-checkbox__label {
font-size: 12px;
Expand All @@ -155,7 +155,7 @@ export default class SCheckbox extends Vue {
}
}
.el-checkbox__inner {
border-color: $color-neutral-inactive;
border-color: $s-color-neutral-inactive;
border-radius: 4px;
width: 20px;
height: 20px;
Expand All @@ -169,21 +169,21 @@ export default class SCheckbox extends Vue {
.el-checkbox__input {
&.is-disabled {
.el-checkbox__inner {
background-color: $color-neutral-placeholder;
background-color: $s-color-neutral-placeholder;
}
& + span.el-checkbox__label {
color: $color-neutral-inactive;
color: $s-color-neutral-inactive;
}
}
&.is-checked {
&.is-disabled > .el-checkbox__inner {
background-color: $color-neutral-placeholder;
background-color: $s-color-neutral-placeholder;
&::after {
border-color: $color-neutral-inactive;
border-color: $s-color-neutral-inactive;
}
}
& + .el-checkbox__label {
color: $color-basic-black;
color: $s-color-basic-black;
}
}
}
Expand Down
Loading