diff options
| author | victorwu <victor@gitlab.com> | 2016-12-27 00:25:04 -0500 |
|---|---|---|
| committer | victorwu <victor@gitlab.com> | 2016-12-28 16:01:47 -0500 |
| commit | 4815314b5c239134f5af44459888f63813ae7775 (patch) | |
| tree | 7dcbdd3f67ed73944a6903c53f23330515b93118 | |
| parent | 19e3ab18af273d3d17deabe7e18cd78a3f903644 (diff) | |
| download | gitlab-ce-view-ce-vs-ee.tar.gz | |
About GitLab link in sidebar that links to help pageview-ce-vs-ee
| -rw-r--r-- | app/assets/stylesheets/framework/gitlab-theme.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 11 | ||||
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/view-ce-vs-ee.yml | 4 |
4 files changed, 22 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss index 1b52a6a8e71..d6566dc4ec9 100644 --- a/app/assets/stylesheets/framework/gitlab-theme.scss +++ b/app/assets/stylesheets/framework/gitlab-theme.scss @@ -80,6 +80,9 @@ } } + .about-gitlab { + color: $color-light; + } } } } diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 46a06cd7eab..a8641e83154 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -101,6 +101,17 @@ padding: 0 8px; border-radius: 6px; } + + .about-gitlab { + padding: 7px $gl-sidebar-padding; + font-size: $gl-font-size; + line-height: 24px; + display: block; + text-decoration: none; + font-weight: normal; + position: absolute; + bottom: 10px; + } } .sidebar-action-buttons { diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 817e4bebb05..205d23178d2 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -35,3 +35,7 @@ = link_to dashboard_snippets_path, title: 'Snippets' do %span Snippets + + = link_to help_path, title: 'About GitLab CE', class: 'about-gitlab' do + %span + About GitLab CE diff --git a/changelogs/unreleased/view-ce-vs-ee.yml b/changelogs/unreleased/view-ce-vs-ee.yml new file mode 100644 index 00000000000..38bce4ac7c3 --- /dev/null +++ b/changelogs/unreleased/view-ce-vs-ee.yml @@ -0,0 +1,4 @@ +--- +title: About GitLab link in sidebar that links to help page +merge_request: 8316 +author: |