summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-04-26 17:57:06 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-04-26 17:57:06 +0000
commitfd05b2c9d63704d3564a090d1f00395abf259cb4 (patch)
tree0c99a6f834b478357d45fd14485be8840000e004
parent9f690b03c62504ae31306359101e867767492f00 (diff)
parent211163463d9023dce6bbda9ffd64403ebc6071f4 (diff)
downloadgitlab-ce-fd05b2c9d63704d3564a090d1f00395abf259cb4.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
-rw-r--r--.stylelintrc2
-rw-r--r--app/assets/stylesheets/pages/boards.scss3
-rw-r--r--app/assets/stylesheets/pages/search.scss3
-rw-r--r--changelogs/unreleased/winh-boards-drag-selection.yml5
4 files changed, 12 insertions, 1 deletions
diff --git a/.stylelintrc b/.stylelintrc
index 2325a03d9b9..b0ace93e04f 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 02a95c04b8b..0e4b40b2bed 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -7,6 +7,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