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

Merge pull request #1808 from vvlladd28/improvement/fix_bugs_after_merge

Browse Source 
Improvement/fix bugs after merge
This commit is contained in:
Igor Kulikov 2019-06-26 12:07:54 +03:00 committed by GitHub
commit b185080ae9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/app/components/datasource-func.scss
View File

@ -25,9 +25,10 @@
display: none;
}
}
}
.tb-func-datakey-autocomplete,
.tb-alarm-datakey-autocomplete {
.tb-func-datakey-autocomplete,
.tb-alarm-datakey-autocomplete {
.tb-not-found {
display: block;
height: 48px;
@ -42,5 +43,4 @@
height: auto !important;
white-space: normal !important;
}
}
}

2
ui/src/app/locale/locale.constant-ru_RU.json
View File

@ -1642,7 +1642,7 @@
"ja_JA": "Японский",
"fa_IR": "Персидский",
"uk_UA": "Украинский",
"cs_CZ": "чешском"
"cs_CZ": "Чешский"
}
}
}

2
ui/src/app/locale/locale.constant-uk_UA.json
View File

@ -2183,7 +2183,7 @@
"de_DE": "Німецька",
"uk_UA": "Українська",
"fa_IR": "Перська",
"cs_CZ": "чеській"
"cs_CZ": "Чеська"
}
}
}