Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
5b2e53ee
Commit
5b2e53ee
authored
May 09, 2018
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
46210 Display logo and user dropdown on mobile for terms page and fix styling
parent
149e91b5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
app/assets/stylesheets/framework/terms.scss
app/assets/stylesheets/framework/terms.scss
+7
-2
app/views/layouts/terms.html.haml
app/views/layouts/terms.html.haml
+2
-2
changelogs/unreleased/46210-terms-acceptance-dropdown-menu.yml
...elogs/unreleased/46210-terms-acceptance-dropdown-menu.yml
+5
-0
No files found.
app/assets/stylesheets/framework/terms.scss
View file @
5b2e53ee
...
@@ -17,6 +17,7 @@
...
@@ -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 @@
...
@@ -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
;
}
}
}
}
...
...
app/views/layouts/terms.html.haml
View file @
5b2e53ee
...
@@ -20,10 +20,10 @@
...
@@ -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
...
...
changelogs/unreleased/46210-terms-acceptance-dropdown-menu.yml
0 → 100644
View file @
5b2e53ee
---
title
:
46210 Display logo and user dropdown on mobile for terms page and fix styling
merge_request
:
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment