diff --git a/frontend/views/site/forms-modal-login.php b/frontend/views/site/forms-modal-login.php index d671b46..ef6ee67 100644 --- a/frontend/views/site/forms-modal-login.php +++ b/frontend/views/site/forms-modal-login.php @@ -2,6 +2,7 @@ use common\models\LoginForm; use yii\helpers\Html; use yii\widgets\ActiveForm; +use yii\helpers\Url; @@ -41,22 +42,46 @@ use yii\widgets\ActiveForm;
Авторизация
Url::toRoute('/site/login'), 'options' => [ 'class' => 'form-horizontal', 'id' => 'login-form', ], ]); ?> - field(new LoginForm(), 'username') - ->textInput(); ?> - field(new LoginForm(), 'password') - ->passwordInput(); ?> - field(new LoginForm(), 'rememberMe') - ->checkbox(); ?> -
- 'btn btn-primary' ]); ?> + field(new LoginForm(), 'username', [ 'template' => "{label}\n{input}\n{error}" ]) + ->label('Логин') + ->textInput (['class'=> 'custom-input-2']); ?> + field(new LoginForm(), 'password', [ 'template' => "{label}\n{input}\n{error}" ]) + ->label('Пароль') + ->textInput (['class'=> 'custom-input-2','type'=>'password']); ?> + - + +
+ 'login-button' ]); ?> +
+
+ +
+
+ +
+ + -
+ +
+ + +
+ +
+
\ No newline at end of file diff --git a/frontend/views/site/requestPasswordResetToken.php b/frontend/views/site/requestPasswordResetToken.php index 494ddb3..fec386a 100755 --- a/frontend/views/site/requestPasswordResetToken.php +++ b/frontend/views/site/requestPasswordResetToken.php @@ -7,25 +7,30 @@ use yii\helpers\Html; use yii\bootstrap\ActiveForm; -$this->title = 'Request password reset'; +$this->title = 'Заброс на сброс пароля'; $this->params['breadcrumbs'][] = $this->title; ?> -
-

title) ?>

+
+
+
+

title) ?>

-

Please fill out your email. A link to reset password will be sent there.

+

Please fill out your email. A link to reset password will be sent there.

-
-
- 'request-password-reset-form']); ?> +
+
+ 'request-password-reset-form']); ?> - field($model, 'email') ?> + field($model, 'email') ?> -
- 'btn btn-primary']) ?> -
+
+ 'btn btn-primary']) ?> +
- + +
+
+ diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index bdd8514..8fc0c6a 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -2610,7 +2610,7 @@ input[type=file]::-webkit-file-upload-button { padding-left: 8px; float: left; } -.search-worker-form input[type="submit"] { +.search-worker-form input[type="submit"], .login-button { float: left; width: 82px; height: 29px; @@ -2626,7 +2626,7 @@ input[type=file]::-webkit-file-upload-button { padding-left: 0; margin-left: 6px; } -.search-worker-form input[type="submit"]:hover { +.search-worker-form input[type="submit"]:hover, .login-button:hover { background: #fff; color: #0072bc; } @@ -3386,6 +3386,7 @@ ul.proektant-comments {margin-top: 15px} } #modal_form_question {height: 533px} #modal_form_login {height: 423px} +#modal_form_login .form-resume-wr form label{float: none} #modal_form_favorite .res_form_line {bottom: 85px} .page-favorite { height: 85px; @@ -5307,7 +5308,38 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + margin-left: 6px !important; width: auto !important; } -.login-check-remember label span {margin-left: 0 !important;margin-top: 2px !important;} +.login-check-remember label span {margin-left: 0 !important;} +.login-button { + width: 180px; + outline: none; + float: none; + margin: 0 auto; +} +.res_form_line.new-res_form_line { +top: 272px; + +} +@media (min-width: 768px) { + .form-horizontal .control-label { + padding-top: 0; + margin-bottom: 0; + text-align: left; + } +} +.form-horizontal .form-group { + margin-right: 0; + margin-left: -0; +} +#modal_form_login form {top: 67px} +.login-check-remember { + margin-top: 6px; + margin-bottom: 60px; +} + + + + + -- libgit2 0.21.4