summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/blocks.scss
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-06-06 14:44:13 +0000
committerPhil Hughes <me@iamphill.com>2019-06-06 14:44:13 +0000
commitfec96453e73ae715c6888c7369cbb1b020e873b5 (patch)
treea3ceb858acb6d9c6785f684fa18923cbb2ecfee4 /app/assets/stylesheets/framework/blocks.scss
parentc50eed5400d97c9f566b25f76eb8d0057f910a11 (diff)
downloadgitlab-ce-fec96453e73ae715c6888c7369cbb1b020e873b5.tar.gz
Merge request tabs fixes
- Makes activity dropdown and resolved counter smaller - Uses grid for spacing - Removes scrolling on MR tabs
Diffstat (limited to 'app/assets/stylesheets/framework/blocks.scss')
-rw-r--r--app/assets/stylesheets/framework/blocks.scss9
1 files changed, 1 insertions, 8 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 3aabb66f7a6..65c0ee74c60 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -199,6 +199,7 @@
&.user-cover-block {
padding: 24px 0 0;
+ border-bottom: 1px solid $border-color;
.nav-links {
width: 100%;
@@ -232,14 +233,6 @@
margin-top: -1px;
}
-.nav-block {
- .controls {
- float: right;
- margin-top: 8px;
- padding-bottom: 8px;
- }
-}
-
.content-block {
padding: $gl-padding 0;
border-bottom: 1px solid $white-dark;