summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-08-05 17:01:34 +0100
committerPhil Hughes <me@iamphill.com>2016-08-17 17:12:47 +0100
commit8e3fd88ec053f99b3249173c9a715913ae4cb101 (patch)
tree4f7a77478213fac7ad8830b993755e7ce580b022
parent8bdf4cc203d24f62e961b1cb1a1000226d789f19 (diff)
downloadgitlab-ce-8e3fd88ec053f99b3249173c9a715913ae4cb101.tar.gz
Improved the mobile UI
-rw-r--r--app/assets/javascripts/boards/boards_bundle.js.es62
-rw-r--r--app/assets/javascripts/boards/components/board_list.js.es62
-rw-r--r--app/assets/javascripts/boards/mixins/sortable_default_options.js.es66
-rw-r--r--app/assets/stylesheets/pages/boards.scss15
4 files changed, 18 insertions, 7 deletions
diff --git a/app/assets/javascripts/boards/boards_bundle.js.es6 b/app/assets/javascripts/boards/boards_bundle.js.es6
index db1601acc7f..ece53f0aad6 100644
--- a/app/assets/javascripts/boards/boards_bundle.js.es6
+++ b/app/assets/javascripts/boards/boards_bundle.js.es6
@@ -33,6 +33,8 @@ $(function () {
if (list.type === 'done') {
list.position = 9999999;
+ } else if (list.type === 'backlog') {
+ list.position = -1;
}
});
diff --git a/app/assets/javascripts/boards/components/board_list.js.es6 b/app/assets/javascripts/boards/components/board_list.js.es6
index f1befe28b9e..79504999068 100644
--- a/app/assets/javascripts/boards/components/board_list.js.es6
+++ b/app/assets/javascripts/boards/components/board_list.js.es6
@@ -36,7 +36,7 @@
},
ready: function () {
const options = _.extend({
- sort: false,
+ // sort: false,
group: 'issues',
disabled: this.disabled,
onAdd: function (e) {
diff --git a/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 b/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
index 99215451359..2b2620fd8a1 100644
--- a/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
+++ b/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
@@ -4,12 +4,12 @@
}
gl.boardSortableDefaultOptions = {
- animation: 150,
forceFallback: true,
fallbackClass: 'is-dragging',
+ fallbackOnBody: true,
ghostClass: 'is-ghost',
- scrollSensitivity: 150,
- scrollSpeed: 50,
+ scrollSensitivity: 50,
+ scrollSpeed: 10,
onStart: function () {
document.body.classList.add('is-dragging');
},
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss
index 6d18bc4cad9..010c1ddca0f 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -69,21 +69,30 @@
display: flex;
-webkit-flex: 1;
flex: 1;
- min-height: 455px;
+ min-height: calc(100vh - 152px);
padding-top: 25px;
padding-right: ($gl-padding / 2);
padding-left: ($gl-padding / 2);
overflow-x: scroll;
+
+ @media (min-width: $screen-sm-min) {
+ min-height: 455px;
+ }
}
.board {
display: -webkit-flex;
display: flex;
- min-width: 400px;
- max-width: 400px;
+ min-width: calc(100vw - 15px);
+ max-width: calc(100vw - 15px);
margin-bottom: 25px;
padding-right: ($gl-padding / 2);
padding-left: ($gl-padding / 2);
+
+ @media (min-width: $screen-sm-min) {
+ min-width: 400px;
+ max-width: 400px;
+ }
}
.board-inner {