Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@soramitsu/soramitsu-js-ui",
"version": "0.6.4",
"version": "0.6.5",
"private": false,
"publishConfig": {
"registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/"
Expand Down
2 changes: 1 addition & 1 deletion src/stories/Dropdown/SDropdown.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const configurable = () => ({
template: `<s-dropdown
type="button"
:size="size"
:borderRadius="borderRadius"
:border-radius="borderRadius"
:buttonType="buttonType"
:placement="placement"
:hide-on-click="hideOnClick"
Expand Down
2 changes: 1 addition & 1 deletion src/stories/Intro/Customization.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const configurable = () => ({
<s-input
type="number"
:placeholder="button.label + ' (px)'"
:borderRadius="button.label"
:border-radius="button.label"
style="margin-right: 10px; margin-right: 10px;"
@change="(value) => handleBorderRadiusChange(button.label, value)"
/>
Expand Down
6 changes: 3 additions & 3 deletions src/stories/Menu/SMenu.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const basicMenu = () => ({
template: `<s-aside width="220px">
<s-menu
default-active="1"
:borderRadius="borderRadius"
:border-radius="borderRadius"
@open="handleOpen"
@select="handleSelect"
@close="handleClose">
Expand Down Expand Up @@ -62,7 +62,7 @@ export const sideBar = () => ({
template: `<s-aside width="220px">
<s-menu
default-active="2"
:borderRadius="borderRadius"
:border-radius="borderRadius"
@open="handleOpen"
@select="handleSelect"
@close="handleClose">
Expand Down Expand Up @@ -121,7 +121,7 @@ export const topBar = () => ({
template: `<s-menu
default-active="4"
mode="horizontal"
:borderRadius="borderRadius"
:border-radius="borderRadius"
@select="handleSelect">
<s-menu-item index="1">Navigator One</s-menu-item>
<s-submenu index="2">
Expand Down
4 changes: 2 additions & 2 deletions src/stories/SButton.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const configurable = () => ({
:icon="type === 'action' ? 'back' : ''"
:type="type"
:size="size"
:borderRadius="borderRadius"
:border-radius="borderRadius"
:rounded="rounded"
:alternative="alternative"
@click="handleClick"
Expand Down Expand Up @@ -117,7 +117,7 @@ export const withDifferentBorderRadius = () => ({
<s-button
v-for="item in items"
:key="item.borderRadius"
:borderRadius="item.borderRadius"
:border-radius="item.borderRadius"
>
{{ item.label }}
</s-button>
Expand Down
4 changes: 2 additions & 2 deletions src/stories/SCard.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ export default {
export const configurable = () => ({
components: { SCard, SRow, SDropdown, SDropdownItem },
template: `<s-row class="s-flex" style="flex: 1; justify-content: space-between; align-items: center;">
<s-card style="width: 80%;" :shadow="shadow" :borderRadius="borderRadius" :clickable="clickable" @click="handleClick">
<s-card style="width: 80%;" :shadow="shadow" :border-radius="borderRadius" :clickable="clickable" @click="handleClick">
<template slot="header">
<div class="s-flex" style="justify-content: space-between; padding-right: 20px;">
<span>{{ header }}</span>
<s-dropdown type="ellipsis" :borderRadius="borderRadius">
<s-dropdown type="ellipsis" :border-radius="borderRadius">
Menu
<template #menu>
<s-dropdown-item>First</s-dropdown-item>
Expand Down
6 changes: 3 additions & 3 deletions src/stories/SCheckbox.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const configurable = () => ({
v-model="vModelValue"
:disabled="disabled"
:border="border"
:borderRadius="borderRadius"
:border-radius="borderRadius"
:size="size"
:label="label"
@change="(value) => changeValue = value"
Expand Down Expand Up @@ -100,12 +100,12 @@ export const differentBorderRadius = () => ({
template: `<s-row :gutter="20" style="flex: 1;">
<template v-for="item in items">
<s-col :span="6" style="height: 56px; margin-bottom: 20px;">
<s-checkbox :borderRadius="item.borderRadius" :value="false">
<s-checkbox :border-radius="item.borderRadius" :value="false">
{{ item.label }}
</s-checkbox>
</s-col>
<s-col :span="6" style="height: 56px; margin-bottom: 20px;">
<s-checkbox border :borderRadius="item.borderRadius" :value="true">
<s-checkbox border :border-radius="item.borderRadius" :value="true">
{{ item.label }}
</s-checkbox>
</s-col>
Expand Down
4 changes: 2 additions & 2 deletions src/stories/SDatePicker.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ export const configurable = () => ({
:disabled="disabled"
:clearable="clearable"
:align="align"
:borderRadius="borderRadius"
:popperClass="borderRadius"
:border-radius="borderRadius"
:popper-class="borderRadius"
:input-type="inputType"
placeholder="Select date"
start-placeholder="From"
Expand Down
2 changes: 1 addition & 1 deletion src/stories/SDialog.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const configurable = () => ({
:width="width"
:fullscreen="fullscreen"
:top="top"
:borderRadius="borderRadius"
:border-radius="borderRadius"
:show-close="showClose"
:close-on-click-modal="closeOnClickModal"
:close-on-esc="closeOnEsc"
Expand Down
2 changes: 1 addition & 1 deletion src/stories/SInput.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const configurable = () => ({
:type="type"
:placeholder="placeholder"
:disabled="disabled"
:borderRadius="borderRadius"
:border-radius="borderRadius"
:show-password="showPassword"
:readonly="readonly"
:show-text-limit="showTextLimit"
Expand Down
4 changes: 2 additions & 2 deletions src/stories/SPagination.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export const configurable = () => ({
:disabled="disabled"
:small="small"
:background="background"
:borderRadius="borderRadius"
:popperClass="borderRadius"
:border-radius="borderRadius"
:popper-class="borderRadius"
:prev-text="prevText"
:next-text="nextText"
@size-change="handleSizeChange"
Expand Down
2 changes: 1 addition & 1 deletion src/stories/STooltip.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const configurable = () => ({
v-model="model"
:content="content"
:disabled="disabled"
:borderRadius="borderRadius"
:border-radius="borderRadius"
:offset="offset"
:openDelay="openDelay"
@change="handleChange"
Expand Down
4 changes: 2 additions & 2 deletions src/stories/Select/SSelect.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const configurable = () => ({
<s-select
v-model="model"
:disabled="disabled"
:borderRadius="borderRadius"
:border-radius="borderRadius"
:loading="loading"
:multiple="multiple"
:input-type="item.inputType"
Expand All @@ -36,7 +36,7 @@ export const configurable = () => ({
:multiple-text-prefix="multipleTextPrefix"
:loading-text="loadingText"
:no-data-text="noDataText"
:popperClass="borderRadius"
:popper-class="borderRadius"
@change="handleChange"
>
<s-option
Expand Down
2 changes: 1 addition & 1 deletion src/stories/Tab/STabs.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const defaultUsage = () => ({
template: `<s-tabs
v-model="activeName"
:type="type"
:borderRadius="borderRadius"
:border-radius="borderRadius"
:position="position"
:closable="closable"
:addable="addable"
Expand Down
7 changes: 6 additions & 1 deletion src/styles/menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,17 @@ $margin-bottom-menu-item: 8px;
margin-right: $margin-bottom-menu-item;
}
}
.el-menu--horizontal > .el-menu-item {
&,
&.is-active {
border-bottom: none;
}
}
.el-menu-item {
align-items: center;
&:not(.is-disabled):hover,
&.is-active {
background-color: var(--s-menu-color-hover) !important;
border-bottom-color: var(--s-menu-color-hover) !important;
i {
color: var(--s-menu-text-color-active);
}
Expand Down