Skip to content

Commit 8022d6c

Browse files
add neu select styles (#458)
1 parent 8c1f18a commit 8022d6c

File tree

6 files changed

+61
-3
lines changed

6 files changed

+61
-3
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@soramitsu/soramitsu-js-ui",
3-
"version": "1.0.34",
3+
"version": "1.0.35",
44
"private": false,
55
"publishConfig": {
66
"registry": "https://nexus.iroha.tech/repository/npm-soramitsu/"

src/components/Select/SSelect/SSelect.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ import { ElFormItem } from 'element-ui/types/form-item'
3535
3636
import SizeMixin from '../../../mixins/SizeMixin'
3737
import BorderRadiusMixin from '../../../mixins/BorderRadiusMixin'
38+
import DesignSystemInject from '../../DesignSystem/DesignSystemInject'
3839
import { Autocomplete } from '../../Input/consts'
3940
import { InputTypes } from '../consts'
4041
4142
@Component({
4243
components: { ElSelect }
4344
})
44-
export default class SSelect extends Mixins(SizeMixin, BorderRadiusMixin) {
45+
export default class SSelect extends Mixins(SizeMixin, BorderRadiusMixin, DesignSystemInject) {
4546
/**
4647
* Selected value. Can be used with `v-model`
4748
*/
@@ -163,6 +164,9 @@ export default class SSelect extends Mixins(SizeMixin, BorderRadiusMixin) {
163164
164165
get computedPopperClass (): string {
165166
const cssClasses: Array<string> = []
167+
if (this.designSystemClass) {
168+
cssClasses.push(this.designSystemClass)
169+
}
166170
if (this.popperClass) {
167171
cssClasses.push(this.popperClass)
168172
}
@@ -174,6 +178,9 @@ export default class SSelect extends Mixins(SizeMixin, BorderRadiusMixin) {
174178
175179
get computedClasses (): Array<string> {
176180
const cssClasses: Array<string> = []
181+
if (this.designSystemClass) {
182+
cssClasses.push(this.designSystemClass)
183+
}
177184
if (this.inputType === 'select') {
178185
if ((this.elForm || this.elFormItem || {}).size) {
179186
cssClasses.push(`s-${(this.elForm || this.elFormItem).size}`)

src/styles/dropdown.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
.el-dropdown-menu.el-popper {
5656
background-color: var(--s-color-base-on-accent);
5757
border-color: var(--s-color-base-on-accent);
58+
overflow: hidden;
5859
@include with-popper-arrows;
5960
}
6061
.el-dropdown-menu__item {

src/styles/neumorphism/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
@import "./tooltip";
99
@import "./dialog";
1010
@import "./image";
11+
@import "./select";

src/styles/neumorphism/select.scss

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
$arrow-placements: 'top', 'bottom', 'left', 'right';
2+
3+
$neu-select-background: var(--s-color-base-background) !default;
4+
$neu-select-dropdown-background: var(--s-color-base-on-accent) !default;
5+
$neu-select-border-width: 0 !default;
6+
$neu-select-box-shadow: var(--s-shadow-element) !default;
7+
$neu-select-color: var(--s-color-base-content-primary) !default;
8+
9+
.s-select.neumorphic {
10+
&.s-select-type,
11+
&.s-input-type {
12+
.el-select {
13+
.el-input__inner {
14+
border-width: $neu-select-border-width;
15+
background-color: $neu-select-background;
16+
box-shadow: $neu-select-box-shadow;
17+
color: $neu-select-color;
18+
font-weight: 400;
19+
}
20+
}
21+
}
22+
}
23+
24+
.el-select-dropdown.el-popper.neumorphic {
25+
background-color: $neu-select-dropdown-background;
26+
border-color: $neu-select-dropdown-background;
27+
28+
.el-scrollbar,
29+
.el-select-dropdown__list,
30+
.el-select-dropdown__wrap {
31+
border-radius: inherit;
32+
}
33+
34+
.el-select-dropdown__item {
35+
&:not(.selected) {
36+
color: $neu-select-color;
37+
}
38+
}
39+
40+
@each $placement in $arrow-placements {
41+
&[x-placement^='#{$placement}'] .popper__arrow {
42+
border-#{$placement}-color: $neu-select-dropdown-background;
43+
&:after {
44+
border-#{$placement}-color: $neu-select-dropdown-background;
45+
}
46+
}
47+
}
48+
}

src/styles/select.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
) {
55
&.s-border-radius {
66
&-#{$suffix} {
7-
border-radius: 0;
7+
border-radius: $border-radius;
8+
89
.s-placeholder {
910
border-top-left-radius: $border-radius;
1011
}

0 commit comments

Comments
 (0)