Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #1 from etiennesegonzac/710-fixes

Small device specific fixes
  • Loading branch information...
commit 97c335bd545089f521152b184d4129e291d561f9 2 parents cebcafb + a74a188
@deanlandolt authored
View
16 apps/dialer/js/contacts.js
@@ -229,6 +229,14 @@ var ContactDetails = {
_editing: false,
setup: function cd_setup() {
window.addEventListener('keyup', this, true);
+
+ // click outside details container to close
+ this.overlay.addEventListener('click', function(evt) {
+ ContactDetails.hide();
+ });
+ this.container.addEventListener('click', function(evt) {
+ evt.stopPropagation();
+ });
},
get overlay() {
delete this.overlay;
@@ -473,14 +481,6 @@ window.addEventListener('load', function contactSetup(evt) {
ShortcutsHandler.setup();
ContactDetails.setup();
- // click outside details container to close
- document.getElementById('contacts-overlay').addEventListener('click', function(evt) {
- ContactDetails.hide();
- });
- document.getElementById('contact-details-container').addEventListener('click', function(evt) {
- evt.stopPropagation();
- });
-
// add scrollwheel fallback for browser users
var scrollNode = Contacts.view;
scrollNode.addEventListener('DOMMouseScroll', wheel, false);
View
1  apps/dialer/style/dialer.css
@@ -369,6 +369,7 @@ html * {
/* === Contacts View === */
#contacts-view-scrollable {
+ overflow-y: scroll;
height: -moz-calc(100% - 7.5mozmm);
}
View
13 apps/homescreen/js/homescreen.js
@@ -689,8 +689,8 @@ var MessagesListener = function() {
while (notifications.hasChildNodes())
notifications.removeChild(notifications.firstChild);
- showMessage('', 'Waiting for notifications...');
-
+ notifications.classList.add('hidden');
+
var sender = notifications.dataset.sender;
WindowManager.launch('../sms/sms.html?sender=' + sender);
});
@@ -708,16 +708,13 @@ var MessagesListener = function() {
var message = document.createElement('div');
message.textContent = body;
- if (sender == '') {
- title.classList.add('empty');
- message.classList.add('empty');
- }
-
notification.appendChild(title);
notification.appendChild(message);
notifications.appendChild(notification);
notifications.dataset.sender = sender;
+
+ notifications.classList.remove('hidden');
}
@@ -726,7 +723,7 @@ var MessagesListener = function() {
showMessage(message.sender, message.body);
});
- showMessage('', 'Waiting for notifications...');
+ notifications.classList.add('hidden');
};
/* === TelephoneListener === */
View
34 apps/homescreen/style/homescreen.css
@@ -107,6 +107,12 @@ body {
background-size: 100% 100%;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
+
+ -moz-transition: -moz-transform 0.3s ease;
+}
+
+#home > #notifications.hidden {
+ -moz-transform: translateY(80px);
}
#home .notification {
@@ -115,29 +121,25 @@ body {
}
#home .notification > div:first-child {
- padding: 5px 0 0 0;
- height: 25px;
+ margin: 0;
+ padding: 20px 0 0 0;
+
font-size: 2.5mozmm;
+ line-height: 2.5mozmm;
color: #111;
}
#home .notification > div:last-child {
- display: table-cell;
+ margin: 0;
+ padding: 0;
+ width: -moz-calc(100% - 20px);
+ height: 25px;
+
font-size: 2mozmm;
- height: 50px;
color: #666;
- overflow: scroll;
- vertical-align: middle;
-}
-
-#home .notification > div:first-child.empty {
- display: none;
-}
-
-#home .notification > div:last-child.empty {
- line-height: 80px;
- height: 80px;
- color: #aaa;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.page {
View
BIN  apps/homescreen/style/images/notifications.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.