Skip to content

Commit

Permalink
Merge branch 'hotfix/multiple-select'
Browse files Browse the repository at this point in the history
  • Loading branch information
Zehir committed Jun 20, 2021
2 parents a5127c2 + f5a0179 commit d9995f7
Show file tree
Hide file tree
Showing 5 changed files with 4,077 additions and 3,784 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased] :construction:

## [1.3.3] - 2021-06-20 ![Relative date](https://img.shields.io/date/1624190689?label=)
### Fixed
- Update multi-select to 1.15.2 for monaco-editor compatibility in node-red 2.0. #140

## [1.3.2] - 2021-03-06 ![Relative date](https://img.shields.io/date/1615059740?label=)
### Fixed
- Device list was empty. #89
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@
"type": "git",
"url": "git+https://github.com/deconz-community/node-red-contrib-deconz.git"
},
"version": "1.3.2"
"version": "1.3.3"
}
289 changes: 131 additions & 158 deletions static/css/multiple-select.css
Original file line number Diff line number Diff line change
@@ -1,51 +1,46 @@
@charset "UTF-8";
/**
* @author zhixin wen <wenzhixin2010@gmail.com>
*/
.ms-offscreen {
clip: rect(0 0 0 0) !important;
width: 1px !important;
height: 1px !important;
border: 0 !important;
margin: 0 !important;
padding: 0 !important;
overflow: hidden !important;
position: absolute !important;
outline: 0 !important;
left: auto !important;
top: auto !important;
}
clip: rect(0 0 0 0) !important;
width: 1px !important;
height: 1px !important;
border: 0 !important;
margin: 0 !important;
padding: 0 !important;
overflow: hidden !important;
position: absolute !important;
outline: 0 !important;
left: auto !important;
top: auto !important; }

.ms-parent {
display: inline-block;
position: relative;
vertical-align: middle;
}
display: inline-block;
position: relative;
vertical-align: middle; }

.ms-choice {
display: block;
width: 100%;
height: 26px;
padding: 0;
overflow: hidden;
cursor: pointer;
border: 1px solid #aaa;
text-align: left;
white-space: nowrap;
line-height: 26px;
color: #444;
text-decoration: none;
border-radius: 4px;
background-color: #fff;
}

.ms-choice.disabled {
display: block;
width: 100%;
height: 26px;
padding: 0;
overflow: hidden;
cursor: pointer;
border: 1px solid #aaa;
text-align: left;
white-space: nowrap;
line-height: 26px;
color: #444;
text-decoration: none;
border-radius: 4px;
background-color: #fff; }
.ms-choice.disabled {
background-color: #f4f4f4;
background-image: none;
border: 1px solid #ddd;
cursor: default;
}

.ms-choice > span {
cursor: default; }
.ms-choice > span {
position: absolute;
top: 0;
left: 0;
Expand All @@ -54,14 +49,25 @@
overflow: hidden;
text-overflow: ellipsis;
display: block;
padding-left: 8px;
}

.ms-choice > span.placeholder {
color: #999;
}

.ms-choice > div {
padding-left: 8px; }
.ms-choice > span.placeholder {
color: #999; }
.ms-choice > div.icon-close {
position: absolute;
top: 0px;
right: 16px;
height: 100%;
width: 16px; }
.ms-choice > div.icon-close:before {
content: '×';
color: #888;
font-weight: bold;
position: absolute;
top: 50%;
margin-top: -14px; }
.ms-choice > div.icon-close:hover:before {
color: #333; }
.ms-choice > div.icon-caret {
position: absolute;
width: 0;
height: 0;
Expand All @@ -70,52 +76,42 @@
margin-top: -2px;
border-color: #888 transparent transparent transparent;
border-style: solid;
border-width: 5px 4px 0 4px;
}

.ms-choice > div.open {
border-color: transparent transparent #888 transparent;
border-width: 0 4px 5px 4px;
}
border-width: 5px 4px 0 4px; }
.ms-choice > div.icon-caret.open {
border-color: transparent transparent #888 transparent;
border-width: 0 4px 5px 4px; }

.ms-drop {
width: auto;
min-width: 100%;
overflow: hidden;
display: none;
margin-top: -1px;
padding: 0;
position: absolute;
z-index: 1000;
background: #fff;
color: #000;
border: 1px solid #aaa;
border-radius: 4px;
}

.ms-drop.bottom {
width: auto;
min-width: 100%;
overflow: hidden;
display: none;
margin-top: -1px;
padding: 0;
position: absolute;
z-index: 1000;
background: #fff;
color: #000;
border: 1px solid #aaa;
border-radius: 4px; }
.ms-drop.bottom {
top: 100%;
box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
}

.ms-drop.top {
box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); }
.ms-drop.top {
bottom: 100%;
box-shadow: 0 -4px 5px rgba(0, 0, 0, 0.15);
}
box-shadow: 0 -4px 5px rgba(0, 0, 0, 0.15); }

.ms-search {
display: inline-block;
margin: 0;
min-height: 26px;
padding: 2px;
position: relative;
white-space: nowrap;
width: 100%;
z-index: 10000;
box-sizing: border-box;
}

.ms-search input {
display: inline-block;
margin: 0;
min-height: 26px;
padding: 2px;
position: relative;
white-space: nowrap;
width: 100%;
z-index: 10000;
box-sizing: border-box; }
.ms-search input {
width: 100%;
height: auto !important;
min-height: 24px;
Expand All @@ -125,86 +121,63 @@
font-family: sans-serif;
border: 1px solid #aaa;
border-radius: 5px;
box-shadow: none;
}
box-shadow: none; }

.ms-drop ul {
overflow: auto;
margin: 0;
padding: 5px 0;
}

.ms-drop ul > li {
overflow: auto;
margin: 0;
padding: 0; }
.ms-drop ul > li {
list-style: none;
display: list-item;
background-image: none;
position: static;
padding: 0 8px;
}

.ms-drop ul > li .disabled {
opacity: .35;
filter: Alpha(Opacity=35);
}

.ms-drop ul > li.multiple {
display: block;
float: left;
}

.ms-drop ul > li.group {
clear: both;
}

.ms-drop ul > li.multiple label {
width: 100%;
display: block;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

.ms-drop ul > li label {
font-weight: normal;
display: block;
white-space: nowrap;
cursor: pointer;
}

.ms-drop ul > li label.optgroup {
font-weight: bold;
}

.ms-drop ul > li.hide-radio {
padding: 0;
}

.ms-drop ul > li.hide-radio:focus, .ms-drop ul > li.hide-radio:hover {
background-color: #f8f9fa;
}

.ms-drop ul > li.hide-radio.selected {
color: #fff;
background-color: #007bff;
}

.ms-drop ul > li.hide-radio label {
margin-bottom: 0;
padding: 5px 8px;
}

.ms-drop ul > li.hide-radio input {
display: none;
}

.ms-drop ul > li.option-level-1 label {
padding-left: 28px;
}
padding: .25rem 8px; }
.ms-drop ul > li .disabled {
font-weight: normal !important;
opacity: .35;
filter: Alpha(Opacity=35);
cursor: default; }
.ms-drop ul > li.multiple {
display: block;
float: left; }
.ms-drop ul > li.group {
clear: both; }
.ms-drop ul > li.multiple label {
width: 100%;
display: block;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis; }
.ms-drop ul > li label {
position: relative;
padding-left: 1.25rem;
margin-bottom: 0;
font-weight: normal;
display: block;
white-space: nowrap;
cursor: pointer; }
.ms-drop ul > li label.optgroup {
font-weight: bold; }
.ms-drop ul > li.hide-radio {
padding: 0; }
.ms-drop ul > li.hide-radio:focus, .ms-drop ul > li.hide-radio:hover {
background-color: #f8f9fa; }
.ms-drop ul > li.hide-radio.selected {
color: #fff;
background-color: #007bff; }
.ms-drop ul > li.hide-radio label {
margin-bottom: 0;
padding: 5px 8px; }
.ms-drop ul > li.hide-radio input {
display: none; }
.ms-drop ul > li.option-level-1 label {
padding-left: 28px; }

.ms-drop input[type="radio"], .ms-drop input[type="checkbox"] {
margin: 5px;
}
position: absolute;
margin-top: .3rem;
margin-left: -1.25rem; }

.ms-drop .ms-no-results {
display: none;
}
display: none; }
Loading

0 comments on commit d9995f7

Please sign in to comment.