diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-05-07 01:12:58 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-05-07 01:12:58 +0300 |
| commit | 36ec4770bc5d22103a70cd5f6df0b55e2cff7721 (patch) | |
| tree | b9e91d91d04dbe3c0fc7b5f99e2edce44b12f5cb | |
| parent | dfe59c75bf4d6f6937767ee9ef35df4ef42e7667 (diff) | |
| parent | ecbbbca05709ea034be05086bc381e227491589d (diff) | |
Merge branch 'ce-mw-onboarding-mvc' into 'master'
(CE Port) New user onboarding (Welcome screen)
See merge request gitlab-org/gitlab-ce!28062
| -rw-r--r-- | app/assets/stylesheets/components/popover.scss | 33 | ||||
| -rw-r--r-- | app/views/layouts/header/_help_dropdown.html.haml | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/app/assets/stylesheets/components/popover.scss b/app/assets/stylesheets/components/popover.scss index 838bf5d343b..d0aa6ec78aa 100644 --- a/app/assets/stylesheets/components/popover.scss +++ b/app/assets/stylesheets/components/popover.scss @@ -10,6 +10,26 @@ color: $gray-600; } } + + &.blue { + background-color: $blue-600; + + .popover-body { + color: $white-light; + } + + &.bs-popover-bottom { + .arrow::after { + border-bottom-color: $blue-600; + } + } + + &.bs-popover-top { + .arrow::after { + border-top-color: $blue-600; + } + } + } } .mr-popover { @@ -18,3 +38,16 @@ line-height: 1.33; } } + +.onboarding-welcome-page { + .popover { + min-width: auto; + max-width: 40%; + + .popover-body { + padding-top: $gl-padding; + padding-bottom: $gl-padding; + font-size: $gl-font-size-small; + } + } +} diff --git a/app/views/layouts/header/_help_dropdown.html.haml b/app/views/layouts/header/_help_dropdown.html.haml index c53bfd8a85d..fbec62b02f8 100644 --- a/app/views/layouts/header/_help_dropdown.html.haml +++ b/app/views/layouts/header/_help_dropdown.html.haml @@ -2,6 +2,7 @@ - if current_user_menu?(:help) %li = link_to _("Help"), help_path + = render_if_exists "shared/learn_gitlab_menu_item" %li.divider %li = link_to _("Submit feedback"), "https://about.gitlab.com/submit-feedback" |