Merge pull request #26413 from pivanov/bug-1091719

Bug 1091719 - When setting a new alarm the header text is not centered
mozilla-b2g · Nov 28, 2014 · 17d782b · 17d782b
2 parents 6596ec0 + 7a0989b
commit 17d782b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/apps/clock/style/alarm.css b/apps/clock/style/alarm.css
@@ -83,15 +83,19 @@ ul.compact li label:active {
  * change when we get `:host` and `:content` selectors
  * in shadow-dom.
  */
+
+section[role="region"] > gaia-header h1.edit-alarm-title {
+  display: block !important; /* 1 */
+}
 section[role="region"] > gaia-header h1.new-alarm-title {
   display: none !important; /* 1 */
 }
-section[role="region"].new > gaia-header h1.new-alarm-title {
-  display: flex !important; /* 1 */
-}
 section[role="region"].new > gaia-header h1.edit-alarm-title {
   display: none !important; /* 1 */
 }
+section[role="region"].new > gaia-header h1.new-alarm-title {
+  display: block !important; /* 1 */
+}
 
 /* ----------- Alarm List ---------- */
 #alarms {
@@ -308,7 +312,7 @@ html[dir=rtl] #alarms .alarmEnable {
 html[dir=rtl] a.alarm-item > .time {
   left: auto;
   right: 1.7rem;
-  
+
 }
 html[dir=rtl] a.alarm-item > .label {
   left: 4.5rem;
@@ -319,7 +323,7 @@ html[dir=rtl] a.alarm-item > .repeat {
   right: 1.7rem;
 }
 html[dir=rtl] a.alarm-item > .repeat {
-  left: auto;  
+  left: auto;
   right: 1.7rem;
 }
 html[dir=rtl] #alarms .alarmEnable input[type="checkbox"] + span {

diff --git a/build/csslint/xfail.list b/build/csslint/xfail.list
@@ -14,7 +14,7 @@ apps/camera/style/overlay.css 0 4
 apps/camera/style/preview-gallery.css 0 2
 apps/clock/style/onring.css 0 1
 apps/clock/style/picker/picker.css 0 1
-apps/clock/style/alarm.css 0 3
+apps/clock/style/alarm.css 0 4
 apps/communications/contacts/style/app.css 0 5
 apps/communications/contacts/style/contacts.css 0 6
 apps/communications/contacts/style/matching_contacts.css 0 3