Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-15 04:15:32 +03:00
Code Issues Wiki Activity

Css files fixed and match styles

Browse source 
Moved css and match styling with other selects
This commit is contained in:
Žan Pevec 2020-08-20 19:45:39 +02:00
parent 74820fae37
commit d22f22924a
7 changed files with 46 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -57,6 +57,7 @@
"lru_map": "^0.3.3", "lru_map": "^0.3.3",
"marked": "^0.8.0", "marked": "^0.8.0",
"object-hash": "^2.0.3", "object-hash": "^2.0.3",
"select2": "^4.0.13",
"semver-min": "^0.6.5", "semver-min": "^0.6.5",
"short-unique-id": "^1.1.1", "short-unique-id": "^1.1.1",
"three": "~0.97.0", "three": "~0.97.0",

32
src/css/select2_custom.css Normal file
View file

@ -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);
}

2
src/css/tabs/firmware_flasher.css
View file

@ -213,4 +213,4 @@
#dialogUnstableFirmwareAcknoledgement .content ul { #dialogUnstableFirmwareAcknoledgement .content ul {
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }

2
src/js/tabs/firmware_flasher.js
View file

@ -528,6 +528,8 @@ TABS.firmware_flasher.initialize = function (callback) {
self.localFirmwareLoaded = false; self.localFirmwareLoaded = false;
} }
$('select[name="board"]').select2();
$('select[name="board"]').change(function() { $('select[name="board"]').change(function() {
$("a.load_remote_file").addClass('disabled'); $("a.load_remote_file").addClass('disabled');
var target = $(this).val(); var target = $(this).val();

4
src/main.html
View file

@ -39,6 +39,8 @@
<link type="text/css" rel="stylesheet" href="./js/libraries/switchery/switchery.css" media="all"/> <link type="text/css" rel="stylesheet" href="./js/libraries/switchery/switchery.css" media="all"/>
<link type="text/css" rel="stylesheet" href="./node_modules/@fortawesome/fontawesome-free/css/all.css" media="all"/> <link type="text/css" rel="stylesheet" href="./node_modules/@fortawesome/fontawesome-free/css/all.css" media="all"/>
<link type="text/css" rel="stylesheet" href="./Components/MotorOutputReordering/Styles.css" media="all"/> <link type="text/css" rel="stylesheet" href="./Components/MotorOutputReordering/Styles.css" media="all"/>
<link type="text/css" rel="stylesheet" href="./css/select2_custom.css" media="all"/>
<link type="text/css" rel="stylesheet" href="./node_modules/select2/dist/css/select2.min.css" media="all"/>
<link type="text/css" rel="stylesheet" href="./css/dark-theme.css" media="all" disabled/> <link type="text/css" rel="stylesheet" href="./css/dark-theme.css" media="all" disabled/>
@ -139,6 +141,8 @@
<script type="text/javascript" src="./Components/MotorOutputReordering/MotorOutputReorderingComponent.js"></script> <script type="text/javascript" src="./Components/MotorOutputReordering/MotorOutputReorderingComponent.js"></script>
<script type="text/javascript" src="./Components/MotorOutputReordering/MotorOutputReorderingCanvas.js"></script> <script type="text/javascript" src="./Components/MotorOutputReordering/MotorOutputReorderingCanvas.js"></script>
<script type="text/javascript" src="./Components/MotorOutputReordering/MotorOutputReorderingConfig.js"></script> <script type="text/javascript" src="./Components/MotorOutputReordering/MotorOutputReorderingConfig.js"></script>
<script type="text/javascript" src="./node_modules/select2/dist/js/select2.min.js"></script>
<title i18n="windowTitle"></title> <title i18n="windowTitle"></title>
</head> </head>
<body> <body>

2
src/tabs/firmware_flasher.html
View file

@ -23,7 +23,7 @@
<td><span class="description" i18n="firmwareFlasherOnlineSelectBuildType"></span></td> <td><span class="description" i18n="firmwareFlasherOnlineSelectBuildType"></span></td>
</tr> </tr>
<tr> <tr>
<td><select name="board"> <td class="board-select"><select name="board">
<option value="0" i18n="firmwareFlasherOptionLoading">Loading ...</option> <option value="0" i18n="firmwareFlasherOptionLoading">Loading ...</option>
</select></td> </select></td>
<td><span class="description" i18n="firmwareFlasherOnlineSelectBoardDescription"></span><div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherOnlineSelectBoardHint"></div></td> <td><span class="description" i18n="firmwareFlasherOnlineSelectBoardDescription"></span><div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherOnlineSelectBoardHint"></div></td>

5
yarn.lock
View file

@ -5459,6 +5459,11 @@ sax@^1.2.4:
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== 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: semver-diff@^2.0.0:
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"