diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-04-26 17:57:06 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-29 18:26:50 +0000 |
| commit | 2d5c7faa1b980ac818cc42801ab28825c4b95219 (patch) | |
| tree | 57e7f1017dd087bb126859e6fcd117d81404c5c8 | |
| parent | 1390346a3129cc509695690e53b16f3bbd9d0ca3 (diff) | |
| download | gitlab-ce-2d5c7faa1b980ac818cc42801ab28825c4b95219.tar.gz | |
Merge branch 'winh-boards-drag-selection' into 'master'
Prevent text selection when dragging in issue boards
Closes #59378
See merge request gitlab-org/gitlab-ce!27724
(cherry picked from commit fd05b2c9d63704d3564a090d1f00395abf259cb4)
21116346 Add vendor prefixes for user-select
| -rw-r--r-- | .stylelintrc | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/search.scss | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/winh-boards-drag-selection.yml | 5 |
4 files changed, 12 insertions, 1 deletions
diff --git a/.stylelintrc b/.stylelintrc index 241d2c94a88..59ee0e879e6 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -64,7 +64,7 @@ "number-leading-zero":"always", "number-no-trailing-zeros":true, "property-no-unknown":true, - "property-no-vendor-prefix":true, + "property-no-vendor-prefix": [true, { "ignoreProperties": ["user-select"] }], "rule-empty-line-before":[ "always-multi-line", { diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index fc1c1bd9962..037ca9f954a 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -11,6 +11,9 @@ opacity: 1 !important; * { + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; user-select: none; // !important to make sure no style can override this when dragging cursor: grabbing !important; diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 20bdc6596e9..0c99ff5341c 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -84,6 +84,9 @@ input[type='checkbox']:hover { .search-icon { transition: color $default-transition-duration; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; user-select: none; } diff --git a/changelogs/unreleased/winh-boards-drag-selection.yml b/changelogs/unreleased/winh-boards-drag-selection.yml new file mode 100644 index 00000000000..84b23ab664b --- /dev/null +++ b/changelogs/unreleased/winh-boards-drag-selection.yml @@ -0,0 +1,5 @@ +--- +title: Prevent text selection when dragging in issue boards +merge_request: 27724 +author: +type: fixed |