Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Issue #3083044 by bnjmnm, Antoniya, lauriii, huzooka: Prevent line breaks in draggable (first) table cells" 

This reverts commit c2bcd732bd.
merge-requests/25/head
Lauri Eskola 2020-09-21 17:27:01 +03:00
parent 9e46cd9e17
commit 15a42d7000
No known key found for this signature in database
GPG Key ID: 382FC0F5B0DF53F8
3 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/misc/tabledrag.es6.js
View File

@ -828,7 +828,8 @@
// restricted according to the rows around this row. // restricted according to the rows around this row.
const indentChange = self.rowObject.indent(indentDiff); const indentChange = self.rowObject.indent(indentDiff);
// Update table and pointer indentations. // Update table and pointer indentations.
self.dragObject.indentPointerPos.x += self.indentAmount * indentChange; self.dragObject.indentPointerPos.x +=
self.indentAmount * indentChange * self.rtl;
self.indentCount = Math.max(self.indentCount, self.rowObject.indents); self.indentCount = Math.max(self.indentCount, self.rowObject.indents);
} }

2
core/misc/tabledrag.js
View File

@ -445,7 +445,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
var xDiff = self.currentPointerCoords.x - self.dragObject.indentPointerPos.x; var xDiff = self.currentPointerCoords.x - self.dragObject.indentPointerPos.x;
var indentDiff = Math.round(xDiff / self.indentAmount); var indentDiff = Math.round(xDiff / self.indentAmount);
var indentChange = self.rowObject.indent(indentDiff); var indentChange = self.rowObject.indent(indentDiff);
self.dragObject.indentPointerPos.x += self.indentAmount * indentChange; self.dragObject.indentPointerPos.x += self.indentAmount * indentChange * self.rtl;
self.indentCount = Math.max(self.indentCount, self.rowObject.indents); self.indentCount = Math.max(self.indentCount, self.rowObject.indents);
} }

35
core/modules/system/css/components/tabledrag.module.css
View File

@ -20,24 +20,9 @@ tr.region-populated {
tr.add-new .tabledrag-changed { tr.add-new .tabledrag-changed {
display: none; display: none;
} }
.draggable .tabledrag-changed {
margin: 0 4px;
}
/**
* Do not apply this style in IE11, as it leads to a regression where the
* table can more easily overflow the browser viewport.
*/
@supports not (-ms-high-contrast: none) {
.draggable > td:first-of-type {
display: flex;
}
}
.draggable a.tabledrag-handle { .draggable a.tabledrag-handle {
float: left; /* LTR */ float: left; /* LTR */
overflow: hidden; overflow: hidden;
min-width: calc(2em + 14px); /* (.5em padding * 2) + (.5em margin * 2) + tabledrag handle image width. */
height: 1.7em; height: 1.7em;
margin-left: -1em; /* LTR */ margin-left: -1em; /* LTR */
cursor: move; cursor: move;
@ -71,18 +56,17 @@ a.tabledrag-handle:focus .handle {
} }
.touchevents a.tabledrag-handle { .touchevents a.tabledrag-handle {
width: 40px; width: 40px;
min-width: 40px;
height: 44px; height: 44px;
} }
.touchevents a.tabledrag-handle .handle { .touchevents a.tabledrag-handle .handle {
height: 21px; height: 21px;
background-position: 40% 17px; /* LTR */ background-position: 40% 19px; /* LTR */
} }
[dir="rtl"] .touch a.tabledrag-handle .handle { [dir="rtl"] .touch a.tabledrag-handle .handle {
background-position: right 40% top 17px; background-position: right 40% top 19px;
} }
.touchevents .draggable.drag a.tabledrag-handle .handle { .touchevents .draggable.drag a.tabledrag-handle .handle {
background-image: url(../../../../misc/icons/000000/move.svg); background-position: 50% -32px;
} }
.tabledrag-toggle-weight-wrapper { .tabledrag-toggle-weight-wrapper {
text-align: right; /* LTR */ text-align: right; /* LTR */
@ -91,23 +75,14 @@ a.tabledrag-handle:focus .handle {
text-align: left; text-align: left;
} }
.indentation { .indentation {
float: left; /* LTR */
width: 20px; width: 20px;
min-width: 20px;
height: 1.7em; height: 1.7em;
margin: -0.4em 0.2em -0.4em -0.4em; /* LTR */ margin: -0.4em 0.2em -0.4em -0.4em; /* LTR */
padding: 0.42em 0 0.42em 0.6em; /* LTR */ padding: 0.42em 0 0.42em 0.6em; /* LTR */
} }
[dir="rtl"] .indentation { [dir="rtl"] .indentation {
float: right;
margin: -0.4em -0.4em -0.4em 0.2em; margin: -0.4em -0.4em -0.4em 0.2em;
padding: 0.42em 0.6em 0.42em 0; padding: 0.42em 0.6em 0.42em 0;
} }
@media all and (-ms-high-contrast: active), (-ms-high-contrast: none) {
.indentation {
float: left;
}
[dir="rtl"] .indentation {
float: right;
}
}