kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

46210 Display logo and user dropdown on mobile for terms page and fix styling

This commit is contained in:
tauriedavis 2018-05-09 12:56:00 -07:00
parent 149e91b50e
commit 5b2e53eee7
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/stylesheets/framework/terms.scss
View File

@ -17,6 +17,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
line-height: $line-height-base;
.title { .title {
display: flex; display: flex;
@ -33,10 +34,14 @@
.navbar-collapse { .navbar-collapse {
padding-right: 0; padding-right: 0;
.navbar-nav {
margin: 0;
}
} }
.nav li a { .nav li {
color: $theme-gray-700; float: none;
} }
} }

4
app/views/layouts/terms.html.haml
View File

@ -20,10 +20,10 @@
= brand_header_logo = brand_header_logo
- logo_text = brand_header_logo_type - logo_text = brand_header_logo_type
- if logo_text.present? - if logo_text.present?
%span.logo-text.hidden-xs.prepend-left-8 %span.logo-text.prepend-left-8
= logo_text = logo_text
- if header_link?(:user_dropdown) - if header_link?(:user_dropdown)
.navbar-collapse.collapse .navbar-collapse
%ul.nav.navbar-nav %ul.nav.navbar-nav
%li.header-user.dropdown %li.header-user.dropdown
= link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do

5
changelogs/unreleased/46210-terms-acceptance-dropdown-menu.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: 46210 Display logo and user dropdown on mobile for terms page and fix styling
merge_request:
author:
type: fixed