Skip to content

Commit 6938fc4

Browse files
authored
Fix #285: Fix CSS issues in login form, homepage and form-group class (#287)
1 parent 980c25e commit 6938fc4

File tree

3 files changed

+36
-26
lines changed

3 files changed

+36
-26
lines changed

views/site/index.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
?>
77
<div class="site-index">
88

9-
<div class="jumbotron text-center bg-transparent">
9+
<div class="jumbotron text-center bg-transparent mt-5 mb-5">
1010
<h1 class="display-4">Congratulations!</h1>
1111

1212
<p class="lead">You have successfully created your Yii-powered application.</p>
@@ -17,7 +17,7 @@
1717
<div class="body-content">
1818

1919
<div class="row">
20-
<div class="col-lg-4">
20+
<div class="col-lg-4 mb-3">
2121
<h2>Heading</h2>
2222

2323
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
@@ -27,7 +27,7 @@
2727

2828
<p><a class="btn btn-outline-secondary" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
2929
</div>
30-
<div class="col-lg-4">
30+
<div class="col-lg-4 mb-3">
3131
<h2>Heading</h2>
3232

3333
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et

views/site/login.php

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
/** @var yii\web\View $this */
44
/** @var yii\bootstrap5\ActiveForm $form */
5+
56
/** @var app\models\LoginForm $model */
67

78
use yii\bootstrap5\ActiveForm;
@@ -15,35 +16,40 @@
1516

1617
<p>Please fill out the following fields to login:</p>
1718

18-
<?php $form = ActiveForm::begin([
19-
'id' => 'login-form',
20-
'layout' => 'horizontal',
21-
'fieldConfig' => [
22-
'template' => "{label}\n{input}\n{error}",
23-
'labelOptions' => ['class' => 'col-lg-1 col-form-label mr-lg-3'],
24-
'inputOptions' => ['class' => 'col-lg-3 form-control'],
25-
'errorOptions' => ['class' => 'col-lg-7 invalid-feedback'],
26-
],
27-
]); ?>
19+
<div class="row">
20+
<div class="col-lg-5">
21+
22+
<?php $form = ActiveForm::begin([
23+
'id' => 'login-form',
24+
'fieldConfig' => [
25+
'template' => "{label}\n{input}\n{error}",
26+
'labelOptions' => ['class' => 'col-lg-1 col-form-label mr-lg-3'],
27+
'inputOptions' => ['class' => 'col-lg-3 form-control'],
28+
'errorOptions' => ['class' => 'col-lg-7 invalid-feedback'],
29+
],
30+
]); ?>
2831

29-
<?= $form->field($model, 'username')->textInput(['autofocus' => true]) ?>
32+
<?= $form->field($model, 'username')->textInput(['autofocus' => true]) ?>
3033

31-
<?= $form->field($model, 'password')->passwordInput() ?>
34+
<?= $form->field($model, 'password')->passwordInput() ?>
3235

33-
<?= $form->field($model, 'rememberMe')->checkbox([
34-
'template' => "<div class=\"offset-lg-1 col-lg-3 custom-control custom-checkbox\">{input} {label}</div>\n<div class=\"col-lg-8\">{error}</div>",
35-
]) ?>
36+
<?= $form->field($model, 'rememberMe')->checkbox([
37+
'template' => "<div class=\"custom-control custom-checkbox\">{input} {label}</div>\n<div class=\"col-lg-8\">{error}</div>",
38+
]) ?>
3639

37-
<div class="form-group">
38-
<div class="offset-lg-1 col-lg-11">
39-
<?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
40+
<div class="form-group">
41+
<div>
42+
<?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
43+
</div>
4044
</div>
41-
</div>
4245

43-
<?php ActiveForm::end(); ?>
46+
<?php ActiveForm::end(); ?>
4447

45-
<div class="offset-lg-1" style="color:#999;">
46-
You may login with <strong>admin/admin</strong> or <strong>demo/demo</strong>.<br>
47-
To modify the username/password, please check out the code <code>app\models\User::$users</code>.
48+
<div style="color:#999;">
49+
You may login with <strong>admin/admin</strong> or <strong>demo/demo</strong>.<br>
50+
To modify the username/password, please check out the code <code>app\models\User::$users</code>.
51+
</div>
52+
53+
</div>
4854
</div>
4955
</div>

web/css/site.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,7 @@ a.desc:after {
8282
.nav > li > form > button.logout:focus {
8383
outline: none;
8484
}
85+
86+
.form-group {
87+
margin-bottom: 1rem;
88+
}

0 commit comments

Comments
 (0)