Permalink
Browse files

Merge branch 'master' of https://github.com/deanlandolt/gaia into 710…

…-fixes
  • Loading branch information...
2 parents 2d34281 + cebcafb commit 6b672d6cd74b1cc5408f3812c46ebc96fa06be1e @etiennesegonzac committed Mar 4, 2012
Showing with 47 additions and 13 deletions.
  1. +22 −0 apps/dialer/js/contacts.js
  2. +25 −13 apps/dialer/style/dialer.css
View
@@ -472,4 +472,26 @@ window.addEventListener('load', function contactSetup(evt) {
Contacts.setup();
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);
+
+ function wheel(evt){
+ var s;
+ if (!evt) {
+ s = -window.event.wheelDelta;
+ } else {
+ s = evt.detail;
+ }
+ scrollNode.scrollTop += 10 * ((s > 0) ? 1 : -1);
+ }
});
@@ -107,7 +107,7 @@ html * {
border-radius: 10px 10px 0 0;
- background: url(images/keypad-bg.png) center bottom no-repeat #F6F6F6;
+ background: url(images/keypad-bg.png) center bottom repeat-x #F6F6F6;
}
#views > .view {
@@ -370,7 +370,6 @@ html * {
#contacts-view-scrollable {
height: -moz-calc(100% - 7.5mozmm);
- overflow: scroll;
}
#contacts-container {
@@ -516,32 +515,32 @@ html * {
font-weight: 600;
font-size: 14px;
text-align: center;
+
+ cursor: default;
+ -moz-user-select: none;
}
/* === Contact detail View === */
#contacts-overlay {
position: absolute;
- top: -100%;
width: 100%;
height: 100%;
overflow: hidden;
- background-color: rgba(0, 0, 0, 0.6);
+ -moz-transition-property: background-color;
+ -moz-transition-duration: 1s;
- -moz-transition-property: -moz-transform;
- -moz-transition-duration: 0.30s;
- -moz-transition-timing-function: linear;
+ background-color: rgba(0, 0, 0, 0.6);
- -moz-transform: scale(0);
- z-index: 20;
+ z-index: -1;
}
#contacts-overlay.displayed {
- top: 0;
- -moz-transform: scale(1);
+ background-color: rgba(0, 0, 0, 0.6);
+ z-index: 20;
}
#contacts-overlay.hidden {
- -moz-transform: scale(0);
+ background-color: rgba(0, 0, 0, 0);
}
#contact-details-container {
@@ -558,6 +557,19 @@ html * {
background: url(images/app-texture.png) 50% 50%,
-moz-linear-gradient(bottom, hsla(0,0%,60%,1) 0,
hsla(0,0%,0%,.1) 1px, hsla(0,0%,0%,0) 30%, hsla(0,0%,0%,0) 100%), hsla(0,0%,96%,1);
+
+ -moz-transition-property: -moz-transform;
+ -moz-transition-duration: 0.30s;
+ -moz-transition-timing-function: linear;
+
+ -moz-transform: scale(0);
+}
+
+#contacts-overlay.displayed > #contact-details-container {
+ -moz-transform: scale(1);
+}
+#contacts-overlay.hidden > #contact-details-container {
+ -moz-transform: scale(0);
}
#contact-details-view {
@@ -1040,7 +1052,7 @@ html * {
/* === Recents === */
#recents-view {
- overflow: scroll;
+ overflow-y: scroll;
}
.recent {

0 comments on commit 6b672d6

Please sign in to comment.