Skip to content
Browse files

Bug 822291 - [Status Bar] AM/PM is incorrectly implemented r=kaze

  • Loading branch information...
1 parent 9f17f1a commit 8eb1b3d99491e03d9a19f8460f9b9ac9987118fe @samjoch samjoch committed Jan 8, 2013
Showing with 8 additions and 1 deletion.
  1. +3 −1 apps/system/js/statusbar.js
  2. +5 −0 apps/system/style/statusbar/statusbar.css
View
4 apps/system/js/statusbar.js
@@ -285,7 +285,9 @@ var StatusBar = {
this._clockTimer =
window.setTimeout((this.update.time).bind(this), (59 - sec) * 1000);
- this.icons.time.textContent = f.localeFormat(now, _('shortTimeFormat'));
+ var formated = f.localeFormat(now, _('shortTimeFormat'));
+ formated = formated.replace(/\s?(AM|PM)\s?/i, '<span>$1</span>');
+ this.icons.time.innerHTML = formated;
var label = this.icons.label;
var l10nArgs = JSON.parse(label.dataset.l10nArgs || '{}');
View
5 apps/system/style/statusbar/statusbar.css
@@ -81,6 +81,11 @@ body, html {
bottom: 2px;
}
+#statusbar-time span {
+ margin: 0 0.3rem;
+ font-size: 1rem;
+}
+
#screen.locked #statusbar-time {
display: none;
}

0 comments on commit 8eb1b3d

Please sign in to comment.
Something went wrong with that request. Please try again.