Skip to content

Commit 5c0c07f

Browse files
author
shin
committed
upd: select2 styles
1 parent 8e13b8e commit 5c0c07f

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

modules/cherry-ui-elements/inc/ui-elements/ui-dimensions/assets/ui-dimensions.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// Delegate events
3434
.on( 'click', this.isLinked, { 'self': this }, this.switchLinked )
3535
.on( 'click', this.units, { 'self': this }, this.switchUnits )
36-
.on( 'change', this.valuesInput + '.is-linked', { 'self': this }, this.changeLinked );
36+
.on( 'input', this.valuesInput + '.is-linked', { 'self': this }, this.changeLinked );
3737

3838
this.triggers();
3939
},
@@ -84,9 +84,10 @@
8484

8585
changeLinked: function( event ) {
8686
var self = event.data.self,
87-
$this = $( this );
87+
$this = $( this ),
88+
$container = $this.closest( '.cherry-ui-dimensions__values' );
8889

89-
$this.siblings( self.valuesInput ).val( $this.val() );
90+
$( self.valuesInput, $container ).val( $this.val() )
9091
}
9192
};
9293

modules/cherry-ui-elements/inc/ui-elements/ui-select/assets/min/ui-select.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/cherry-ui-elements/inc/ui-elements/ui-select/assets/ui-select.scss

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,11 @@ select.select2-hidden-accessible{
5656
background-color: transparent;
5757
border: none;
5858
border-radius: $border_radius_extra_small;
59+
min-height: 26px;
5960

6061
.select2-selection__rendered{
61-
font-size: 14px;
62-
line-height: 20px;
62+
font-size: 12px;
63+
line-height: 14px;
6364
padding: 0;
6465
display: block;
6566

@@ -68,17 +69,18 @@ select.select2-hidden-accessible{
6869
}
6970

7071
.select2-selection__choice{
71-
line-height: 20px;
72+
line-height: 14px;
7273
margin: 2px;
7374
border: none;
74-
background-color: $dark_color;
75+
background-color: #e4e4e4;
7576
border-radius: $border_radius_extra_small;
7677
color: darken( $dark_color, 50% );
7778
padding: 4px;
7879

7980
.select2-selection__choice__remove{
8081
color: $remove_color;
81-
margin-right: 10px;
82+
margin-right: 5px;
83+
font-size: 14px;
8284
}
8385
}
8486

@@ -126,14 +128,16 @@ select.select2-hidden-accessible{
126128
.select2-results__option{
127129

128130
&[aria-selected=true]{
129-
color: #fff;
130-
background-color: $primary_color;
131-
}
132-
&--highlighted{
133131
color: darken( $dark_color, 50% );
134132
background-color: $dark_color;
135133
}
134+
135+
&--highlighted{
136+
color: #fff;
137+
background-color: $primary_color;
138+
}
136139
}
140+
137141
.li[aria-disabled=true]{
138142
display: none;
139143
}

0 commit comments

Comments
 (0)