From 0bb5dd88c87d9031656cb572298789dd6ffa430e Mon Sep 17 00:00:00 2001 From: Chad Little Date: Tue, 2 Aug 2016 11:22:53 -0700 Subject: [PATCH] Always pre-wrap code blocks Summary: Fixes T11416. Unclear what the side-effects of this would be, so bark if you find something. Previously, we'd have to overflow and scroll, which is kind of a pain since you're hiding content on long code blocks. This just wraps long lines, and preserves line breaks globally. Test Plan: Test feed, profile, comments, inline comments, triple backticks. Reviewers: avivey, epriestley Reviewed By: avivey, epriestley Subscribers: Korvin Maniphest Tasks: T11416 Differential Revision: https://secure.phabricator.com/D16361 --- resources/celerity/map.php | 10 +++++----- webroot/rsrc/css/application/project/project-view.css | 4 ---- webroot/rsrc/css/core/remarkup.css | 1 + 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 83064c28a5..59e56c83fa 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'f3021640', + 'core.pkg.css' => '6b69c820', 'core.pkg.js' => 'b562c3db', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '3fb7f532', @@ -94,7 +94,7 @@ return array( 'rsrc/css/application/policy/policy.css' => '957ea14c', 'rsrc/css/application/ponder/ponder-view.css' => 'fbd45f96', 'rsrc/css/application/project/project-card-view.css' => '9418c97d', - 'rsrc/css/application/project/project-view.css' => 'cbaa10a1', + 'rsrc/css/application/project/project-view.css' => '9ce99f21', 'rsrc/css/application/releeph/releeph-core.css' => '9b3c5733', 'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5', 'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd', @@ -105,7 +105,7 @@ return array( 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 'rsrc/css/application/uiexample/example.css' => '528b19de', 'rsrc/css/core/core.css' => 'd0801452', - 'rsrc/css/core/remarkup.css' => '523d34bb', + 'rsrc/css/core/remarkup.css' => '5ed06ed8', 'rsrc/css/core/syntax.css' => '769d3498', 'rsrc/css/core/z-index.css' => '5b6fcf3f', 'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa', @@ -793,7 +793,7 @@ return array( 'phabricator-object-selector-css' => '85ee8ce6', 'phabricator-phtize' => 'd254d646', 'phabricator-prefab' => 'cfd23f37', - 'phabricator-remarkup-css' => '523d34bb', + 'phabricator-remarkup-css' => '5ed06ed8', 'phabricator-search-results-css' => '7dea472c', 'phabricator-shaped-request' => '7cbe244b', 'phabricator-slowvote-css' => 'a94b7230', @@ -884,7 +884,7 @@ return array( 'policy-transaction-detail-css' => '82100a43', 'ponder-view-css' => 'fbd45f96', 'project-card-view-css' => '9418c97d', - 'project-view-css' => 'cbaa10a1', + 'project-view-css' => '9ce99f21', 'releeph-core' => '9b3c5733', 'releeph-preview-branch' => 'b7a6f4a5', 'releeph-request-differential-create-dialog' => '8d8b92cd', diff --git a/webroot/rsrc/css/application/project/project-view.css b/webroot/rsrc/css/application/project/project-view.css index 0af3ef3490..2c0fd7d6d8 100644 --- a/webroot/rsrc/css/application/project/project-view.css +++ b/webroot/rsrc/css/application/project/project-view.css @@ -91,7 +91,3 @@ .profile-no-badges { padding: 24px 0; } - -.project-view-home .phabricator-remarkup .remarkup-code-block pre { - white-space: pre-wrap; -} diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css index 034c5a83c6..42d1d86597 100644 --- a/webroot/rsrc/css/core/remarkup.css +++ b/webroot/rsrc/css/core/remarkup.css @@ -51,6 +51,7 @@ overflow: auto; padding: 12px; border-radius: 3px; + white-space: pre-wrap; } .phabricator-remarkup pre.remarkup-counterexample {