summaryrefslogtreecommitdiff
path: root/assets/css/src
diff options
context:
space:
mode:
authorChristopher Geelen <christopher.geelen@vinotion.nl>2016-07-27 13:58:23 +0200
committerChristopher Geelen <christopher.geelen@vinotion.nl>2016-07-27 13:58:23 +0200
commit24745182724ca69092554eb5946e31584420f68a (patch)
tree386cdf7a8d7bf7ad2d80d938333bafbaf0fedcbc /assets/css/src
parent160c0b885eb4f1a1a1baa2b6b9fc6d99fdb80d0c (diff)
parent9649f7ba82ba7fe6a470abfe9f65e214cc68fa34 (diff)
Merge remote-tracking branch 'upstream/master'
Conflicts: app/Job/NotificationJob.php
Diffstat (limited to 'assets/css/src')
-rw-r--r--assets/css/src/board.css1
-rw-r--r--assets/css/src/markdown.css4
2 files changed, 4 insertions, 1 deletions
diff --git a/assets/css/src/board.css b/assets/css/src/board.css
index 95e04108..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;
}
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;