Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 07:57:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup

Browse source
This commit is contained in:
ZappoMan 2015-05-13 18:30:01 -07:00
commit c1b4e3bbb7
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/resources/web/js/settings.js
View file

@ -26,7 +26,7 @@ var viewHelpers = {
setting_value = _(values).valueForKeyPath(keypath); setting_value = _(values).valueForKeyPath(keypath);
if (!setting_value) { if (setting_value === undefined || setting_value === null) {
if (_.has(setting, 'default')) { if (_.has(setting, 'default')) {
setting_value = setting.default; setting_value = setting.default;
} else { } else {

1
examples/html/style.css
View file

@ -243,7 +243,6 @@ table#properties-list {
#properties-list .label { #properties-list .label {
font-weight: bold; font-weight: bold;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;