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
Léo-Paul Géneau
gitlab-ce
Commits
840ce49d
Commit
840ce49d
authored
Jun 04, 2018
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes the Terms Page
parent
9c296194
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
app/assets/stylesheets/framework/terms.scss
app/assets/stylesheets/framework/terms.scss
+5
-3
app/views/layouts/terms.html.haml
app/views/layouts/terms.html.haml
+3
-3
app/views/users/terms/index.html.haml
app/views/users/terms/index.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/terms.scss
View file @
840ce49d
...
...
@@ -11,15 +11,15 @@
padding-top
:
$gl-padding
;
}
.
panel
{
.
panel-heading
{
.
card
{
.
card-header
{
display
:
-
webkit-flex
;
display
:
flex
;
align-items
:
center
;
justify-content
:
space-between
;
line-height
:
$line-height-base
;
.title
{
.
card-
title
{
display
:
flex
;
align-items
:
center
;
...
...
@@ -34,6 +34,8 @@
.navbar-collapse
{
padding-right
:
0
;
flex-grow
:
0
;
flex-basis
:
auto
;
.navbar-nav
{
margin
:
0
;
...
...
app/views/layouts/terms.html.haml
View file @
840ce49d
...
...
@@ -14,9 +14,9 @@
%div
{
class:
"#{container_class} limit-container-width"
}
.content
{
id:
"content-body"
}
.
panel.panel-default
.
panel-heading
.title
.
card
.
card-header
.
card-
title
=
brand_header_logo
-
logo_text
=
brand_header_logo_type
-
if
logo_text
.
present?
...
...
app/views/users/terms/index.html.haml
View file @
840ce49d
-
redirect_params
=
{
redirect:
@redirect
}
if
@redirect
.
panel-content
.rendered-terms
.
card-body
.rendered-terms
=
markdown_field
(
@term
,
:terms
)
.
row-content-block
.footer-block.clearfix
.
card-footer
.footer-block.clearfix
-
if
can?
(
current_user
,
:accept_terms
,
@term
)
.float-right
=
button_to
accept_term_path
(
@term
,
redirect_params
),
class:
'btn btn-success prepend-left-8'
do
...
...
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