Merge branch 'stable' of https://github.com/kanboard/kanboard

4 files changed, 66 insertions, 39 deletions

diff --git a/assets/css/src/board.css b/assets/css/src/board.css
index 586093b8..ff3844b7 100644
--- a/assets/css/src/board.css
+++ b/assets/css/src/board.css
@@ -126,7 +126,6 @@ a.board-swimlane-toggle:focus {
 
 /* board task list */
 .board-task-list {
-    overflow: auto;
     min-height: 60px;
 }
 
@@ -157,16 +156,3 @@ div.draggable-item-selected {
     float: left;
     padding-right: 5px;
 }
-
-/* board saving state */
-.task-board-saving-state {
-    opacity: 0.3;
-}
-
-.task-board-saving-icon {
-    position: absolute;
-    margin: auto;
-    width: 100%;
-    text-align: center;
-    color: #000;
-}
diff --git a/assets/css/src/form.css b/assets/css/src/form.css
index fd778c88..2c817072 100644
--- a/assets/css/src/form.css
+++ b/assets/css/src/form.css
@@ -61,6 +61,14 @@ select:focus {
     outline: 0;
 }
 
+.tag-autocomplete {
+    width: 400px;
+}
+
+span.select2-container {
+    margin-top: 2px;
+}
+
 ::-webkit-input-placeholder {
     color: #ddd;
     padding-top: 2px;
@@ -146,21 +154,19 @@ input.form-input-large {
     width: 400px;
 }
 
-.form-column {
-    float: left;
-    margin-right: 3%;
-    max-width: 50%;
-    min-width: 40%;
+input.form-input-small {
+    width: 150px;
 }
 
-.form-column ul {
-    margin-top: 15px;
+.form-columns {
+    display: -webkit-flex;
+    display: flex;
+    -webkit-flex-direction: row;
+    flex-direction: row;
 }
 
-.form-clear {
-    clear: both;
-    padding-top: 20px;
-    padding-bottom: 10px;
+.form-column {
+    margin-right: 25px;
 }
 
 .form-login {
@@ -169,7 +175,6 @@ input.form-input-large {
     margin-top: 8%;
 }
 
-.form-column li,
 .form-login li {
     margin-left: 25px;
     line-height: 25px;
diff --git a/assets/css/src/markdown.css b/assets/css/src/markdown.css
index 90fd48ea..520961a1 100644
--- a/assets/css/src/markdown.css
+++ b/assets/css/src/markdown.css
@@ -1,4 +1,8 @@
 /* markdown editor */
+.markdown-editor-container {
+    max-width: 400px;
+}
+
 div.CodeMirror,
 div.CodeMirror-scroll {
     max-height: 250px;
diff --git a/assets/css/src/task.css b/assets/css/src/task.css
index 2a5f1e97..dc04d936 100644
--- a/assets/css/src/task.css
+++ b/assets/css/src/task.css
@@ -53,6 +53,19 @@ div.task-board-status-closed {
     text-overflow: ellipsis;
 }
 
+/* board saving state */
+.task-board-saving-state {
+    opacity: 0.3;
+}
+
+.task-board-saving-icon {
+    position: absolute;
+    margin: auto;
+    width: 100%;
+    text-align: center;
+    color: #000;
+}
+
 /* title one the card */
 .task-board-title {
     font-size: 1.15em;
@@ -83,6 +96,21 @@ div.task-board-status-closed {
     opacity: 0.6;
 }
 
+/* tags list */
+.task-tags li {
+    display: inline;
+    margin: 0;
+    margin-right: 4px;
+    padding: 2px;
+    color: #666;
+    border: 1px solid #666;
+    border-radius: 2px;
+}
+
+.task-summary-container .task-tags {
+    margin-top: 10px;
+}
+
 /* avatars on the card */
 .task-board-avatars {
     text-align: right;
@@ -181,6 +209,9 @@ span.task-board-age-column {
     border: 2px solid #000;
     border-radius: 8px;
     padding: 15px;
+}
+
+.task-summary-columns {
     display: -webkit-flex;
     display: flex;
     -webkit-flex-direction: row;
@@ -225,28 +256,29 @@ span.task-board-age-column {
 
 /* color picker */
 .color-picker {
-    min-height: 35px;
+    width: 180px;
+}
+
+.color-picker-option {
+    height: 25px;
 }
 
-.color-square {
+.color-picker-square {
     display: inline-block;
-    width: 30px;
-    height: 30px;
+    width: 18px;
+    height: 18px;
     margin-right: 5px;
-    margin-bottom: 5px;
     border: 1px solid #000;
-    cursor: pointer;
 }
 
-.color-square:hover {
-    border-style: dotted;
+.color-picker-label {
+    display: inline-block;
+    vertical-align: bottom;
+    padding-bottom: 3px;
 }
 
-div.color-square-selected {
-    border-width: 2px;
-    width: 28px;
-    height: 28px;
-    box-shadow: 3px 2px 10px 0 rgba(180,180,180,0.9);
+#select2-form-color_id-results li.select2-results__option {
+    padding: 3px;
 }
 
 /* Assign to me */