Bug 1151925 - merge pull request #29384 from sfoster:bidi-urlbar-bug-…

…1151925 to mozilla-b2g:master
mozilla-b2g · Apr 10, 2015 · 2e3668c · 2e3668c
2 parents 89ffba6 + 8e3ceb7
commit 2e3668c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/apps/system/js/app_chrome.js b/apps/system/js/app_chrome.js
@@ -117,7 +117,9 @@
                         data-l10n-id="forward-button" disabled></button>
                 <div class="urlbar js-chrome-ssl-information">
                   <span class="pb-icon"></span>
-                  <div class="title chrome-ssl-indicator"></div>
+                  <div class="chrome-ssl-indicator chrome-title-container">
+                    <span class="title" dir="auto"></span>
+                  </div>
                   <button type="button" class="reload-button"
                           data-l10n-id="reload-button" disabled></button>
                   <button type="button" class="stop-button"

diff --git a/apps/system/js/card.js b/apps/system/js/card.js
@@ -89,7 +89,7 @@
     // https://github.com/jshint/jshint/issues/2000
     /* jshint -W033 */
     return Tagged.escapeHTML `<div class="titles">
-     <h1 id="${this.titleId}" class="title">${this.title}</h1>
+     <h1 id="${this.titleId}" dir="auto" class="title">${this.title}</h1>
      <p class="subtitle">
       <span class="subtitle-url">${this.subTitle}</span>
      </p>

diff --git a/apps/system/style/chrome/chrome.css b/apps/system/style/chrome/chrome.css
@@ -149,22 +149,27 @@
   background-color: rgba(204, 204, 204, 0.2);
 }
 
-.chrome-combined .title {
+.chrome-combined .chrome-title-container {
   width: calc(100% - 3.2rem);
   padding-top: 0;
   padding-bottom: 0;
   -moz-padding-start: 1.45rem;
   -moz-padding-end: 0.8rem;
   box-sizing: padding-box;
   overflow: hidden;
-  white-space: nowrap;
-  font-weight: 300;
-  font-size: 1.8rem;
   float: none;
   background-color: rgba(204,204,204,0.2);
   border-radius: 1.8rem;
-  text-overflow: ellipsis;
+}
+
+.chrome-combined .title {
+  overflow: hidden;
+  white-space: nowrap;
+  font-weight: 300;
+  font-size: 1.8rem;
   font-style: italic;
+  text-overflow: ellipsis;
+  display: block;
 }
 
 .search-app .chrome.maximized .controls .urlbar:after {
@@ -180,11 +185,11 @@
   background-position: center right;
 }
 
-.appWindow.light .chrome-combined:not(.maximized) .title {
+.appWindow.light .chrome-combined:not(.maximized) .chrome-title-container {
   background-color: rgba(204,204,204,0.4);
 }
 
-.chrome-combined.maximized .title {
+.chrome-combined.maximized .chrome-title-container {
   background-color: transparent;
 }
 
@@ -243,7 +248,8 @@
 
 
 /* Private browser icon in rocketbar */
-.appWindow.private > .chrome.maximized .title {
+.appWindow.private > .chrome-plain.maximized .title,
+.appWindow.private > .chrome-combined.maximized .chrome-title-container {
   -moz-padding-start: 4rem;
 }