2011-01-25 20:31:40 +01:00
|
|
|
/**
|
|
|
|
* @provides differential-changeset-view-css
|
|
|
|
*/
|
|
|
|
|
2011-06-10 17:34:17 +02:00
|
|
|
.differential-changeset {
|
|
|
|
position: relative;
|
2012-12-13 06:00:35 +01:00
|
|
|
margin: 0;
|
2013-10-28 16:26:41 +01:00
|
|
|
padding-top: 32px;
|
2013-12-30 22:22:00 +01:00
|
|
|
overflow-x: auto;
|
2011-06-10 17:34:17 +02:00
|
|
|
}
|
|
|
|
|
2014-04-03 06:49:28 +02:00
|
|
|
.device-phone .differential-changeset {
|
|
|
|
overflow-x: scroll;
|
2014-04-04 03:02:55 +02:00
|
|
|
-webkit-overflow-scrolling: touch;
|
2014-04-03 06:49:28 +02:00
|
|
|
}
|
|
|
|
|
2011-01-25 20:31:40 +01:00
|
|
|
.differential-diff {
|
2013-12-30 22:22:00 +01:00
|
|
|
background: #fff;
|
2013-09-29 00:55:38 +02:00
|
|
|
width: 100%;
|
2013-10-14 22:12:36 +02:00
|
|
|
border-top: 1px solid {$lightblueborder};
|
|
|
|
border-bottom: 1px solid {$lightblueborder};
|
Break long words in differential two-up view
Summary: This should prevent long lines from making the code width different between files, which can be annoying. (And of course, it stops long lines from making a giant scrollbar too.)
Test Plan:
Loaded this diff in Chrome, Firefox, IE9, and IE8:
{F137505}
(That's a screenshot from Chrome, but it looks about the same in the other browsers.)
Reviewers: chad, #blessed_reviewers, epriestley
Reviewed By: #blessed_reviewers, epriestley
Subscribers: epriestley, Korvin, chad
Maniphest Tasks: T2004
Differential Revision: https://secure.phabricator.com/D8686
2014-04-03 18:37:49 +02:00
|
|
|
table-layout: fixed;
|
|
|
|
}
|
|
|
|
|
2015-03-05 23:01:52 +01:00
|
|
|
.differential-diff.diff-2up {
|
|
|
|
min-width: 780px;
|
|
|
|
}
|
|
|
|
|
Break long words in differential two-up view
Summary: This should prevent long lines from making the code width different between files, which can be annoying. (And of course, it stops long lines from making a giant scrollbar too.)
Test Plan:
Loaded this diff in Chrome, Firefox, IE9, and IE8:
{F137505}
(That's a screenshot from Chrome, but it looks about the same in the other browsers.)
Reviewers: chad, #blessed_reviewers, epriestley
Reviewed By: #blessed_reviewers, epriestley
Subscribers: epriestley, Korvin, chad
Maniphest Tasks: T2004
Differential Revision: https://secure.phabricator.com/D8686
2014-04-03 18:37:49 +02:00
|
|
|
.differential-diff col.num {
|
|
|
|
width: 45px;
|
|
|
|
}
|
|
|
|
|
2015-03-05 23:01:52 +01:00
|
|
|
.device .differential-diff.diff-1up col.num {
|
|
|
|
width: 32px;
|
|
|
|
}
|
|
|
|
|
|
|
|
.differential-diff.diff-2up col.left,
|
|
|
|
.differential-diff.diff-2up col.right {
|
Break long words in differential two-up view
Summary: This should prevent long lines from making the code width different between files, which can be annoying. (And of course, it stops long lines from making a giant scrollbar too.)
Test Plan:
Loaded this diff in Chrome, Firefox, IE9, and IE8:
{F137505}
(That's a screenshot from Chrome, but it looks about the same in the other browsers.)
Reviewers: chad, #blessed_reviewers, epriestley
Reviewed By: #blessed_reviewers, epriestley
Subscribers: epriestley, Korvin, chad
Maniphest Tasks: T2004
Differential Revision: https://secure.phabricator.com/D8686
2014-04-03 18:37:49 +02:00
|
|
|
width: 49.25%;
|
|
|
|
}
|
|
|
|
|
2015-03-05 23:11:36 +01:00
|
|
|
.differential-diff.diff-1up col.unified {
|
|
|
|
width: 99.5%;
|
|
|
|
}
|
|
|
|
|
Break long words in differential two-up view
Summary: This should prevent long lines from making the code width different between files, which can be annoying. (And of course, it stops long lines from making a giant scrollbar too.)
Test Plan:
Loaded this diff in Chrome, Firefox, IE9, and IE8:
{F137505}
(That's a screenshot from Chrome, but it looks about the same in the other browsers.)
Reviewers: chad, #blessed_reviewers, epriestley
Reviewed By: #blessed_reviewers, epriestley
Subscribers: epriestley, Korvin, chad
Maniphest Tasks: T2004
Differential Revision: https://secure.phabricator.com/D8686
2014-04-03 18:37:49 +02:00
|
|
|
.differential-diff col.copy {
|
|
|
|
width: 0.5%;
|
|
|
|
}
|
|
|
|
|
|
|
|
.differential-diff col.cov {
|
|
|
|
width: 1%;
|
2011-01-25 20:31:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
.differential-diff td {
|
|
|
|
vertical-align: top;
|
2012-12-06 20:33:04 +01:00
|
|
|
white-space: pre-wrap;
|
Break long words in differential two-up view
Summary: This should prevent long lines from making the code width different between files, which can be annoying. (And of course, it stops long lines from making a giant scrollbar too.)
Test Plan:
Loaded this diff in Chrome, Firefox, IE9, and IE8:
{F137505}
(That's a screenshot from Chrome, but it looks about the same in the other browsers.)
Reviewers: chad, #blessed_reviewers, epriestley
Reviewed By: #blessed_reviewers, epriestley
Subscribers: epriestley, Korvin, chad
Maniphest Tasks: T2004
Differential Revision: https://secure.phabricator.com/D8686
2014-04-03 18:37:49 +02:00
|
|
|
word-wrap: break-word;
|
2011-01-25 20:31:40 +01:00
|
|
|
padding: 0 8px 1px;
|
|
|
|
line-height: 16px;
|
|
|
|
}
|
|
|
|
|
2015-03-05 23:01:52 +01:00
|
|
|
.device .differential-diff td {
|
|
|
|
padding: 0 4px 1px;
|
|
|
|
}
|
|
|
|
|
2014-04-09 02:55:48 +02:00
|
|
|
.differential-diff td .zwsp {
|
|
|
|
position: absolute;
|
|
|
|
width: 0;
|
|
|
|
}
|
|
|
|
|
2011-01-25 20:31:40 +01:00
|
|
|
.differential-diff th {
|
|
|
|
text-align: right;
|
2012-12-06 20:33:04 +01:00
|
|
|
padding: 2px 6px 0px 0px;
|
2011-01-25 20:31:40 +01:00
|
|
|
vertical-align: top;
|
2013-09-29 00:55:38 +02:00
|
|
|
background: {$lightbluebackground};
|
|
|
|
color: {$bluetext};
|
2012-04-11 00:00:09 +02:00
|
|
|
cursor: pointer;
|
2013-09-29 00:55:38 +02:00
|
|
|
border-right: 1px solid {$thinblueborder};
|
2011-01-25 20:31:40 +01:00
|
|
|
overflow: hidden;
|
Use "user-select: none" to provide a visual cue about copy/paste JS magic
Summary:
- For line numbers, use "user-select: none" to make them unselectable. This provides a stronger visual cue that copy/paste is enchanted.
- In Paste, make it look sensible again after the blame-on-blame refactor in Diffusion. See also TODO to share this code formally.
- In Diffusion, use the "phabricator-oncopy" behavior.
NOTE: I left blame/commit columns selectable in Diffusion, since you might reasonably want to copy/paste them?
NOTE: In Differential, the left side of the diff still highlights, even though it will be copied only if you select part of a line on the left and nothing else. But this seemed like a reasonable behavior, so I left it.
Test Plan:
- Looked at Paste. Saw a nice line number column. Selected text, got the expected selection. Copied text, got the expected copy.
- Looked at Diffusion. Saw a nice line number column, still. Selected text, got expected selection. Copied text, got expected copy.
- Looked at Differential. Highlighted stuff, got expected results. Copied stuff, got expected results.
Reviewers: btrahan, vrana, jungejason
Reviewed By: vrana
CC: aran
Maniphest Tasks: T1123
Differential Revision: https://secure.phabricator.com/D2242
2012-04-17 00:55:16 +02:00
|
|
|
|
|
|
|
-moz-user-select: -moz-none;
|
|
|
|
-khtml-user-select: none;
|
|
|
|
-webkit-user-select: none;
|
|
|
|
-ms-user-select: none;
|
|
|
|
user-select: none;
|
2011-01-25 20:31:40 +01:00
|
|
|
}
|
|
|
|
|
2015-03-07 21:19:45 +01:00
|
|
|
.differential-diff th.selected {
|
|
|
|
background: {$hovergrey};
|
|
|
|
}
|
|
|
|
|
2012-04-11 00:00:09 +02:00
|
|
|
.differential-changeset-immutable .differential-diff th {
|
|
|
|
cursor: auto;
|
|
|
|
}
|
|
|
|
|
2011-01-25 20:31:40 +01:00
|
|
|
.differential-diff td.old {
|
2013-10-14 22:12:36 +02:00
|
|
|
background: #ffd0d0;
|
2011-01-25 20:31:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
.differential-diff td.new {
|
2013-10-14 22:12:36 +02:00
|
|
|
background: #d0ffd0;
|
2011-01-25 20:31:40 +01:00
|
|
|
}
|
|
|
|
|
2012-06-15 09:53:26 +02:00
|
|
|
.differential-diff td.old-rebase {
|
|
|
|
background: #ffeeee;
|
|
|
|
}
|
|
|
|
|
|
|
|
.differential-diff td.new-rebase {
|
|
|
|
background: #eeffee;
|
|
|
|
}
|
|
|
|
|
2011-01-25 20:31:40 +01:00
|
|
|
.differential-diff td.old-full,
|
|
|
|
.differential-diff td.old span.bright {
|
|
|
|
background: #ffaaaa;
|
|
|
|
}
|
|
|
|
|
2012-05-05 02:41:06 +02:00
|
|
|
.differential-diff td.new-full,
|
|
|
|
.differential-diff td.new span.bright {
|
|
|
|
background: #aaffaa;
|
2012-04-30 06:35:43 +02:00
|
|
|
}
|
|
|
|
|
2012-05-05 02:41:06 +02:00
|
|
|
.differential-diff td.copy {
|
2012-12-07 21:37:11 +01:00
|
|
|
min-width: 0.5%;
|
|
|
|
width: 0.5%;
|
2012-05-05 02:41:06 +02:00
|
|
|
padding: 0;
|
2012-05-05 02:41:06 +02:00
|
|
|
}
|
|
|
|
|
2012-05-05 02:41:06 +02:00
|
|
|
.differential-diff td.new-copy,
|
|
|
|
.differential-diff td.new-copy span.bright {
|
2013-10-23 22:35:20 +02:00
|
|
|
background: {$lightyellow};
|
2012-05-05 02:41:06 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
.differential-diff td.new-move,
|
|
|
|
.differential-diff td.new-move span.bright {
|
2013-10-23 22:35:20 +02:00
|
|
|
background: {$yellow};
|
2011-01-25 20:31:40 +01:00
|
|
|
}
|
|
|
|
|
2012-03-15 00:45:40 +01:00
|
|
|
.differential-diff td.comment {
|
|
|
|
background: #dddddd;
|
|
|
|
}
|
|
|
|
|
Show coverage information in Differential
Summary:
Render coverage information in the right gutter, if available.
We could render some kind of summary report deal too but this seems like a good
start.
Test Plan:
- Looked at diffs with coverage.
- Looked at diffs without coverage.
- Used inline comments, diff-of-diff, "show more", "show entire file", "show
generated file", "undo". Nothing seemed disrupted by the addition of a 5th
column.
Reviewers: btrahan, tuomaspelkonen, jungejason
Reviewed By: btrahan
CC: zeeg, aran, epriestley
Maniphest Tasks: T140
Differential Revision: https://secure.phabricator.com/D1527
2012-01-31 21:07:47 +01:00
|
|
|
.differential-diff td.cov {
|
|
|
|
padding: 0;
|
|
|
|
}
|
|
|
|
|
Provide a rough, unstable API for reporting coverage into Diffusion
Summary:
Ref T4994. This stuff works:
- You can dump a blob of coverage information into `diffusion.updatecoverage`. This wipes existing coverage information and replaces it.
- It shows up when viewing files.
- It shows up when viewing commits.
This stuff does not work:
- When viewing files, the Javascript hover interaction isn't tied in yet.
- We always show this information, even if you're behind the commit where it was generated.
- You can't do incremental updates.
- There's no aggregation at the file (this file has 90% coverage), diff (the changes in this commit are 90% covered), or directory (the code in this directory has 90% coverage) levels yet.
- This is probably not the final form of the UI, storage, or API, so you should expect occasional changes over time. I've marked the method as "Unstable" for now.
Test Plan:
- Ran `save_lint.php` to check for collateral damage; it worked fine.
- Ran `save_lint.php` on a new branch to check creation.
- Published some fake coverage information.
- Viewed an affected commit.
- Viewed an affected file.
{F151915}
{F151916}
Reviewers: chad, btrahan
Reviewed By: btrahan
Subscribers: jhurwitz, epriestley, zeeg
Maniphest Tasks: T5044, T4994
Differential Revision: https://secure.phabricator.com/D9022
2014-05-18 01:10:54 +02:00
|
|
|
.diffusion-source td.cov {
|
|
|
|
padding: 0 8px;
|
|
|
|
}
|
|
|
|
|
Show coverage information in Differential
Summary:
Render coverage information in the right gutter, if available.
We could render some kind of summary report deal too but this seems like a good
start.
Test Plan:
- Looked at diffs with coverage.
- Looked at diffs without coverage.
- Used inline comments, diff-of-diff, "show more", "show entire file", "show
generated file", "undo". Nothing seemed disrupted by the addition of a 5th
column.
Reviewers: btrahan, tuomaspelkonen, jungejason
Reviewed By: btrahan
CC: zeeg, aran, epriestley
Maniphest Tasks: T140
Differential Revision: https://secure.phabricator.com/D1527
2012-01-31 21:07:47 +01:00
|
|
|
td.cov-U {
|
2012-03-13 04:04:12 +01:00
|
|
|
background: #dd8866;
|
Show coverage information in Differential
Summary:
Render coverage information in the right gutter, if available.
We could render some kind of summary report deal too but this seems like a good
start.
Test Plan:
- Looked at diffs with coverage.
- Looked at diffs without coverage.
- Used inline comments, diff-of-diff, "show more", "show entire file", "show
generated file", "undo". Nothing seemed disrupted by the addition of a 5th
column.
Reviewers: btrahan, tuomaspelkonen, jungejason
Reviewed By: btrahan
CC: zeeg, aran, epriestley
Maniphest Tasks: T140
Differential Revision: https://secure.phabricator.com/D1527
2012-01-31 21:07:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
td.cov-C {
|
2012-03-13 04:04:12 +01:00
|
|
|
background: #66bbff;
|
Show coverage information in Differential
Summary:
Render coverage information in the right gutter, if available.
We could render some kind of summary report deal too but this seems like a good
start.
Test Plan:
- Looked at diffs with coverage.
- Looked at diffs without coverage.
- Used inline comments, diff-of-diff, "show more", "show entire file", "show
generated file", "undo". Nothing seemed disrupted by the addition of a 5th
column.
Reviewers: btrahan, tuomaspelkonen, jungejason
Reviewed By: btrahan
CC: zeeg, aran, epriestley
Maniphest Tasks: T140
Differential Revision: https://secure.phabricator.com/D1527
2012-01-31 21:07:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
td.cov-N {
|
|
|
|
background: #ddeeff;
|
|
|
|
}
|
|
|
|
|
|
|
|
td.cov-X {
|
|
|
|
background: #aa00aa;
|
|
|
|
}
|
|
|
|
|
Provide a rough, unstable API for reporting coverage into Diffusion
Summary:
Ref T4994. This stuff works:
- You can dump a blob of coverage information into `diffusion.updatecoverage`. This wipes existing coverage information and replaces it.
- It shows up when viewing files.
- It shows up when viewing commits.
This stuff does not work:
- When viewing files, the Javascript hover interaction isn't tied in yet.
- We always show this information, even if you're behind the commit where it was generated.
- You can't do incremental updates.
- There's no aggregation at the file (this file has 90% coverage), diff (the changes in this commit are 90% covered), or directory (the code in this directory has 90% coverage) levels yet.
- This is probably not the final form of the UI, storage, or API, so you should expect occasional changes over time. I've marked the method as "Unstable" for now.
Test Plan:
- Ran `save_lint.php` to check for collateral damage; it worked fine.
- Ran `save_lint.php` on a new branch to check creation.
- Published some fake coverage information.
- Viewed an affected commit.
- Viewed an affected file.
{F151915}
{F151916}
Reviewers: chad, btrahan
Reviewed By: btrahan
Subscribers: jhurwitz, epriestley, zeeg
Maniphest Tasks: T5044, T4994
Differential Revision: https://secure.phabricator.com/D9022
2014-05-18 01:10:54 +02:00
|
|
|
td.cov-I {
|
|
|
|
background: {$lightgreybackground};
|
|
|
|
}
|
|
|
|
|
2012-05-05 01:47:39 +02:00
|
|
|
.differential-diff td.source-cov-C,
|
|
|
|
.differential-diff td.source-cov-C span.bright {
|
2012-03-13 04:04:12 +01:00
|
|
|
background: #cceeff;
|
|
|
|
}
|
|
|
|
|
2012-05-05 01:47:39 +02:00
|
|
|
.differential-diff td.source-cov-U,
|
|
|
|
.differential-diff td.source-cov-U span.bright {
|
2012-03-13 04:04:12 +01:00
|
|
|
background: #ffbb99;
|
|
|
|
}
|
|
|
|
|
2012-05-05 01:47:39 +02:00
|
|
|
.differential-diff td.source-cov-N,
|
|
|
|
.differential-diff td.source-cov-N span.bright {
|
2012-03-13 04:04:12 +01:00
|
|
|
background: #f3f6ff;
|
|
|
|
}
|
|
|
|
|
2011-01-25 20:31:40 +01:00
|
|
|
.differential-diff td.show-more,
|
2012-08-30 01:34:52 +02:00
|
|
|
.differential-diff th.show-context-line,
|
|
|
|
.differential-diff td.show-context,
|
2011-01-25 20:31:40 +01:00
|
|
|
.differential-diff td.differential-shield {
|
2013-10-14 22:12:36 +02:00
|
|
|
background: {$lightbluebackground};
|
2013-09-29 00:55:38 +02:00
|
|
|
padding: 12px 0;
|
2013-10-14 22:12:36 +02:00
|
|
|
border-top: 1px solid {$thinblueborder};
|
|
|
|
border-bottom: 1px solid {$thinblueborder};
|
2012-08-30 01:34:52 +02:00
|
|
|
}
|
|
|
|
|
2015-03-05 23:01:52 +01:00
|
|
|
.device .differential-diff td.show-more,
|
|
|
|
.device .differential-diff th.show-context-line,
|
|
|
|
.device .differential-diff td.show-context,
|
|
|
|
.device .differential-diff td.differential-shield {
|
|
|
|
padding: 6px 0;
|
|
|
|
}
|
|
|
|
|
2012-08-30 01:34:52 +02:00
|
|
|
.differential-diff td.show-more,
|
|
|
|
.differential-diff td.differential-shield {
|
2015-02-26 18:26:36 +01:00
|
|
|
font: {$basefont};
|
2013-05-10 01:09:29 +02:00
|
|
|
font-size: 12px;
|
2011-01-25 20:31:40 +01:00
|
|
|
white-space: normal;
|
|
|
|
}
|
|
|
|
|
|
|
|
.differential-diff td.show-more {
|
2012-08-30 01:34:52 +02:00
|
|
|
text-align: center;
|
2013-10-14 22:12:36 +02:00
|
|
|
color: {$bluetext};
|
2011-01-25 20:31:40 +01:00
|
|
|
}
|
|
|
|
|
2012-08-30 01:34:52 +02:00
|
|
|
.differential-diff th.show-context-line {
|
|
|
|
padding-right: 6px;
|
|
|
|
}
|
|
|
|
|
|
|
|
.differential-diff td.show-context {
|
2012-12-06 20:33:04 +01:00
|
|
|
padding-left: 14px;
|
2012-08-30 01:34:52 +02:00
|
|
|
}
|
|
|
|
|
2011-01-25 20:31:40 +01:00
|
|
|
.differential-diff td.differential-shield {
|
2012-08-30 01:34:52 +02:00
|
|
|
text-align: center;
|
2011-01-25 20:31:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
.differential-diff td.differential-shield a {
|
|
|
|
font-weight: bold;
|
|
|
|
}
|
|
|
|
|
2012-08-14 02:21:16 +02:00
|
|
|
.differential-diff .differential-image-diff {
|
|
|
|
background-image: url(/rsrc/image/checker_light.png);
|
|
|
|
}
|
|
|
|
|
|
|
|
.differential-diff .differential-image-diff:hover {
|
|
|
|
background-image: url(/rsrc/image/checker_dark.png);
|
|
|
|
}
|
|
|
|
|
2014-08-19 23:46:37 +02:00
|
|
|
.differential-diff .differential-image-diff td {
|
|
|
|
padding: 8px;
|
|
|
|
}
|
|
|
|
|
|
|
|
.differential-image-stage {
|
2014-08-20 00:48:30 +02:00
|
|
|
overflow: auto;
|
2014-08-19 23:46:37 +02:00
|
|
|
}
|
|
|
|
|
2011-01-25 20:31:40 +01:00
|
|
|
.differential-meta-notice {
|
2013-10-14 22:12:36 +02:00
|
|
|
border-top: 1px solid {$yellow};
|
|
|
|
border-bottom: 1px solid {$yellow};
|
|
|
|
background-color: {$lightyellow};
|
|
|
|
padding: 12px;
|
|
|
|
}
|
|
|
|
|
|
|
|
.differential-meta-notice + .differential-diff {
|
|
|
|
border-top: none;
|
2011-01-25 20:31:40 +01:00
|
|
|
}
|
2011-01-26 00:19:06 +01:00
|
|
|
|
|
|
|
.differential-changeset h1 {
|
2013-10-14 22:12:36 +02:00
|
|
|
font-size: 15px;
|
2013-09-29 00:55:38 +02:00
|
|
|
padding: 2px 0 12px 12px;
|
2014-04-03 06:49:28 +02:00
|
|
|
line-height: 18px;
|
|
|
|
}
|
|
|
|
|
|
|
|
.device-phone .differential-changeset h1 {
|
|
|
|
word-break: break-word;
|
|
|
|
margin-right: 8px;
|
2011-01-26 00:19:06 +01:00
|
|
|
}
|
|
|
|
|
2011-02-02 00:52:04 +01:00
|
|
|
.differential-reticle {
|
2013-10-14 22:12:36 +02:00
|
|
|
background: {$lightyellow};
|
|
|
|
border: 1px solid {$yellow};
|
|
|
|
position: absolute;
|
|
|
|
opacity: 0.5;
|
|
|
|
top: 0px;
|
|
|
|
left: 0px;
|
2015-03-07 20:47:55 +01:00
|
|
|
box-sizing: border-box;
|
2011-02-02 00:52:04 +01:00
|
|
|
}
|
|
|
|
|
2012-02-29 23:28:48 +01:00
|
|
|
.differential-inline-comment,
|
|
|
|
.differential-inline-comment-edit {
|
2013-10-14 22:12:36 +02:00
|
|
|
background: #ffffee;
|
|
|
|
border: 1px solid #ccccaa;
|
2015-02-26 18:26:36 +01:00
|
|
|
font: {$basefont};
|
2013-05-10 01:09:29 +02:00
|
|
|
font-size: 12px;
|
2012-02-29 23:28:48 +01:00
|
|
|
margin: 6px 0px;
|
2011-02-02 01:42:36 +01:00
|
|
|
padding: 8px 10px;
|
|
|
|
width: 100%;
|
|
|
|
-moz-box-sizing: border-box;
|
|
|
|
-webkit-box-sizing: border-box;
|
Break long words in differential two-up view
Summary: This should prevent long lines from making the code width different between files, which can be annoying. (And of course, it stops long lines from making a giant scrollbar too.)
Test Plan:
Loaded this diff in Chrome, Firefox, IE9, and IE8:
{F137505}
(That's a screenshot from Chrome, but it looks about the same in the other browsers.)
Reviewers: chad, #blessed_reviewers, epriestley
Reviewed By: #blessed_reviewers, epriestley
Subscribers: epriestley, Korvin, chad
Maniphest Tasks: T2004
Differential Revision: https://secure.phabricator.com/D8686
2014-04-03 18:37:49 +02:00
|
|
|
box-sizing: border-box;
|
2011-02-14 01:00:21 +01:00
|
|
|
overflow: hidden;
|
|
|
|
white-space: normal;
|
2011-02-02 01:42:36 +01:00
|
|
|
}
|
|
|
|
|
2014-02-28 17:40:02 +01:00
|
|
|
.differential-inline-comment-edit .aphront-form-control-textarea {
|
|
|
|
padding: 0;
|
|
|
|
}
|
|
|
|
|
2011-06-14 21:42:27 +02:00
|
|
|
.differential-inline-comment-unsaved-draft {
|
|
|
|
background: #f1f1f1;
|
2013-09-02 17:08:54 +02:00
|
|
|
border: 1px dashed {$greytext};
|
2011-06-14 21:42:27 +02:00
|
|
|
}
|
|
|
|
|
2011-02-02 01:42:36 +01:00
|
|
|
.differential-inline-comment-head {
|
|
|
|
font-weight: bold;
|
|
|
|
color: #333333;
|
2013-10-14 22:12:36 +02:00
|
|
|
border-bottom: 1px solid rgba(204,204,170,0.37);
|
|
|
|
padding-bottom: 4px;
|
|
|
|
margin-bottom: 8px;
|
2011-02-02 01:42:36 +01:00
|
|
|
}
|
|
|
|
|
2011-06-14 21:42:27 +02:00
|
|
|
.differential-inline-comment-unsaved-draft .differential-inline-comment-head {
|
|
|
|
border-bottom: 1px solid #aaaaaa;
|
|
|
|
}
|
|
|
|
|
2012-01-04 18:10:37 +01:00
|
|
|
.differential-inline-comment-synthetic {
|
2013-10-14 22:12:36 +02:00
|
|
|
background: {$lightblue};
|
|
|
|
border: 1px solid {$blue};
|
2012-01-04 18:10:37 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
.differential-inline-comment-synthetic .differential-inline-comment-head {
|
2013-10-16 22:09:12 +02:00
|
|
|
border-bottom: 1px solid {$blueborder};
|
2012-01-04 18:10:37 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-02-02 01:42:36 +01:00
|
|
|
.differential-inline-comment-links,
|
|
|
|
.differential-inline-comment-line {
|
|
|
|
font-weight: normal;
|
|
|
|
font-style: italic;
|
2013-09-02 17:08:54 +02:00
|
|
|
color: {$greytext};
|
2011-02-02 01:42:36 +01:00
|
|
|
float: right;
|
|
|
|
white-space: nowrap;
|
|
|
|
}
|
|
|
|
|
2011-02-02 19:10:25 +01:00
|
|
|
.differential-inline-comment-links {
|
|
|
|
margin-left: 8px;
|
2011-02-02 01:42:36 +01:00
|
|
|
font-style: normal;
|
|
|
|
}
|
2011-02-05 02:53:14 +01:00
|
|
|
|
Track a "Done" state on inline comments
Summary:
Ref T1460. This just barely works, but throwing it up in case any of it sounds mechanically crazy before we build integrations/UI/etc.
Specifically, these are the behaviors:
- You can mark your own draft comments as "done" before you submit them. The intent is to let reviewers mark their stuff advisory/minor/not-important before they submit it, to hint to authors that they don't expect the feedback to necessarily be addressed (maybe it's a joke, maybe it's just discussion, maybe it's "consider..").
- You can mark others' published comments as "done" if you're the revision/commit author. The intent is to keep this lightweight by not requiring an audit trail of who marked what done when. If anyone could mark anything done, we'd have to have some way to show who marked stuff.
- When you mark stuff done (or unmark it), it goes into a "draft" state, where you see the change but others don't see it yet. The intent is twofold:
- Be consistent with how inlines work.
- Allow us to publish a "epriestley updated this revision + epriestley marked 15 inlines as done" story later if we want. This seems more useful than publishing 15 "epriestley marked one thing as done" stories.
- The actual bit where done-ness publishes isn't implemented.
- UI is bare bones.
- No integration with the rest of the UI yet.
Test Plan: Clicked some checkboxes.
Reviewers: chad, btrahan
Reviewed By: btrahan
Subscribers: paulshen, chasemp, epriestley
Maniphest Tasks: T1460
Differential Revision: https://secure.phabricator.com/D12033
2015-03-10 02:41:47 +01:00
|
|
|
input.differential-inline-done[type="checkbox"] {
|
|
|
|
margin: 0;
|
|
|
|
display: inline;
|
|
|
|
cursor: pointer;
|
|
|
|
}
|
|
|
|
|
|
|
|
input.differential-inline-done[disabled="disabled"] {
|
|
|
|
cursor: auto;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-01-15 00:15:47 +01:00
|
|
|
.differential-inline-comment-edit-body .aphront-form-input {
|
|
|
|
margin: 0;
|
2013-05-10 01:09:29 +02:00
|
|
|
width: 100%;
|
2011-02-05 02:53:14 +01:00
|
|
|
}
|
2011-05-06 21:58:53 +02:00
|
|
|
|
|
|
|
.differential-changeset-buttons {
|
|
|
|
float: right;
|
2013-09-29 00:55:38 +02:00
|
|
|
margin-right: 16px;
|
2011-05-06 21:58:53 +02:00
|
|
|
}
|
|
|
|
|
2014-04-03 06:49:28 +02:00
|
|
|
.device-phone .differential-changeset-buttons {
|
|
|
|
float: none;
|
|
|
|
margin: 0 0 8px 4px;
|
|
|
|
}
|
|
|
|
|
2011-05-06 21:58:53 +02:00
|
|
|
.differential-changeset-buttons a.button {
|
|
|
|
margin-left: 8px;
|
|
|
|
}
|
2011-06-08 03:59:42 +02:00
|
|
|
|
|
|
|
.differential-property-table {
|
2014-08-19 23:46:37 +02:00
|
|
|
margin: 12px;
|
|
|
|
background: {$lightgreybackground};
|
|
|
|
border: 1px solid {$lightblueborder};
|
|
|
|
border-bottom: 1px solid {$blueborder};
|
2011-06-08 03:59:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
.differential-property-table td em {
|
2013-09-02 17:12:18 +02:00
|
|
|
color: {$lightgreytext};
|
2011-06-08 03:59:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
.differential-property-table td.oval {
|
|
|
|
background: #ffd0d0;
|
2014-08-19 23:46:37 +02:00
|
|
|
width: 50%;
|
2011-06-08 03:59:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
.differential-property-table td.nval {
|
|
|
|
background: #d0ffd0;
|
2014-08-19 23:46:37 +02:00
|
|
|
width: 50%;
|
2011-06-08 03:59:42 +02:00
|
|
|
}
|
Add "Undo" for editing Differential inline comments
Summary:
When a user hits 'cancel' on a 'new', 'edit', or 'reply' operation, add a little
"Changes discarded. __Undo__" insert so they can get their change back. No undo
for delete since there's an explicit prompt. Once this lands we can make
'escape' work again to close dialogs.
This change started feeling really good when I was merging all the duplicate
code and making things more consistent, but by the time I started writing client
rendering it felt gross. I'm not really thrilled with it but I guess it's a step
forward? The feature seems pretty OK in practice. Let me know how much barfing
this causes and I can try to remedy the most acute concerns.
This also fixes a bug where replies always (?) appear on the 'new' side of the
diff (I think?).
Test Plan:
Applied 'new', 'edit', 'delete' and 'reply' operations, pressed 'cancel' and
'okay' in each case, with and without changing text where relevant. All
behaviors seem to conform with expectations, except that canceling out of 'edit'
without changing the text gives you an option to undo when it shouldn't really.
There's no super easy way to get at the original text right now.
Reviewed By: aran
Reviewers: aran, jungejason, tuomaspelkonen
CC: simpkins, aran, epriestley
Differential Revision: 406
2011-06-08 01:11:10 +02:00
|
|
|
|
|
|
|
.differential-inline-undo {
|
|
|
|
padding: 4px;
|
|
|
|
text-align: center;
|
2015-03-08 23:27:16 +01:00
|
|
|
background: {$lightyellow};
|
|
|
|
border: 1px solid {$yellow};
|
Add "Undo" for editing Differential inline comments
Summary:
When a user hits 'cancel' on a 'new', 'edit', or 'reply' operation, add a little
"Changes discarded. __Undo__" insert so they can get their change back. No undo
for delete since there's an explicit prompt. Once this lands we can make
'escape' work again to close dialogs.
This change started feeling really good when I was merging all the duplicate
code and making things more consistent, but by the time I started writing client
rendering it felt gross. I'm not really thrilled with it but I guess it's a step
forward? The feature seems pretty OK in practice. Let me know how much barfing
this causes and I can try to remedy the most acute concerns.
This also fixes a bug where replies always (?) appear on the 'new' side of the
diff (I think?).
Test Plan:
Applied 'new', 'edit', 'delete' and 'reply' operations, pressed 'cancel' and
'okay' in each case, with and without changing text where relevant. All
behaviors seem to conform with expectations, except that canceling out of 'edit'
without changing the text gives you an option to undo when it shouldn't really.
There's no super easy way to get at the original text right now.
Reviewed By: aran
Reviewers: aran, jungejason, tuomaspelkonen
CC: simpkins, aran, epriestley
Differential Revision: 406
2011-06-08 01:11:10 +02:00
|
|
|
margin: 3px 0 1px;
|
2015-03-08 23:27:16 +01:00
|
|
|
color: {$darkgreytext};
|
|
|
|
font: {$basefont};
|
|
|
|
font-size: 12px;
|
Add "Undo" for editing Differential inline comments
Summary:
When a user hits 'cancel' on a 'new', 'edit', or 'reply' operation, add a little
"Changes discarded. __Undo__" insert so they can get their change back. No undo
for delete since there's an explicit prompt. Once this lands we can make
'escape' work again to close dialogs.
This change started feeling really good when I was merging all the duplicate
code and making things more consistent, but by the time I started writing client
rendering it felt gross. I'm not really thrilled with it but I guess it's a step
forward? The feature seems pretty OK in practice. Let me know how much barfing
this causes and I can try to remedy the most acute concerns.
This also fixes a bug where replies always (?) appear on the 'new' side of the
diff (I think?).
Test Plan:
Applied 'new', 'edit', 'delete' and 'reply' operations, pressed 'cancel' and
'okay' in each case, with and without changing text where relevant. All
behaviors seem to conform with expectations, except that canceling out of 'edit'
without changing the text gives you an option to undo when it shouldn't really.
There's no super easy way to get at the original text right now.
Reviewed By: aran
Reviewers: aran, jungejason, tuomaspelkonen
CC: simpkins, aran, epriestley
Differential Revision: 406
2011-06-08 01:11:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
.differential-inline-undo a {
|
|
|
|
font-weight: bold;
|
|
|
|
}
|
2012-02-29 23:28:48 +01:00
|
|
|
|
|
|
|
.differential-inline-comment-edit {
|
2013-05-10 01:09:29 +02:00
|
|
|
padding: 10px;
|
2012-02-29 23:28:48 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
.differential-inline-comment-edit-buttons {
|
2013-10-16 22:09:12 +02:00
|
|
|
padding: 4px 0 0 0;
|
2012-02-29 23:28:48 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
.differential-inline-comment-edit-buttons button {
|
|
|
|
float: right;
|
|
|
|
margin-left: 6px;
|
|
|
|
}
|
|
|
|
|
|
|
|
.differential-inline-comment-edit-title {
|
|
|
|
font-weight: bold;
|
|
|
|
color: #333333;
|
|
|
|
padding-bottom: 2px;
|
|
|
|
margin-bottom: 6px;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* When the inline editor is active, disable all the other inline comment links
|
|
|
|
on the page ("Edit", "Reply", "Delete", etc). The goal here is to prevent
|
|
|
|
issues where you open up multiple editors and run into problems with
|
|
|
|
assumptions about modalness. They are disabled explicitly by the JS, but
|
|
|
|
render them in a disabled state as well.
|
|
|
|
*/
|
|
|
|
.inline-editor-active .differential-inline-comment-links a,
|
|
|
|
.inline-editor-active .differential-inline-comment-links a:hover,
|
|
|
|
.inline-editor-active .differential-inline-comment-links a:active {
|
2013-09-02 17:12:18 +02:00
|
|
|
color: {$lightgreytext};
|
2012-02-29 23:28:48 +01:00
|
|
|
cursor: normal;
|
|
|
|
text-decoration: none;
|
|
|
|
}
|
|
|
|
|
|
|
|
tr.differential-inline-hidden {
|
|
|
|
display: none;
|
|
|
|
}
|
|
|
|
|
|
|
|
tr.differential-inline-loading {
|
|
|
|
opacity: 0.5;
|
|
|
|
}
|
2012-03-27 06:57:51 +02:00
|
|
|
|
|
|
|
|
|
|
|
/* In the document, the anchor is positioned inside the inline comment, but
|
|
|
|
this makes the browser jump into the comment so the top isn't visible.
|
|
|
|
Instead, artificially position it a bit above the comment so we'll jump a
|
|
|
|
bit before the comment. This allows us to see the entire comment (and
|
|
|
|
generally the commented-on lines, at least in the case of one or two-line
|
|
|
|
comments) after the jump.
|
|
|
|
*/
|
|
|
|
.differential-inline-comment-anchor {
|
|
|
|
position: absolute;
|
|
|
|
display: block;
|
|
|
|
margin-top: -72px;
|
|
|
|
}
|
2012-05-01 21:09:50 +02:00
|
|
|
|
|
|
|
.differential-loading {
|
2013-10-23 22:35:20 +02:00
|
|
|
border-top: 1px solid {$yellow};
|
|
|
|
border-bottom: 1px solid {$yellow};
|
|
|
|
background-color: {$lightyellow};
|
|
|
|
padding: 12px;
|
2012-05-01 21:09:50 +02:00
|
|
|
text-align: center;
|
|
|
|
}
|
2013-08-14 01:05:09 +02:00
|
|
|
|
|
|
|
.differential-collapse-undo {
|
|
|
|
background: #FFE;
|
|
|
|
color: #000;
|
|
|
|
padding: 1em 0em;
|
|
|
|
border: 1px solid #CCA;
|
|
|
|
text-align: center;
|
|
|
|
background-color: #FFE;
|
|
|
|
}
|
|
|
|
|
|
|
|
.differential-collapse-undo a {
|
|
|
|
font-weight: bold;
|
|
|
|
}
|
2013-10-15 16:34:48 +02:00
|
|
|
|
|
|
|
.differential-file-icon-header .phui-icon-view {
|
|
|
|
display: inline-block;
|
2014-06-04 21:53:07 +02:00
|
|
|
margin: 0 6px 2px 0;
|
2013-10-15 16:34:48 +02:00
|
|
|
vertical-align: middle;
|
2014-06-04 21:53:07 +02:00
|
|
|
font-size: 14px;
|
2013-10-15 16:34:48 +02:00
|
|
|
}
|
2014-04-03 06:49:28 +02:00
|
|
|
|
|
|
|
.device-phone .differential-file-icon-header .phui-icon-view {
|
|
|
|
display: none;
|
|
|
|
}
|