dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0

Browse Source
This commit is contained in:
Igor Kulikov 2020-04-30 09:51:14 +03:00
commit a05774046a
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/app/components/gateway/gateway-config-select.scss
View File

@ -27,9 +27,3 @@
.tb-gateway-autocomplete-container.md-virtual-repeat-container.md-autocomplete-suggestions-container{
z-index: 70;
}
md-autocomplete{
md-input-container{
margin-bottom: 0;
}
}

5
ui/src/app/components/gateway/gateway-form.tpl.html
View File

@ -39,12 +39,11 @@
get_access_token="vm.getAccessToken"
create-device="vm.createDevice">
</tb-gateway-config-select>
<md-input-container ng-if="vm.isStateForm"
class="md-block">
<md-input-container ng-if="vm.isStateForm" class="md-block">
<label>{{'gateway.gateway-name' | translate }}</label>
<input ng-disabled="true" type="text" ng-model="vm.configurations.gateway.name" name="gatewayName"/>
</md-input-container>
<md-input-container class="md-block">
<md-input-container class="md-block" style="margin-top: 0;">
<label>{{'gateway.security-type' | translate }}</label>
<md-select ng-disabled="vm.isReadOnlyForm" name="securityType" ng-model="vm.configurations.securityType" required>
<md-option ng-repeat="securityType in vm.securityTypes" ng-value="securityType.value">