diff --git a/package.json b/package.json index a9c2e130..aa336fec 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "lru_map": "^0.3.3", "marked": "^0.8.0", "object-hash": "^2.0.3", + "select2": "^4.0.13", "semver-min": "^0.6.5", "short-unique-id": "^1.1.1", "three": "~0.97.0", diff --git a/src/css/select2_custom.css b/src/css/select2_custom.css new file mode 100644 index 00000000..ec4f7993 --- /dev/null +++ b/src/css/select2_custom.css @@ -0,0 +1,32 @@ +/* Select 2 replacement styles */ +.select2 { + font-family: Arial, Helvetica, sans-serif; + font-weight: 400; + font-size: 13.3333px; +} + +.select2-selection__rendered { + line-height: 19px !important; + padding-left: 4px !important; + color: var(--defaultText) !important; +} + +.select2-container .select2-selection--single { + height: 20px !important; + border-radius: 3px !important; + border: 1px solid #bfbfbf !important; +} + +.select2-selection__arrow { + height: 19px !important; +} + .select2-selection__arrow b { + height: 5px !important; + width: 5px !important; + margin-left: -1px !important; + margin-top: -5px !important; + border: none !important; + border-bottom: 1px solid black !important; + border-right: 1px solid black !important; + transform: rotateZ(45deg); + } \ No newline at end of file diff --git a/src/css/tabs/firmware_flasher.css b/src/css/tabs/firmware_flasher.css index 972b82b8..4258cf16 100644 --- a/src/css/tabs/firmware_flasher.css +++ b/src/css/tabs/firmware_flasher.css @@ -213,4 +213,4 @@ #dialogUnstableFirmwareAcknoledgement .content ul { margin-top: 5px; margin-bottom: 5px; -} +} \ No newline at end of file diff --git a/src/js/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js index db029a04..9da5c223 100644 --- a/src/js/tabs/firmware_flasher.js +++ b/src/js/tabs/firmware_flasher.js @@ -528,6 +528,8 @@ TABS.firmware_flasher.initialize = function (callback) { self.localFirmwareLoaded = false; } + $('select[name="board"]').select2(); + $('select[name="board"]').change(function() { $("a.load_remote_file").addClass('disabled'); var target = $(this).val(); diff --git a/src/main.html b/src/main.html index 5c4fe13b..e3b3731b 100644 --- a/src/main.html +++ b/src/main.html @@ -39,6 +39,8 @@ + + @@ -139,6 +141,8 @@ + + diff --git a/src/tabs/firmware_flasher.html b/src/tabs/firmware_flasher.html index efedeae6..7d33051e 100644 --- a/src/tabs/firmware_flasher.html +++ b/src/tabs/firmware_flasher.html @@ -23,7 +23,7 @@ -
diff --git a/yarn.lock b/yarn.lock index 5cd5ccdb..823928de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5459,6 +5459,11 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +select2@^4.0.13: + version "4.0.13" + resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.13.tgz#0dbe377df3f96167c4c1626033e924372d8ef44d" + integrity sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw== + semver-diff@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"