diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-05-11 08:04:34 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-11 10:38:48 +0100 |
| commit | 04ab2f1f021ff4f3e732da6ebbdfcb967c63f037 (patch) | |
| tree | 8e08194311b218ead2c43739acf5d514a0b44915 | |
| parent | 6350cb5e76e4765918102412abb3c278f76b9e9f (diff) | |
| download | gitlab-ce-04ab2f1f021ff4f3e732da6ebbdfcb967c63f037.tar.gz | |
Merge branch '46210-terms-acceptance-dropdown-menu' into 'master'
Resolve "Terms acceptance dropdown menu"
Closes #46210
See merge request gitlab-org/gitlab-ce!18862
| -rw-r--r-- | app/assets/stylesheets/framework/terms.scss | 9 | ||||
| -rw-r--r-- | app/views/layouts/terms.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/46210-terms-acceptance-dropdown-menu.yml | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/terms.scss b/app/assets/stylesheets/framework/terms.scss index 16293d32dfa..744fd0ff796 100644 --- a/app/assets/stylesheets/framework/terms.scss +++ b/app/assets/stylesheets/framework/terms.scss @@ -17,6 +17,7 @@ display: flex; align-items: center; justify-content: space-between; + line-height: $line-height-base; .title { display: flex; @@ -33,10 +34,14 @@ .navbar-collapse { padding-right: 0; + + .navbar-nav { + margin: 0; + } } - .nav li a { - color: $theme-gray-700; + .nav li { + float: none; } } diff --git a/app/views/layouts/terms.html.haml b/app/views/layouts/terms.html.haml index a30d6e2688c..87f4151f241 100644 --- a/app/views/layouts/terms.html.haml +++ b/app/views/layouts/terms.html.haml @@ -20,10 +20,10 @@ = brand_header_logo - logo_text = brand_header_logo_type - if logo_text.present? - %span.logo-text.hidden-xs.prepend-left-8 + %span.logo-text.prepend-left-8 = logo_text - if header_link?(:user_dropdown) - .navbar-collapse.collapse + .navbar-collapse %ul.nav.navbar-nav %li.header-user.dropdown = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do diff --git a/changelogs/unreleased/46210-terms-acceptance-dropdown-menu.yml b/changelogs/unreleased/46210-terms-acceptance-dropdown-menu.yml new file mode 100644 index 00000000000..8a7c549e356 --- /dev/null +++ b/changelogs/unreleased/46210-terms-acceptance-dropdown-menu.yml @@ -0,0 +1,5 @@ +--- +title: 46210 Display logo and user dropdown on mobile for terms page and fix styling +merge_request: +author: +type: fixed |