From 3651202ac65d73b10dd975bebc01f4e2d6b3ab61 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Wed, 4 Nov 2015 13:30:01 -0800 Subject: [PATCH] Fix CSS Remarkup rule bleed Summary: This margin rule is bleeding in some cases where we wrap `phabricator-remarkup` around a large amount of other content (like Dialogs). This restricts the rule to the first direct child. Test Plan: Go to a workboard, edit a task, see proper alignment of icons. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D14406 --- resources/celerity/map.php | 6 +++--- webroot/rsrc/css/core/remarkup.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 910e623e57..7e6537d311 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'a79276eb', + 'core.pkg.css' => '80728a82', 'core.pkg.js' => '47dc9ebb', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '2de124c9', @@ -104,7 +104,7 @@ return array( 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 'rsrc/css/application/uiexample/example.css' => '528b19de', 'rsrc/css/core/core.css' => '78e8d7ea', - 'rsrc/css/core/remarkup.css' => '82f4e4c5', + 'rsrc/css/core/remarkup.css' => '2cdbf272', 'rsrc/css/core/syntax.css' => '9fd11da8', 'rsrc/css/core/z-index.css' => '57ddcaa2', 'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa', @@ -740,7 +740,7 @@ return array( 'phabricator-object-selector-css' => '85ee8ce6', 'phabricator-phtize' => 'd254d646', 'phabricator-prefab' => '6920d200', - 'phabricator-remarkup-css' => '82f4e4c5', + 'phabricator-remarkup-css' => '2cdbf272', 'phabricator-search-results-css' => '7dea472c', 'phabricator-shaped-request' => '7cbe244b', 'phabricator-side-menu-view-css' => 'bec2458e', diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css index 8da6c4e2f0..125680fe92 100644 --- a/webroot/rsrc/css/core/remarkup.css +++ b/webroot/rsrc/css/core/remarkup.css @@ -363,7 +363,7 @@ body div.phabricator-remarkup.remarkup-has-toc padding-top: 0; } -body .phabricator-remarkup *:first-child, +body .phabricator-remarkup > *:first-child, body .phabricator-remarkup .remarkup-header + * { margin-top: 0; }