diff --git a/frontend/views/accounts/_portfolio_form.php b/frontend/views/accounts/_portfolio_form.php index 56e175c..88801cb 100644 --- a/frontend/views/accounts/_portfolio_form.php +++ b/frontend/views/accounts/_portfolio_form.php @@ -311,6 +311,9 @@ $form->end(); } }) + $('.input-blocks.home-input.time_fix input').keypress(function (e) { + if (!(e.which==8 || e.which==46 || (e.which>47 && e.which<58))) return false; + }) } ); diff --git a/frontend/views/accounts/participant.php b/frontend/views/accounts/participant.php index 8df7d44..535ebe0 100644 --- a/frontend/views/accounts/participant.php +++ b/frontend/views/accounts/participant.php @@ -19,7 +19,7 @@
title ?>
[ 'class' => 'style admin-all-pages-wr' ], + 'options' => [ 'class' => 'style admin-all-pages-wr fix_last_td_' ], 'dataProvider' => $dataProvider, 'filterModel' => $searchModel, 'columns' => [ diff --git a/frontend/views/ajax/project_user.php b/frontend/views/ajax/project_user.php index 95e4b64..00292b0 100644 --- a/frontend/views/ajax/project_user.php +++ b/frontend/views/ajax/project_user.php @@ -36,7 +36,7 @@ id}]position", ['class' => 'form-control custom-input-2'])?>
-
+
Yii::t('app', 'Часы: ')])?> id}]time", ['class' => 'form-control custom-input-2'])?> diff --git a/frontend/views/ajax/users.php b/frontend/views/ajax/users.php index 491e429..baa3e5c 100644 --- a/frontend/views/ajax/users.php +++ b/frontend/views/ajax/users.php @@ -31,7 +31,7 @@ 'id' => 'grid-user', 'dataProvider' => $dataProvider, 'filterModel' => $model, - 'summary' => 'Найдено пользователей: {totalCount}', + 'summary' => '
Найдено пользователей: {totalCount}
', 'rowOptions' => [ 'class' => 'user_search_modal_row', ], @@ -45,6 +45,7 @@ ], [ 'attribute' => 'userInfo.image', + 'contentOptions' => ['class' => 'fix_add_user_img_'], 'content' => function($model, $key, $index, $column) { /** * @var User $model @@ -52,7 +53,7 @@ if(!empty( $model->userInfo->image )) { return Html::tag('div', Html::img($model->userInfo->image, [ 'width' => '100px' ]), [ 'class' => 'user_search_modal_item_image' ]); } else { - return Html::tag('div', Html::img('/images/avatar-bg.png', [ 'width' => '100px' ]), [ 'class' => 'user_search_modal_item_image' ]); + return Html::tag('div', Html::img('/images/avatar-bg.png'), [ 'class' => 'user_search_modal_item_image' ]); } }, ], diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 8254e52..9bb16ce 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -1133,6 +1133,19 @@ input[type=file]::-webkit-file-upload-button { } .pagination li.disabled {display: none} .pagination li.prev a, .pagination li.next a {line-height: 28px!important;} +.fancybox-wrap .pagination >li > a { + float: none; + margin-left: 0; + background: none; + border: 0; + line-height: 29px; +} +.fancybox-wrap .pagination {margin-right: 36px} +.fancybox-wrap .pagination li.active a {color: inherit} +.fancybox-wrap .pagination >li > a:hover { + background: none; + border-radius: inherit; +} /**************landingCompany**************/ .section-box-5 { @@ -6120,7 +6133,12 @@ a {color: #0072bc} .admin-all-pages-wr table {font-size: 13px} .admin-all-pages-wr table > thead > tr > th {vertical-align: middle} .admin-all-pages-wr table tr td:last-child{min-width: 52px; padding: 0 8px} -.admin-all-pages-wr table tr td:first-child {min-width: 61px} +.admin-all-pages-wr.fix_last_td_ table tr td:last-child{min-width: 52px; width: 68px;padding: 0;text-align: center;} +.admin-all-pages-wr table tr td:first-child {min-width: 52px} +.admin-all-pages-wr table tr td:first-child input { + padding: 0 0 0 1px; + text-align: center; +} .admin-all-pages-wr table tr td:last-child a{margin-left: 5px} .admin-all-pages-wr table tr td:last-child a:first-child{margin-left: 0} .admin-all-pages-wr table .empty{font-size: 15px; margin: 10px 0} @@ -6481,10 +6499,15 @@ input[disabled], select[disabled] { height: 29px; border: 1px solid #dcdcdc; outline: none; - padding-left: 8px; - width: 85px; + padding-left: 3px; + width: 63px; float: left; margin-top: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075); + -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s; + -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; + font-size: 11px; } .admin-table-portfolio .input-group.input-group-xs input:focus{ box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none @@ -6492,13 +6515,13 @@ input[disabled], select[disabled] { .admin-table-portfolio .field-teamsearch-experience_from_from, .admin-table-portfolio .field-teamsearch-experience_from_to {float: left} .admin-table-portfolio .input-group-addon.kv-field-separator { float: left; - width: 30px; + width: 20px; margin-top: -1px; padding: 0; height: 31px; line-height: 31px; } -.admin-table-portfolio .input-group.input-group-xs.input-daterange {width: 200px} +.admin-table-portfolio .input-group.input-group-xs.input-daterange {width: 148px} .admin-table-gallery .input-group.input-group-xs input { width: 131px; } @@ -6860,4 +6883,45 @@ li.active-menu-admin:hover a .ico_num { border-bottom: 1px solid #dcdcdc; margin-top: 27px; padding-bottom: 10px; +} +.input-blocks.home-input.time_fix input { + line-height: normal; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + -moz-appearance: textfield; +} +.input-blocks.home-input.time_fix input::-webkit-inner-spin-button { + -webkit-appearance: none; +} + +.fancybox-wrap .user_search_modal_item_image { + width: 65px; + height: 65px; + text-align: center; +} +.fancybox-wrap .user_search_modal_item_image img { + max-width: 100%; + max-height: 100%; +} +.fancybox-wrap table tr td:last-child { + min-width: 45px; +} +.fancybox-wrap .user_search_modal_tick { + width: 100%; + height: 100%; + display: block; + background-size: inherit; + min-height: 65px; + background: url("/images/tick.png") 50% 50% no-repeat; +} +.fix_add_user_img_ { + width: 82px; +} +.fancybox-wrap .title_addUsers { + font-size: 16px; + font-weight: 700; + width: 100%; + float: left; + margin-bottom: 16px; } \ No newline at end of file -- libgit2 0.21.4