summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kämmerle <akaemmerle@gitlab.com>2018-06-12 09:50:15 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2018-06-12 09:50:15 +0000
commit88810dda007f4b575eefbb3391b0fa2503f1d337 (patch)
tree431ff89df7101d91607748877500b921a156d2ce
parentb6fdf19ee6b6bd788222c0036a202dd23fa2bce1 (diff)
downloadgitlab-ce-88810dda007f4b575eefbb3391b0fa2503f1d337.tar.gz
Add navigation theme documentation
-rw-r--r--doc/user/profile/img/profil-preferences-navigation-theme.pngbin0 -> 16403 bytes
-rw-r--r--doc/user/profile/img/profile-preferences-syntax-themes.pngbin0 -> 44844 bytes
-rw-r--r--doc/user/profile/img/profile_settings_dropdown.pngbin4184 -> 6972 bytes
-rw-r--r--doc/user/profile/preferences.md42
4 files changed, 36 insertions, 6 deletions
diff --git a/doc/user/profile/img/profil-preferences-navigation-theme.png b/doc/user/profile/img/profil-preferences-navigation-theme.png
new file mode 100644
index 00000000000..7adaec33b60
--- /dev/null
+++ b/doc/user/profile/img/profil-preferences-navigation-theme.png
Binary files differ
diff --git a/doc/user/profile/img/profile-preferences-syntax-themes.png b/doc/user/profile/img/profile-preferences-syntax-themes.png
new file mode 100644
index 00000000000..719df9410fc
--- /dev/null
+++ b/doc/user/profile/img/profile-preferences-syntax-themes.png
Binary files differ
diff --git a/doc/user/profile/img/profile_settings_dropdown.png b/doc/user/profile/img/profile_settings_dropdown.png
index a2c620642e2..99b06a1bf58 100644
--- a/doc/user/profile/img/profile_settings_dropdown.png
+++ b/doc/user/profile/img/profile_settings_dropdown.png
Binary files differ
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index 930e506802a..e028861a419 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -7,6 +7,34 @@ To navigate to your profile's preferences, click your avatar icon in the top
right corner and select **Settings**. From there on, choose the **Preferences**
tab.
+![Profile preferences settings](img/profile_settings_dropdown.png)
+
+## Navigation theme
+
+>**Note:**
+Navigation themes have been re-introduced with [GitLab 10.0](https://about.gitlab.com/2017/09/22/gitlab-10-0-released/).
+
+The GitLab navigation theme setting allows you to personalize your GitLab experience.
+You can choose from several color themes that add unique colors to the top navigation
+and left side navigation.
+Using individual color themes might help you differentiate between your different
+GitLab instances.
+
+The default palette is Indigo. You can choose between 10 different themes:
+
+- Indigo
+- Light Indigo
+- Blue
+- Light Blue
+- Green
+- Light Green
+- Red
+- Light Red
+- Dark
+- Light
+
+![Profile preferences syntax highlighting themes](img/profile-preferences-syntax-themes.png)
+
## Syntax highlighting theme
>**Note:**
@@ -16,7 +44,7 @@ list of supported languages visit the rouge website.
Changing this setting allows you to customize the color theme when viewing any
syntax highlighted code on GitLab.
-The default one is **White**, and you can choose among 5 different colors:
+The default syntax theme is White, and you can choose among 5 different colors:
- White
- Dark
@@ -24,6 +52,8 @@ The default one is **White**, and you can choose among 5 different colors:
- Solarized dark
- Monokai
+![Profile preferences navigation themes](img/profil-preferences-navigation-theme.png)
+
## Behavior
The following settings allow you to customize the behavior of GitLab's layout
@@ -52,16 +82,16 @@ You have 8 options here that you can use for your default dashboard view:
- Assigned Issues
- Assigned Merge Requests
-### Project home page content
+### Project overview content
-The project home page content setting allows you to choose what content you want to
+The project overview content setting allows you to choose what content you want to
see on a project’s home page.
You can choose between 3 options:
-- Show the files and the readme (default)
-- Show the readme
-- Show the project’s activity
+- Files and Readme (default)
+- Readme
+- Activity
[rouge]: http://rouge.jneen.net/ "Rouge website"
[todos]: ../../workflow/todos.md