Merge pull request #14059 from rexboy7/fix-bug928597

Bug 928597 - [Dialer][CDMA] Show switch call text in proper font size(cherry picked from commit 77420f0)
mozilla-b2g · Dec 4, 2013 · 3507154 · 3507154
1 parent 2f6e3ae
commit 3507154
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/apps/communications/dialer/js/handled_call.js b/apps/communications/dialer/js/handled_call.js
@@ -102,6 +102,7 @@ HandledCall.prototype.updateCallNumber = function hc_updateCallNumber() {
       self._cachedInfo = _('switch-calls');
       self._cachedAdditionalInfo = '';
       self.replaceAdditionalContactInfo('');
+      self.numberNode.style.fontSize = '';
     });
     return;
   }

diff --git a/apps/communications/dialer/style/oncall.css b/apps/communications/dialer/style/oncall.css
@@ -371,7 +371,6 @@
 
   #calls.switch > section .switch-calls {
     display: block;
-    background: #01c5ed;
     height: 8.0rem;
     width: auto;
     float: right;
@@ -413,7 +412,8 @@
   }
 
   #calls.big-duration > section .numberWrapper,
-  #calls.big-duration > section .additionalContactInfo {
+  #calls.big-duration > section .additionalContactInfo,
+  #calls.big-duration > section .switch-calls {
     background: #01c5ed;
   }
 
@@ -524,7 +524,9 @@
     background-repeat: no-repeat;
   }
 
-  #calls > section.held {
+  #calls > section.held,
+  #calls.big-duration > section.held .switch-calls,
+  #calls.big-duration > section.ended .switch-calls {
     background-color: rgba(28, 24, 24, 0.7);
   }