summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-01 19:30:18 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-01 19:30:18 +0000
commit311025edcca4da17cf238cbe00a8cb7bf0f44b69 (patch)
tree757b314e6bf94ebb81291824edee879114a9b731 /app/assets
parent22419ba2802f67f4a90a947d66008c845776f838 (diff)
parent0bfb2aff7c2d74428321b42a25f8b7e92b8407e0 (diff)
downloadgitlab-ce-311025edcca4da17cf238cbe00a8cb7bf0f44b69.tar.gz
Merge branch 'fix-user-tab-activity-mobile' into 'master'
Fixed user profile tab being off-screen See merge request gitlab-org/gitlab-ce!15030
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/blocks.scss9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index dbd990f84c1..8819a0c20f4 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -209,7 +209,6 @@
padding: 24px 0 0;
.nav-links {
- justify-content: center;
width: 100%;
float: none;
@@ -217,6 +216,14 @@
float: none;
}
}
+
+ li:first-child {
+ margin-left: auto;
+ }
+
+ li:last-child {
+ margin-right: auto;
+ }
}
.group-info {