diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/boards/stores/boards_store.js.es6 | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 13 | ||||
| -rw-r--r-- | app/views/projects/boards/components/_board.html.haml | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6 index 46f1ea4ec6b..e9455ccd267 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js.es6 +++ b/app/assets/javascripts/boards/stores/boards_store.js.es6 @@ -82,6 +82,8 @@ this.updateNewListDropdown(); }, moveList: function (oldIndex, newIndex) { + if (oldIndex === newIndex) return; + const listFrom = this.findList('position', oldIndex), listTo = this.findList('position', newIndex); diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 4c97309c509..c3b71a81fec 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -38,6 +38,8 @@ .content-wrapper { display: -webkit-flex; display: flex; + -webkit-flex-direction: column; + flex-direction: column; } .sub-nav, @@ -75,13 +77,15 @@ -webkit-flex: 1; flex: 1; min-height: calc(100vh - 152px); + max-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; + min-height: 470px; + max-height: 470px; } } @@ -117,8 +121,11 @@ border-top-right-radius: $border-radius-default; &.has-border { - padding-top: ($gl-padding - 3px); border-top: 3px solid; + + .board-title { + padding-top: ($gl-padding - 3px); + } } } @@ -129,7 +136,9 @@ .board-title { margin: 0; + padding: $gl-padding; font-size: 1em; + border-bottom: 1px solid $border-color; } .board-search-container { diff --git a/app/views/projects/boards/components/_board.html.haml b/app/views/projects/boards/components/_board.html.haml index 1a02a921557..c1172dce269 100644 --- a/app/views/projects/boards/components/_board.html.haml +++ b/app/views/projects/boards/components/_board.html.haml @@ -5,7 +5,7 @@ ":disabled" => "#{current_user.nil?}" } .board{ ":class" => "{ 'is-draggable': !isPreset }" } .board-inner - %header.board-inner-container.board-header{ ":class" => "{ 'has-border': board.label }", ":style" => "{ borderTopColor: (board.label ? board.label.color : null) }" } + %header.board-header{ ":class" => "{ 'has-border': board.label }", ":style" => "{ borderTopColor: (board.label ? board.label.color : null) }" } %h3.board-title.js-board-handle{ ":class" => "{ 'user-can-drag': !disabled }" } {{ board.title }} %span.pull-right{ "v-if" => "board.type !== 'blank'" } |