mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-10 08:52:39 +01:00
94d0adb140
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
243 lines
5.4 KiB
CSS
243 lines
5.4 KiB
CSS
/**
|
|
* @provides differential-changeset-view-css
|
|
*/
|
|
|
|
.differential-diff {
|
|
background: #ffffff;
|
|
font-family: "Menlo", "Consolas", "Monaco", monospace;
|
|
font-size: 10px;
|
|
width: 100%;
|
|
}
|
|
|
|
.differential-diff td {
|
|
/* using monospace fonts makes ex/em most useful:
|
|
*
|
|
* Unfortunately, firefox 3.6 renders diffs columns for added and removed
|
|
* files "way-too-wide" when given em as the dimension measurement, so we
|
|
* use an eyeballed ex equivalent and reset it to the ch character width
|
|
* measurement for browsers that support that css3 measurement.
|
|
*/
|
|
width: 88ex;
|
|
width: 81ch;
|
|
/*
|
|
Disable ligatures in Firefox. Firefox 3 has fancypants ligature support, but
|
|
it gets applied to monospaced fonts, which sucks because it means that the
|
|
"fi" ligature only takes up one character, e.g. It's probably the font's
|
|
fault that it even specifies ligatures (seriously, what the hell?) but
|
|
that's hard to fix and this is "easy" to "fix": custom letter spacing
|
|
disables ligatures, as long as it's at least 0.008333-repeating pixels of
|
|
custom letter spacing. I have no idea where this number comes from, but note
|
|
that .83333.. = 5/6. -epriestley
|
|
*/
|
|
letter-spacing: 0.0083334px;
|
|
vertical-align: top;
|
|
white-space: pre;
|
|
padding: 0 8px 1px;
|
|
line-height: 16px;
|
|
overflow: hidden;
|
|
}
|
|
|
|
.differential-diff th {
|
|
text-align: right;
|
|
padding: 2px 6px;
|
|
width: 44px;
|
|
vertical-align: top;
|
|
background: #eeeeee;
|
|
color: #888888;
|
|
cursor: pointer;
|
|
border-style: solid;
|
|
border-width: 0px 1px;
|
|
border-color: #eeeeee #999999 #eeeeee #dddddd;
|
|
font-weight: bold;
|
|
font-family: "Verdana";
|
|
font-size: 11px;
|
|
overflow: hidden;
|
|
}
|
|
|
|
.differential-diff td.old {
|
|
background: #ffd0d0;
|
|
color: #161111;
|
|
}
|
|
|
|
.differential-diff td.new {
|
|
background: #d0ffd0;
|
|
color: #111611;
|
|
}
|
|
|
|
.differential-diff td.old-full,
|
|
.differential-diff td.old span.bright {
|
|
background: #ffaaaa;
|
|
color: #221111;
|
|
}
|
|
|
|
.differential-diff td.new-full,
|
|
.differential-diff td.new span.bright {
|
|
background: #aaffaa;
|
|
color: #112211;
|
|
}
|
|
|
|
.differential-diff td.show-more,
|
|
.differential-diff td.differential-shield {
|
|
background: #ffffee;
|
|
padding: 1em;
|
|
text-align: center;
|
|
font-family: "Verdana";
|
|
font-size: 11px;
|
|
border: 1px solid #ccccaa;
|
|
white-space: normal;
|
|
}
|
|
|
|
.differential-diff td.show-more {
|
|
color: #999966;
|
|
}
|
|
|
|
.differential-diff td.differential-shield {
|
|
text-align: center;
|
|
max-width: 1160px;
|
|
}
|
|
|
|
.differential-diff td.differential-shield a {
|
|
font-weight: bold;
|
|
}
|
|
|
|
.differential-meta-notice {
|
|
border: 1px solid #ffdd99;
|
|
background: #ffeeaa;
|
|
font-family: "Verdana";
|
|
font-size: 11px;
|
|
padding: 1em;
|
|
margin: 0 0 6px 0;
|
|
}
|
|
|
|
.differential-changeset h1 {
|
|
font-size: 14px;
|
|
font-weight: bold;
|
|
padding: 2px 0 8px;
|
|
}
|
|
|
|
.differential-changeset {
|
|
margin: 0.5em 0;
|
|
padding: 10px 0px 20px;
|
|
}
|
|
|
|
.differential-reticle {
|
|
background: #ffeeaa;
|
|
border: 1px solid #ffcc00;
|
|
position: absolute;
|
|
z-index: 2;
|
|
opacity: 0.5;
|
|
top: 0px;
|
|
left: 0px;
|
|
}
|
|
|
|
.differential-inline-comment {
|
|
background: #f9f9f1;
|
|
border: 1px solid #aaaa88;
|
|
font-family: Verdana;
|
|
font-size: 11px;
|
|
margin: 4px 0px;
|
|
padding: 8px 10px;
|
|
width: 100%;
|
|
-moz-box-sizing: border-box;
|
|
-webkit-box-sizing: border-box;
|
|
overflow: hidden;
|
|
max-width: 520px;
|
|
white-space: normal;
|
|
}
|
|
|
|
.differential-inline-comment-head {
|
|
font-weight: bold;
|
|
color: #333333;
|
|
border-bottom: 1px solid #ccccaa;
|
|
padding-bottom: 6px;
|
|
margin-bottom: 4px;
|
|
}
|
|
|
|
.differential-inline-comment-links,
|
|
.differential-inline-comment-line {
|
|
font-weight: normal;
|
|
font-style: italic;
|
|
color: #666666;
|
|
float: right;
|
|
white-space: nowrap;
|
|
}
|
|
|
|
.differential-inline-comment-links {
|
|
margin-left: 8px;
|
|
font-style: normal;
|
|
}
|
|
|
|
|
|
.differential-inline-comment-edit-textarea {
|
|
width: 100%;
|
|
height: 12em;
|
|
}
|
|
|
|
.differential-changeset-buttons {
|
|
float: right;
|
|
}
|
|
|
|
.differential-changeset-buttons a.button {
|
|
margin-left: 8px;
|
|
}
|
|
|
|
.differential-property-table {
|
|
width: auto;
|
|
margin: .75em auto;
|
|
background: #e3e3e3;
|
|
}
|
|
|
|
.differential-property-table th {
|
|
text-align: right;
|
|
width: 10em;
|
|
font-weight: bold;
|
|
color: #666666;
|
|
white-space: nowrap;
|
|
padding: 4px 8px;
|
|
border-right: 1px solid #666666;
|
|
}
|
|
|
|
.differential-property-table td {
|
|
padding: 4px 8px;
|
|
width: 35em;
|
|
}
|
|
|
|
.differential-property-table td em {
|
|
color: #888888;
|
|
}
|
|
|
|
.differential-property-table tr.property-table-header th,
|
|
.differential-property-table tr.property-table-header td {
|
|
text-align: center;
|
|
font-weight: bold;
|
|
border-bottom: 1px solid #666666;
|
|
}
|
|
|
|
.differential-property-table td.oval {
|
|
background: #ffd0d0;
|
|
}
|
|
|
|
.differential-property-table td.nval {
|
|
background: #d0ffd0;
|
|
}
|
|
|
|
.differential-property-table tr.property-table-header td.oval {
|
|
background: #ffaaaa;
|
|
}
|
|
|
|
.differential-property-table tr.property-table-header td.nval {
|
|
background: #aaffaa;
|
|
}
|
|
|
|
.differential-inline-undo {
|
|
padding: 4px;
|
|
text-align: center;
|
|
background: #ffeeaa;
|
|
margin: 3px 0 1px;
|
|
font: 11px "Verdana";
|
|
color: 444444;
|
|
}
|
|
|
|
.differential-inline-undo a {
|
|
font-weight: bold;
|
|
}
|