From c1be2938b9bf39f6f61def19477f03f3b1aff16c Mon Sep 17 00:00:00 2001
From: alexnatalia <alekseenkonn@gmail.com>
Date: Tue, 8 Dec 2020 21:25:38 +0300
Subject: [PATCH 1/2] Refactored stories props.

---
 src/stories/Dropdown/SDropdown.stories.ts  | 2 +-
 src/stories/Intro/Customization.stories.ts | 2 +-
 src/stories/Menu/SMenu.stories.ts          | 6 +++---
 src/stories/SButton.stories.ts             | 4 ++--
 src/stories/SCard.stories.ts               | 4 ++--
 src/stories/SCheckbox.stories.ts           | 6 +++---
 src/stories/SDatePicker.stories.ts         | 4 ++--
 src/stories/SDialog.stories.ts             | 2 +-
 src/stories/SInput.stories.ts              | 2 +-
 src/stories/SPagination.stories.ts         | 4 ++--
 src/stories/STooltip.stories.ts            | 2 +-
 src/stories/Select/SSelect.stories.ts      | 4 ++--
 src/stories/Tab/STabs.stories.ts           | 2 +-
 13 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/stories/Dropdown/SDropdown.stories.ts b/src/stories/Dropdown/SDropdown.stories.ts
index b01e3d03..b1bb21c6 100644
--- a/src/stories/Dropdown/SDropdown.stories.ts
+++ b/src/stories/Dropdown/SDropdown.stories.ts
@@ -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"
diff --git a/src/stories/Intro/Customization.stories.ts b/src/stories/Intro/Customization.stories.ts
index f74e9ce0..a5451ddb 100644
--- a/src/stories/Intro/Customization.stories.ts
+++ b/src/stories/Intro/Customization.stories.ts
@@ -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)"
                   />
diff --git a/src/stories/Menu/SMenu.stories.ts b/src/stories/Menu/SMenu.stories.ts
index 246c197b..01e7ab66 100644
--- a/src/stories/Menu/SMenu.stories.ts
+++ b/src/stories/Menu/SMenu.stories.ts
@@ -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">
@@ -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">
@@ -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">
diff --git a/src/stories/SButton.stories.ts b/src/stories/SButton.stories.ts
index 011e73d1..bda6dcb7 100644
--- a/src/stories/SButton.stories.ts
+++ b/src/stories/SButton.stories.ts
@@ -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"
@@ -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>
diff --git a/src/stories/SCard.stories.ts b/src/stories/SCard.stories.ts
index 1150b755..b98d05e8 100644
--- a/src/stories/SCard.stories.ts
+++ b/src/stories/SCard.stories.ts
@@ -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>
diff --git a/src/stories/SCheckbox.stories.ts b/src/stories/SCheckbox.stories.ts
index b97569ce..41289340 100644
--- a/src/stories/SCheckbox.stories.ts
+++ b/src/stories/SCheckbox.stories.ts
@@ -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"
@@ -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>
diff --git a/src/stories/SDatePicker.stories.ts b/src/stories/SDatePicker.stories.ts
index 5afd3413..59fb117a 100644
--- a/src/stories/SDatePicker.stories.ts
+++ b/src/stories/SDatePicker.stories.ts
@@ -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"
diff --git a/src/stories/SDialog.stories.ts b/src/stories/SDialog.stories.ts
index a56e4518..2f5456dd 100644
--- a/src/stories/SDialog.stories.ts
+++ b/src/stories/SDialog.stories.ts
@@ -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"
diff --git a/src/stories/SInput.stories.ts b/src/stories/SInput.stories.ts
index 85381d27..8e394b96 100644
--- a/src/stories/SInput.stories.ts
+++ b/src/stories/SInput.stories.ts
@@ -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"
diff --git a/src/stories/SPagination.stories.ts b/src/stories/SPagination.stories.ts
index d18d3012..39628d4d 100644
--- a/src/stories/SPagination.stories.ts
+++ b/src/stories/SPagination.stories.ts
@@ -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"
diff --git a/src/stories/STooltip.stories.ts b/src/stories/STooltip.stories.ts
index 9d9a0eba..93465d63 100644
--- a/src/stories/STooltip.stories.ts
+++ b/src/stories/STooltip.stories.ts
@@ -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"
diff --git a/src/stories/Select/SSelect.stories.ts b/src/stories/Select/SSelect.stories.ts
index 85215c81..b901094f 100644
--- a/src/stories/Select/SSelect.stories.ts
+++ b/src/stories/Select/SSelect.stories.ts
@@ -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"
@@ -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
diff --git a/src/stories/Tab/STabs.stories.ts b/src/stories/Tab/STabs.stories.ts
index ec8886d6..6d066df9 100644
--- a/src/stories/Tab/STabs.stories.ts
+++ b/src/stories/Tab/STabs.stories.ts
@@ -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"

From 1722a134fb7ab880317b8ee28db2869dec4b25fc Mon Sep 17 00:00:00 2001
From: alexnatalia <alekseenkonn@gmail.com>
Date: Wed, 9 Dec 2020 13:55:54 +0300
Subject: [PATCH 2/2] Updated UI Lib version and removed bottom border for
 Horizontal Menu.

---
 package.json         | 2 +-
 src/styles/menu.scss | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 078b48fe..56b6cbe0 100644
--- a/package.json
+++ b/package.json
@@ -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/"
diff --git a/src/styles/menu.scss b/src/styles/menu.scss
index 5a790d35..7054369f 100644
--- a/src/styles/menu.scss
+++ b/src/styles/menu.scss
@@ -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);
     }