1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2020-10-14 21:21:42 +02:00
3 changed files with 28 additions and 17 deletions

View File

@@ -31,9 +31,9 @@
<div class="panel">
<div class="inner">
<div class="content">
<h2 class="sitename-title">{SITENAME} - {L_REGISTRATION}</h2>
<h2 class="sitename-title">{{ SITENAME }} - {{ lang('REGISTRATION') }}</h2>
<!-- EVENT ucp_agreement_terms_before -->
<p><!-- IF S_SHOW_COPPA -->{L_COPPA_BIRTHDAY}<!-- ELSE -->{L_TERMS_OF_USE}<!-- ENDIF --></p>
<div class="agreement">{% if S_SHOW_COPPA %}<p class="agreement-text">{{ lang('COPPA_BIRTHDAY') }}</p>{% else %}{{ lang('TERMS_OF_USE') }}{% endif %}</div>
<!-- EVENT ucp_agreement_terms_after -->
</div>
</div>
@@ -61,8 +61,8 @@
<div class="panel">
<div class="inner">
<div class="content">
<h2 class="sitename-title">{SITENAME} - {AGREEMENT_TITLE}</h2>
<p>{AGREEMENT_TEXT}</p>
<h2 class="sitename-title">{{ SITENAME }} - {{ AGREEMENT_TITLE }}</h2>
<div class="agreement">{{ AGREEMENT_TEXT }}</div>
</div>
</div>
</div>

View File

@@ -402,6 +402,17 @@ dd.option {
font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
}
.agreement {
font-size: 12px;
line-height: 17px;
margin-bottom: 10px;
}
.agreement-text {
line-height: 17px;
margin-bottom: 10px;
}
dl.faq {
font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
font-size: 11px;