1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-03 18:38:27 +01:00

Remove hard-coding of diff line height

Summary: Fixes T10959. This is the smallest/simplest fix that I could come up with, and I wasn't able to break it. Basically, I removed "line-height" and then adjusted other rules until the defaults looked reasonable again.

Test Plan:
Here's `24px / 48px impact` or something like it:

{F1310445}

{F1310446}

Here's normal stuff working properly without weird artifacts on the highlighting:

{F1310447}

Also tested Firefox and Chrome and got similar results.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: wxm20073527, Korvin

Maniphest Tasks: T10959

Differential Revision: https://secure.phabricator.com/D15905
This commit is contained in:
Chad Little 2016-05-16 09:57:33 -07:00
parent 1567f07e3c
commit 03a1deba23
3 changed files with 22 additions and 28 deletions

View file

@ -7,10 +7,10 @@
*/ */
return array( return array(
'names' => array( 'names' => array(
'core.pkg.css' => 'b7b8d101', 'core.pkg.css' => '204cabae',
'core.pkg.js' => '6972d365', 'core.pkg.js' => '6972d365',
'darkconsole.pkg.js' => 'e7393ebb', 'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '7ba78475', 'differential.pkg.css' => '33da0633',
'differential.pkg.js' => 'd0cd0df6', 'differential.pkg.js' => 'd0cd0df6',
'diffusion.pkg.css' => '91c5d3a6', 'diffusion.pkg.css' => '91c5d3a6',
'diffusion.pkg.js' => '3a9a8bfa', 'diffusion.pkg.js' => '3a9a8bfa',
@ -57,7 +57,7 @@ return array(
'rsrc/css/application/dashboard/dashboard.css' => 'bc6f2127', 'rsrc/css/application/dashboard/dashboard.css' => 'bc6f2127',
'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a', 'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
'rsrc/css/application/differential/add-comment.css' => 'c47f8c40', 'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
'rsrc/css/application/differential/changeset-view.css' => '3e3b0b76', 'rsrc/css/application/differential/changeset-view.css' => '7bcbe615',
'rsrc/css/application/differential/core.css' => '5b7b8ff4', 'rsrc/css/application/differential/core.css' => '5b7b8ff4',
'rsrc/css/application/differential/phui-inline-comment.css' => '5953c28e', 'rsrc/css/application/differential/phui-inline-comment.css' => '5953c28e',
'rsrc/css/application/differential/revision-comment.css' => '14b8565a', 'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
@ -105,7 +105,7 @@ return array(
'rsrc/css/application/uiexample/example.css' => '528b19de', 'rsrc/css/application/uiexample/example.css' => '528b19de',
'rsrc/css/core/core.css' => 'd0801452', 'rsrc/css/core/core.css' => 'd0801452',
'rsrc/css/core/remarkup.css' => '787105d6', 'rsrc/css/core/remarkup.css' => '787105d6',
'rsrc/css/core/syntax.css' => '5101175d', 'rsrc/css/core/syntax.css' => '9fc496d5',
'rsrc/css/core/z-index.css' => '5b6fcf3f', 'rsrc/css/core/z-index.css' => '5b6fcf3f',
'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa', 'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa',
'rsrc/css/font/font-aleo.css' => '8bdb2835', 'rsrc/css/font/font-aleo.css' => '8bdb2835',
@ -550,7 +550,7 @@ return array(
'conpherence-update-css' => 'faf6be09', 'conpherence-update-css' => 'faf6be09',
'conpherence-widget-pane-css' => '775eaaba', 'conpherence-widget-pane-css' => '775eaaba',
'd3' => 'a11a5ff2', 'd3' => 'a11a5ff2',
'differential-changeset-view-css' => '3e3b0b76', 'differential-changeset-view-css' => '7bcbe615',
'differential-core-view-css' => '5b7b8ff4', 'differential-core-view-css' => '5b7b8ff4',
'differential-inline-comment-editor' => '64a5550f', 'differential-inline-comment-editor' => '64a5550f',
'differential-revision-add-comment-css' => 'c47f8c40', 'differential-revision-add-comment-css' => 'c47f8c40',
@ -881,7 +881,7 @@ return array(
'sprite-menu-css' => '9dd65b92', 'sprite-menu-css' => '9dd65b92',
'sprite-tokens-css' => '4f399012', 'sprite-tokens-css' => '4f399012',
'syntax-default-css' => '9923583c', 'syntax-default-css' => '9923583c',
'syntax-highlighting-css' => '5101175d', 'syntax-highlighting-css' => '9fc496d5',
'tokens-css' => '3d0f239e', 'tokens-css' => '3d0f239e',
'typeahead-browse-css' => 'd8581d2c', 'typeahead-browse-css' => 'd8581d2c',
'unhandled-exception-css' => '4c96257a', 'unhandled-exception-css' => '4c96257a',
@ -1148,9 +1148,6 @@ return array(
'javelin-util', 'javelin-util',
'javelin-uri', 'javelin-uri',
), ),
'3e3b0b76' => array(
'phui-inline-comment-view-css',
),
'3f5d6dbf' => array( '3f5d6dbf' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-dom', 'javelin-dom',
@ -1243,9 +1240,6 @@ return array(
'javelin-typeahead-source', 'javelin-typeahead-source',
'javelin-util', 'javelin-util',
), ),
'5101175d' => array(
'syntax-default-css',
),
'519705ea' => array( '519705ea' => array(
'javelin-install', 'javelin-install',
'javelin-dom', 'javelin-dom',
@ -1495,6 +1489,9 @@ return array(
'javelin-stratcom', 'javelin-stratcom',
'javelin-util', 'javelin-util',
), ),
'7bcbe615' => array(
'phui-inline-comment-view-css',
),
'7cbe244b' => array( '7cbe244b' => array(
'javelin-install', 'javelin-install',
'javelin-util', 'javelin-util',
@ -1660,6 +1657,9 @@ return array(
'javelin-dom', 'javelin-dom',
'javelin-vector', 'javelin-vector',
), ),
'9fc496d5' => array(
'syntax-default-css',
),
'a0b57eb8' => array( 'a0b57eb8' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-dom', 'javelin-dom',

View file

@ -60,12 +60,11 @@
vertical-align: top; vertical-align: top;
white-space: pre-wrap; white-space: pre-wrap;
word-wrap: break-word; word-wrap: break-word;
padding: 0 8px 1px; padding: 1px 8px;
line-height: 16px;
} }
.device .differential-diff td { .device .differential-diff td {
padding: 0 4px 1px; padding: 1px 4px;
} }
.device .differential-diff .inline td { .device .differential-diff .inline td {
@ -79,7 +78,7 @@
.differential-diff th { .differential-diff th {
text-align: right; text-align: right;
padding: 2px 6px 0px 0px; padding: 1px 6px 1px 0;
vertical-align: top; vertical-align: top;
background: {$lightbluebackground}; background: {$lightbluebackground};
color: {$bluetext}; color: {$bluetext};
@ -103,11 +102,11 @@
} }
.differential-diff td.old { .differential-diff td.old {
background: #ffd0d0; background: rgba(251, 175, 175, 0.3);
} }
.differential-diff td.new { .differential-diff td.new {
background: #d0ffd0; background: rgba(151, 234, 151, .3);
} }
.differential-diff td.old-rebase { .differential-diff td.old-rebase {
@ -120,12 +119,12 @@
.differential-diff td.old-full, .differential-diff td.old-full,
.differential-diff td.old span.bright { .differential-diff td.old span.bright {
background: #ffaaaa; background: rgba(251, 175, 175, 0.8);
} }
.differential-diff td.new-full, .differential-diff td.new-full,
.differential-diff td.new span.bright { .differential-diff td.new span.bright {
background: #aaffaa; background: rgba(151, 234, 151, .8);
} }
.differential-diff td.copy { .differential-diff td.copy {

View file

@ -7,17 +7,12 @@
} }
.remarkup-code .over-the-line { .remarkup-code .over-the-line {
color: #aa0066; color: #aa0066;
margin-right: 1px; margin-right: 1px;
} }
.remarkup-code td > span, .remarkup-code td span {
.remarkup-code td > span > span { display: inline-block;
padding: 1px 0 3px;
}
.remarkup-code span.bright {
border-bottom: 1px solid transparent;
} }
.remarkup-code .rbw_r { color: red; } .remarkup-code .rbw_r { color: red; }