cleaned up some css in the contacts stuff
authorAndy Chung <andy@mozillamessaging.com>
Mon, 21 Jun 2010 14:34:01 -0700
changeset 1782 f16982df0692fe1bf54f85244e0118e1c8a1d1b6
parent 1781 6ccd091fd208ebf3ae7a0eaa07d4bee1876006e9
child 1783 1f8176fb4587ac77243c6262b035dd5fc2bd160c
push id985
push userandy@mozillamessaging.com
push dateMon, 21 Jun 2010 21:34:06 +0000
cleaned up some css in the contacts stuff
client/api/contacts.css
client/api/contacts.html
client/api/i/face2.png
client/api/rdapi.css
client/api/rdapi.html
--- a/client/api/contacts.css
+++ b/client/api/contacts.css
@@ -125,17 +125,17 @@ ul {
     float: left;
     width: 100%;
     height: 310px;
 }
 
 #contactsCard {
     position: relative;
     z-index: 1;
-    overflow: scroll;
+    overflow-y: scroll;
 }
 
 .maxWidthList {
     width: 100%;
     list-style: none;
     padding: 0;
     margin: 0;
     background-color: white;
@@ -146,16 +146,18 @@ ul {
     width: 100%;
     height: 43px;
     padding-left: 8px;
     list-style-type: none;
     border-bottom: 1px solid #ADAAAD;
     line-height: 43px;
     font-weight: bold;
     color: black;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
 }
 
 .maxWidthList li.message {
     height: auto;
     font-weight: normal;
     line-height: normal;
     padding: 8px;
 }
@@ -176,17 +178,16 @@ ul {
     padding: 10px;
 }
 
 .contactPhoto {
     width: 60px;
     height: 60px;
     vertical-align: middle;
     margin-right: 10px;
-    border: 1px solid #ADAAAD;
 }
 
 #header .contactPhoto {
     width: 30px;
     height: 30px;
 }
 
 .contactDisplayName {
@@ -241,16 +242,18 @@ ul {
     list-style-type: none;
     height: 43px;
     padding: 0 10px;
     border-bottom: 1px solid #ADAAAD;
     line-height: 43px;
     font-weight: bold;
     position: relative;
     color: black;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
 }
 
 .mblListItem.mblVariableHeight {
     line-height: normal;
     height: auto;
     padding: 11px 6px 10px 6px;
 }
 
@@ -271,65 +274,77 @@ ul {
     -webkit-border-bottom-left-radius: 8px;
     -webkit-border-bottom-right-radius: 8px;
     -moz-border-radius-bottomleft: 8px;
     -moz-border-radius-bottomright: 8px;
 }
 
 .maxWidthList li.conv {
     line-height: normal;
-    padding: 8px 0 0 20px;
-    background: transparent url(i/mailIcon.png) center left no-repeat;
+    padding: 8px 0 0 25px;
+    background: transparent url(i/mailIcon.png) 5px 8px no-repeat;
+    height: 52px;
 }
 
 .maxWidthList li.twitter {
-    background: transparent url(i/twitterIcon.png) center left no-repeat;
-    padding-left: 20px;
+    background: transparent url(i/twitterIcon.png) 5px 12px no-repeat;
+    padding-left: 25px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
 }
 
 .maxWidthList li.conv .summary {
     height: auto;
 }
 
 .maxWidthList li .subject {
     display: block;
+    margin-left: 5px;
     margin-right: 45px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
 }
 
 .maxWidthList li .bodyPreview {
     display: block;
+    margin-left: 5px;
     margin-right: 45px;
     font-weight: normal;
     font-size: smaller;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
 }
 
 li .mblArrow {
     position: absolute;
     top: 16px;
-    right: 30px;
+    right: 10px;
     width: 9px;
     height: 13px;
     font-size: 1px;
     border-width: 3px 3px 0px 0px;
     border-color: #808080;
     border-style: none;
     background-image: url(i/gray-arrow.png);
 }
 
+.message .subject:empty {
+    display: none;
+}
 
 .message .subject {
     padding: 8px;
     font-weight: bold;
     font-size: larger;
+    border-bottom: 1px solid #ADAAAD;
+    background-color: #f2f2f2;
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(0, 0, 0, 0.025)), color-stop(1, rgba(0, 0, 0, 0.025)));
+    text-shadow:0 1px 0 #FFFFFF;
 }
 
 .message .from {
     font-weight: bold;
 }
 
 .message .from .date {
     font-weight: normal;
--- a/client/api/contacts.html
+++ b/client/api/contacts.html
@@ -22,17 +22,17 @@
         function ($,        rdapi,   cards,   jig) {
 
             //Initialize the card setup
             cards('#display');
 
             //Set up extra template functions.
             rdapi.addJigFunctions({
                 getPhotoUrl: function (contact) {
-                    var i, identity, url = 'i/face.png';
+                    var i, identity, url = 'i/face2.png';
                     if (contact.identities) {
                         for (i = 0; (identity = contact.identities[i]); i++) {
                             if (identity.image) {
                                 url = identity.image;
                                 break;
                             }
                         }
                     }
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..af46e820cb27248cdbcdd507c256d034e220f44f
GIT binary patch
literal 489
zc$@+00T%v=P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzi%CR5RCwC#mtl^BAP|KMqA?!9`(I7Y
zpsu=oWj1DGD;-9mwCN=J3*mEk3~yA|b(fsN;Az`76B=u+zGN0(pfAwJ0huEoFUvAb
z6W)J6r*%;jcq^q|0QBSHp6@oPF=biGup~f}i#0KO1M0d)wxVkY9OF28Xx6~66r!e0
zVWMyLGz!o>&oStQK)){HjSmJA9Gtj7RBYb6Qimp0$6g>hP|%hMG#B^SL(!ZP`dRiP
zSQCM#^8Gaw1O$5&9SCc{>oCz_j8YUvruo9K6n==mak5J$7Lan04hZ7#Gck2`8W2jb
zKLKJ>pk*|}F!=9~zVAaX4LJ~;GRJlSTEG+rM82Krlqr!I9Ap{|b82jmzZcv4keVUm
zf+H;R)NByS!8@E<N2=YZ^_~M^_Wq2f2({>(CX?<TB6|)*{rT~fa1xJ%p<HdS%qFq2
z{#TqZs2)I7Rjr$-@AH{BHX7AO+TIhH9sr%IUvYPvF;I40#|ty`fAw5|9@L?xX>tLw
f*5;$3s{jK4qa+5RAgGNr00000NkvXXu0mjf=-|)R
index e5c96404ffab81d49d0f7ff2df364f8397deb1c6..30e995024563747fd7b16b0c8b3906d9fd4c92c8
GIT binary patch
literal 18682
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
--- a/client/api/rdapi.html
+++ b/client/api/rdapi.html
@@ -76,18 +76,18 @@
                         if (highlighted.length) {
                             newHighlight = highlighted.prev();
                             if (!newHighlight.hasClass('fullReply')) {
                                 newHighlight = null;
                             }
                         } else {
                             newHighlight = $('#convDisplay .fullReply').first();
                         }
-                    } else if (showingConversation && keyCode === 67) {
-                        //c
+                    } else if (showingConversation && keyCode === 88) {
+                        //x
                         $('.fullConvClose').click();
                         return;
                     }
 
                     //If here is a newHeighlight, make it the new focus
                     if (newHighlight && newHighlight.length) {
                         if (isMessageNav) {
                             newHighlight.click();