Merge pull request #10805 from evanxd/bug-881137-images

Bug 881137 - hdpi/xhdpi resolution assets and layout for Calendar app
mozilla-b2g · Jul 14, 2013 · d31a5b2 · d31a5b2
2 parents 6724eb7 + 1192065
commit d31a5b2
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 1 deletion.
diff --git a/apps/calendar/style/building_blocks/input_areas/images/icons/clear@1.5x.png b/apps/calendar/style/building_blocks/input_areas/images/icons/clear@1.5x.png
diff --git a/apps/calendar/style/calendar.css b/apps/calendar/style/calendar.css
@@ -9,6 +9,7 @@ html, body {
   margin: 0;
   padding: 0;
   height: 100%;
+  line-height: 100%;
   overflow: hidden;
 }
 

diff --git a/apps/calendar/style/day_views.css b/apps/calendar/style/day_views.css
@@ -159,7 +159,7 @@
 #day-view .day-events {
   overflow-y: scroll;
   overflow-x: hidden;
-  height: 80%;
+  height: calc(100% - 7.9rem);
 }
 
 #day-view .day-events.allday {

diff --git a/apps/calendar/style/icons/60/Calendar@1.5x.png b/apps/calendar/style/icons/60/Calendar@1.5x.png
diff --git a/apps/calendar/style/icons/Calendar@1.5x.png b/apps/calendar/style/icons/Calendar@1.5x.png
diff --git a/apps/calendar/style/icons/checkmark@1.5x.png b/apps/calendar/style/icons/checkmark@1.5x.png
diff --git a/apps/calendar/style/icons/settings@1.5x.png b/apps/calendar/style/icons/settings@1.5x.png
diff --git a/apps/calendar/style/icons/update@1.5x.png b/apps/calendar/style/icons/update@1.5x.png