From 2509c6b0f57dc533607fb6811adc02529b0d6fd8 Mon Sep 17 00:00:00 2001 From: lkassianik Date: Sun, 13 Apr 2014 08:18:16 -0700 Subject: [PATCH] Fixing z-index on calendar date badges. Summary: Fixes T4787, decreased z-index on calendar badges so that they don't sit on top of notification dropdowns when dropdowns are expanded. Not sure why the badges had z-index 10, but please let me know if there was a more substantial reason for this. Test Plan: If neither notification dropdowns have content, create enough messages to populate at least 5 rows, open calendar, expand messages dropdown, verify that underlying calendar date badges do not appear over the dropdown. Reviewers: chad, #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: epriestley, Korvin Maniphest Tasks: T4787 Differential Revision: https://secure.phabricator.com/D8770 --- resources/celerity/map.php | 10 +++++----- webroot/rsrc/css/core/z-index.css | 8 ++++++-- webroot/rsrc/css/phui/calendar/phui-calendar-month.css | 1 - 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 0f6f536ff3..b2ec6fd5ea 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ return array( 'names' => array( - 'core.pkg.css' => '232fd038', + 'core.pkg.css' => '030f12e5', 'core.pkg.js' => '417722ff', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => '12c11318', @@ -113,7 +113,7 @@ return array( 'rsrc/css/core/core.css' => 'da26ddb2', 'rsrc/css/core/remarkup.css' => '0923dbd6', 'rsrc/css/core/syntax.css' => '3c18c1cb', - 'rsrc/css/core/z-index.css' => 'edd5911b', + 'rsrc/css/core/z-index.css' => '0d89d53c', 'rsrc/css/diviner/diviner-shared.css' => '38813222', 'rsrc/css/font/font-source-sans-pro.css' => '225851dd', 'rsrc/css/layout/phabricator-action-header-view.css' => 'c14dfc57', @@ -125,7 +125,7 @@ return array( 'rsrc/css/layout/phabricator-source-code-view.css' => '62a99814', 'rsrc/css/phui/calendar/phui-calendar-day.css' => 'de035c8a', 'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1d0ca59', - 'rsrc/css/phui/calendar/phui-calendar-month.css' => '5e762971', + 'rsrc/css/phui/calendar/phui-calendar-month.css' => 'a92e47d2', 'rsrc/css/phui/calendar/phui-calendar.css' => '5e1ad989', 'rsrc/css/phui/phui-box.css' => 'a36cf3a5', 'rsrc/css/phui/phui-button.css' => '653ac588', @@ -729,7 +729,7 @@ return array( 'phabricator-uiexample-reactor-select' => '189e4fe3', 'phabricator-uiexample-reactor-sendclass' => 'bf97561d', 'phabricator-uiexample-reactor-sendproperties' => '551add57', - 'phabricator-zindex-css' => 'edd5911b', + 'phabricator-zindex-css' => '0d89d53c', 'phame-css' => '450826e1', 'pholio-css' => '2fa97dbe', 'pholio-edit-css' => 'b9e59b6d', @@ -743,7 +743,7 @@ return array( 'phui-calendar-css' => '5e1ad989', 'phui-calendar-day-css' => 'de035c8a', 'phui-calendar-list-css' => 'c1d0ca59', - 'phui-calendar-month-css' => '5e762971', + 'phui-calendar-month-css' => 'a92e47d2', 'phui-document-view-css' => '3b078dc0', 'phui-feed-story-css' => '3a59c2cf', 'phui-fontkit-css' => 'de84aa4a', diff --git a/webroot/rsrc/css/core/z-index.css b/webroot/rsrc/css/core/z-index.css index 5f9ed6d675..3c69073831 100644 --- a/webroot/rsrc/css/core/z-index.css +++ b/webroot/rsrc/css/core/z-index.css @@ -38,6 +38,10 @@ z-index: 3; } +.phabricator-crumbs-view { + z-index: 3; +} + .phabricator-nav-local { z-index: 4; } @@ -67,8 +71,8 @@ z-index: 5; } -.phabricator-crumbs-view { - z-index: 3; +.phui-calendar-date-number { + z-index: 5; } .phabricator-main-menu { diff --git a/webroot/rsrc/css/phui/calendar/phui-calendar-month.css b/webroot/rsrc/css/phui/calendar/phui-calendar-month.css index 252b3382cd..c3abbb131c 100644 --- a/webroot/rsrc/css/phui/calendar/phui-calendar-month.css +++ b/webroot/rsrc/css/phui/calendar/phui-calendar-month.css @@ -51,7 +51,6 @@ table.phui-calendar-view td.phui-calendar-month-weekstart { text-align: center; top: 0; right: 0; - z-index: 10; } .phui-calendar-not-work-day {