diff options
| -rw-r--r-- | app/assets/stylesheets/generic/sidebar.scss | 15 | ||||
| -rw-r--r-- | app/assets/stylesheets/themes/gitlab-theme.scss | 1 | ||||
| -rw-r--r-- | doc/api/milestones.md | 2 | ||||
| -rw-r--r-- | doc/gitlab-basics/create-your-ssh-keys.md | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss index f3950cef6bc..4e9daa5ea34 100644 --- a/app/assets/stylesheets/generic/sidebar.scss +++ b/app/assets/stylesheets/generic/sidebar.scss @@ -2,6 +2,8 @@ .sidebar-wrapper { position: fixed; top: 0; + bottom: 0; + overflow-y: scroll; left: 0; height: 100%; transition-duration: .3s; @@ -21,8 +23,9 @@ } .nav-sidebar { + margin-top: 29 + $header-height; + margin-bottom: 50px; transition-duration: .3s; - margin: 0; list-style: none; overflow: hidden; @@ -39,7 +42,7 @@ } a { - padding: 7px 15px; + padding: 8px 15px; font-size: 13px; line-height: 18px; color: $gray; @@ -88,9 +91,6 @@ width: $sidebar_width; .nav-sidebar { - margin-top: 29px; - position: fixed; - top: $header-height; width: $sidebar_width; } @@ -114,9 +114,6 @@ width: $sidebar_collapsed_width; .nav-sidebar { - margin-top: 29px; - position: fixed; - top: $header-height; width: $sidebar_collapsed_width; li a { @@ -178,7 +175,7 @@ } .sidebar-user { - position: absolute; + position: fixed; bottom: 0; width: $sidebar_width; padding: 10px; diff --git a/app/assets/stylesheets/themes/gitlab-theme.scss b/app/assets/stylesheets/themes/gitlab-theme.scss index dc47b108100..e5325bbdc74 100644 --- a/app/assets/stylesheets/themes/gitlab-theme.scss +++ b/app/assets/stylesheets/themes/gitlab-theme.scss @@ -38,6 +38,7 @@ border-right: 1px solid $color-darker; .sidebar-user { + background: $color-darker; color: $color-light; &:hover { diff --git a/doc/api/milestones.md b/doc/api/milestones.md index cba4a7c484c..a6828728264 100644 --- a/doc/api/milestones.md +++ b/doc/api/milestones.md @@ -87,5 +87,3 @@ Parameters: - `id` (required) - The ID of a project - `milestone_id` (required) - The ID of a project milestone - -You can close multiple issues with one Merge Request by following the [issue closing pattern documentation](http://doc.gitlab.com/ce/customization/issue_closing.html). diff --git a/doc/gitlab-basics/create-your-ssh-keys.md b/doc/gitlab-basics/create-your-ssh-keys.md index cb699588cac..e1acc2bd65b 100644 --- a/doc/gitlab-basics/create-your-ssh-keys.md +++ b/doc/gitlab-basics/create-your-ssh-keys.md @@ -28,7 +28,7 @@ You need to connect your computer to your GitLab account through SSH Keys. They ## To generate an SSH Key on your commandline -* Go to your [commandline](start-using-git.md) and follow the [instructions](../ssh/README.md) to generate it +* Go to your [commandline](start-using-git.md) and follow the [instructions](https://gitlab.com/help/ssh/README) to generate it * Copy the SSH Key that your commandline created and paste it on the "Key" box on the GitLab page. The title will be added automatically |