summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/blocks.scss
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-03 13:28:20 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-03 13:28:20 +0100
commite84edc20c33f12b096d96f2de4cbbeb1eb9f3bdf (patch)
treeefbbc3b8d76464ad7d95917aa8e34a827a7c314c /app/assets/stylesheets/framework/blocks.scss
parent762e759bb3546db7f058d8055ed7b62590d80217 (diff)
parent6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff)
downloadgitlab-ce-e84edc20c33f12b096d96f2de4cbbeb1eb9f3bdf.tar.gz
Merge branch 'master' into ui/project-home-panelui/project-home-panel
Diffstat (limited to 'app/assets/stylesheets/framework/blocks.scss')
-rw-r--r--app/assets/stylesheets/framework/blocks.scss8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 9e30d3b9c8b..a62c0f62a4c 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -68,6 +68,10 @@
.oneline {
line-height: 42px;
}
+
+ > p:last-child {
+ margin-bottom: 0;
+ }
}
.cover-block {
@@ -119,3 +123,7 @@
}
}
}
+
+.block-connector {
+ margin-top: -1px;
+}