Skip to content

Commit

Permalink
Merge branch 'emergenza' of https://github.com/ferdi2005/monumenti in…
Browse files Browse the repository at this point in the history
…to emergenza
  • Loading branch information
ferdi2005 committed Jul 12, 2020
2 parents d8d55e1 + 9c60aa4 commit 559d109
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 16 deletions.
4 changes: 0 additions & 4 deletions app/controllers/home/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,9 @@ $.refresh.addEventListener('click', function () {
$.search.addEventListener('click', function () {
$.searchfield.show();
$.searchfield.focus();
if (OS_ANDROID) {
$.searchfield.height = "20%";
}
$.searchfield.addEventListener('return', function (e) {
findmon(e.value, "city");
$.searchfield.hide();
$.searchfield.height = "10%";
if (OS_ANDROID) {
Ti.UI.Android.hideSoftKeyboard();
}
Expand Down
3 changes: 0 additions & 3 deletions app/styles/app.tss
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,6 @@ overrode the settings with other TSS, XML, or JS settings:
left: "0%"
}

"Window": {
backgroundColor: '#FFFFFF',
}

".greycliffbold": {
font: {
Expand Down
3 changes: 2 additions & 1 deletion app/styles/home/index.tss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

"Window": {
height: Ti.UI.FILL
height: Ti.UI.FILL,
windowSoftInputMode: Ti.UI.Android.SOFT_INPUT_ADJUST_PAN
}

"#mapview": {
Expand Down
10 changes: 2 additions & 8 deletions app/styles/index.tss
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
".container": {
backgroundColor:"white"
}


"#label": {
font: {
fontSize: 12
}
}

".container": {
    backgroundColor: "white"
}

"TabGroup": {
"TabGroup[platform=android]": {
theme: "Theme.AppCompat.NoTitleBar"
}

0 comments on commit 559d109

Please sign in to comment.