Commit aa08967cf4f1e32eb1114eb4097e82c2b4e8c528
1 parent
7d705d85
git
Showing
5 changed files
with
77 additions
and
9 deletions
Show diff stats
frontend/views/accounts/_portfolio_form.php
@@ -311,6 +311,9 @@ $form->end(); | @@ -311,6 +311,9 @@ $form->end(); | ||
311 | } | 311 | } |
312 | }) | 312 | }) |
313 | 313 | ||
314 | + $('.input-blocks.home-input.time_fix input').keypress(function (e) { | ||
315 | + if (!(e.which==8 || e.which==46 || (e.which>47 && e.which<58))) return false; | ||
316 | + }) | ||
314 | } | 317 | } |
315 | ); | 318 | ); |
316 | </script> | 319 | </script> |
frontend/views/accounts/participant.php
@@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
19 | <div class="login-left-column-title fix"><?= $this->title ?></div> | 19 | <div class="login-left-column-title fix"><?= $this->title ?></div> |
20 | <div class="admin-table-portfolio"> | 20 | <div class="admin-table-portfolio"> |
21 | <?= GridView::widget([ | 21 | <?= GridView::widget([ |
22 | - 'options' => [ 'class' => 'style admin-all-pages-wr' ], | 22 | + 'options' => [ 'class' => 'style admin-all-pages-wr fix_last_td_' ], |
23 | 'dataProvider' => $dataProvider, | 23 | 'dataProvider' => $dataProvider, |
24 | 'filterModel' => $searchModel, | 24 | 'filterModel' => $searchModel, |
25 | 'columns' => [ | 25 | 'columns' => [ |
frontend/views/ajax/project_user.php
@@ -36,7 +36,7 @@ | @@ -36,7 +36,7 @@ | ||
36 | <?=Html::activeTextInput($model, "[{$user->id}]position", ['class' => 'form-control custom-input-2'])?> | 36 | <?=Html::activeTextInput($model, "[{$user->id}]position", ['class' => 'form-control custom-input-2'])?> |
37 | </div> | 37 | </div> |
38 | </div> | 38 | </div> |
39 | - <div class="input-blocks home-input"> | 39 | + <div class="input-blocks home-input time_fix"> |
40 | <div class="form-group"> | 40 | <div class="form-group"> |
41 | <?=Html::activeLabel($model, 'time', ['label' => Yii::t('app', 'Часы: ')])?> | 41 | <?=Html::activeLabel($model, 'time', ['label' => Yii::t('app', 'Часы: ')])?> |
42 | <?=Html::activeInput('number', $model, "[{$user->id}]time", ['class' => 'form-control custom-input-2'])?> | 42 | <?=Html::activeInput('number', $model, "[{$user->id}]time", ['class' => 'form-control custom-input-2'])?> |
frontend/views/ajax/users.php
@@ -31,7 +31,7 @@ | @@ -31,7 +31,7 @@ | ||
31 | 'id' => 'grid-user', | 31 | 'id' => 'grid-user', |
32 | 'dataProvider' => $dataProvider, | 32 | 'dataProvider' => $dataProvider, |
33 | 'filterModel' => $model, | 33 | 'filterModel' => $model, |
34 | - 'summary' => 'Найдено пользователей: {totalCount}', | 34 | + 'summary' => '<div class="title_addUsers">Найдено пользователей: {totalCount}</div>', |
35 | 'rowOptions' => [ | 35 | 'rowOptions' => [ |
36 | 'class' => 'user_search_modal_row', | 36 | 'class' => 'user_search_modal_row', |
37 | ], | 37 | ], |
@@ -45,6 +45,7 @@ | @@ -45,6 +45,7 @@ | ||
45 | ], | 45 | ], |
46 | [ | 46 | [ |
47 | 'attribute' => 'userInfo.image', | 47 | 'attribute' => 'userInfo.image', |
48 | + 'contentOptions' => ['class' => 'fix_add_user_img_'], | ||
48 | 'content' => function($model, $key, $index, $column) { | 49 | 'content' => function($model, $key, $index, $column) { |
49 | /** | 50 | /** |
50 | * @var User $model | 51 | * @var User $model |
@@ -52,7 +53,7 @@ | @@ -52,7 +53,7 @@ | ||
52 | if(!empty( $model->userInfo->image )) { | 53 | if(!empty( $model->userInfo->image )) { |
53 | return Html::tag('div', Html::img($model->userInfo->image, [ 'width' => '100px' ]), [ 'class' => 'user_search_modal_item_image' ]); | 54 | return Html::tag('div', Html::img($model->userInfo->image, [ 'width' => '100px' ]), [ 'class' => 'user_search_modal_item_image' ]); |
54 | } else { | 55 | } else { |
55 | - return Html::tag('div', Html::img('/images/avatar-bg.png', [ 'width' => '100px' ]), [ 'class' => 'user_search_modal_item_image' ]); | 56 | + return Html::tag('div', Html::img('/images/avatar-bg.png'), [ 'class' => 'user_search_modal_item_image' ]); |
56 | } | 57 | } |
57 | }, | 58 | }, |
58 | ], | 59 | ], |
frontend/web/css/style.css
@@ -1133,6 +1133,19 @@ input[type=file]::-webkit-file-upload-button { | @@ -1133,6 +1133,19 @@ input[type=file]::-webkit-file-upload-button { | ||
1133 | } | 1133 | } |
1134 | .pagination li.disabled {display: none} | 1134 | .pagination li.disabled {display: none} |
1135 | .pagination li.prev a, .pagination li.next a {line-height: 28px!important;} | 1135 | .pagination li.prev a, .pagination li.next a {line-height: 28px!important;} |
1136 | +.fancybox-wrap .pagination >li > a { | ||
1137 | + float: none; | ||
1138 | + margin-left: 0; | ||
1139 | + background: none; | ||
1140 | + border: 0; | ||
1141 | + line-height: 29px; | ||
1142 | +} | ||
1143 | +.fancybox-wrap .pagination {margin-right: 36px} | ||
1144 | +.fancybox-wrap .pagination li.active a {color: inherit} | ||
1145 | +.fancybox-wrap .pagination >li > a:hover { | ||
1146 | + background: none; | ||
1147 | + border-radius: inherit; | ||
1148 | +} | ||
1136 | /**************landingCompany**************/ | 1149 | /**************landingCompany**************/ |
1137 | 1150 | ||
1138 | .section-box-5 { | 1151 | .section-box-5 { |
@@ -6120,7 +6133,12 @@ a {color: #0072bc} | @@ -6120,7 +6133,12 @@ a {color: #0072bc} | ||
6120 | .admin-all-pages-wr table {font-size: 13px} | 6133 | .admin-all-pages-wr table {font-size: 13px} |
6121 | .admin-all-pages-wr table > thead > tr > th {vertical-align: middle} | 6134 | .admin-all-pages-wr table > thead > tr > th {vertical-align: middle} |
6122 | .admin-all-pages-wr table tr td:last-child{min-width: 52px; padding: 0 8px} | 6135 | .admin-all-pages-wr table tr td:last-child{min-width: 52px; padding: 0 8px} |
6123 | -.admin-all-pages-wr table tr td:first-child {min-width: 61px} | 6136 | +.admin-all-pages-wr.fix_last_td_ table tr td:last-child{min-width: 52px; width: 68px;padding: 0;text-align: center;} |
6137 | +.admin-all-pages-wr table tr td:first-child {min-width: 52px} | ||
6138 | +.admin-all-pages-wr table tr td:first-child input { | ||
6139 | + padding: 0 0 0 1px; | ||
6140 | + text-align: center; | ||
6141 | +} | ||
6124 | .admin-all-pages-wr table tr td:last-child a{margin-left: 5px} | 6142 | .admin-all-pages-wr table tr td:last-child a{margin-left: 5px} |
6125 | .admin-all-pages-wr table tr td:last-child a:first-child{margin-left: 0} | 6143 | .admin-all-pages-wr table tr td:last-child a:first-child{margin-left: 0} |
6126 | .admin-all-pages-wr table .empty{font-size: 15px; margin: 10px 0} | 6144 | .admin-all-pages-wr table .empty{font-size: 15px; margin: 10px 0} |
@@ -6481,10 +6499,15 @@ input[disabled], select[disabled] { | @@ -6481,10 +6499,15 @@ input[disabled], select[disabled] { | ||
6481 | height: 29px; | 6499 | height: 29px; |
6482 | border: 1px solid #dcdcdc; | 6500 | border: 1px solid #dcdcdc; |
6483 | outline: none; | 6501 | outline: none; |
6484 | - padding-left: 8px; | ||
6485 | - width: 85px; | 6502 | + padding-left: 3px; |
6503 | + width: 63px; | ||
6486 | float: left; | 6504 | float: left; |
6487 | margin-top: 0; | 6505 | margin-top: 0; |
6506 | + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075); | ||
6507 | + box-shadow: inset 0 1px 1px rgba(0,0,0,.075); | ||
6508 | + -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s; | ||
6509 | + -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; | ||
6510 | + font-size: 11px; | ||
6488 | } | 6511 | } |
6489 | .admin-table-portfolio .input-group.input-group-xs input:focus{ | 6512 | .admin-table-portfolio .input-group.input-group-xs input:focus{ |
6490 | box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none | 6513 | 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] { | @@ -6492,13 +6515,13 @@ input[disabled], select[disabled] { | ||
6492 | .admin-table-portfolio .field-teamsearch-experience_from_from, .admin-table-portfolio .field-teamsearch-experience_from_to {float: left} | 6515 | .admin-table-portfolio .field-teamsearch-experience_from_from, .admin-table-portfolio .field-teamsearch-experience_from_to {float: left} |
6493 | .admin-table-portfolio .input-group-addon.kv-field-separator { | 6516 | .admin-table-portfolio .input-group-addon.kv-field-separator { |
6494 | float: left; | 6517 | float: left; |
6495 | - width: 30px; | 6518 | + width: 20px; |
6496 | margin-top: -1px; | 6519 | margin-top: -1px; |
6497 | padding: 0; | 6520 | padding: 0; |
6498 | height: 31px; | 6521 | height: 31px; |
6499 | line-height: 31px; | 6522 | line-height: 31px; |
6500 | } | 6523 | } |
6501 | -.admin-table-portfolio .input-group.input-group-xs.input-daterange {width: 200px} | 6524 | +.admin-table-portfolio .input-group.input-group-xs.input-daterange {width: 148px} |
6502 | .admin-table-gallery .input-group.input-group-xs input { | 6525 | .admin-table-gallery .input-group.input-group-xs input { |
6503 | width: 131px; | 6526 | width: 131px; |
6504 | } | 6527 | } |
@@ -6860,4 +6883,45 @@ li.active-menu-admin:hover a .ico_num { | @@ -6860,4 +6883,45 @@ li.active-menu-admin:hover a .ico_num { | ||
6860 | border-bottom: 1px solid #dcdcdc; | 6883 | border-bottom: 1px solid #dcdcdc; |
6861 | margin-top: 27px; | 6884 | margin-top: 27px; |
6862 | padding-bottom: 10px; | 6885 | padding-bottom: 10px; |
6886 | +} | ||
6887 | +.input-blocks.home-input.time_fix input { | ||
6888 | + line-height: normal; | ||
6889 | + -webkit-appearance: none; | ||
6890 | + -moz-appearance: none; | ||
6891 | + appearance: none; | ||
6892 | + -moz-appearance: textfield; | ||
6893 | +} | ||
6894 | +.input-blocks.home-input.time_fix input::-webkit-inner-spin-button { | ||
6895 | + -webkit-appearance: none; | ||
6896 | +} | ||
6897 | + | ||
6898 | +.fancybox-wrap .user_search_modal_item_image { | ||
6899 | + width: 65px; | ||
6900 | + height: 65px; | ||
6901 | + text-align: center; | ||
6902 | +} | ||
6903 | +.fancybox-wrap .user_search_modal_item_image img { | ||
6904 | + max-width: 100%; | ||
6905 | + max-height: 100%; | ||
6906 | +} | ||
6907 | +.fancybox-wrap table tr td:last-child { | ||
6908 | + min-width: 45px; | ||
6909 | +} | ||
6910 | +.fancybox-wrap .user_search_modal_tick { | ||
6911 | + width: 100%; | ||
6912 | + height: 100%; | ||
6913 | + display: block; | ||
6914 | + background-size: inherit; | ||
6915 | + min-height: 65px; | ||
6916 | + background: url("/images/tick.png") 50% 50% no-repeat; | ||
6917 | +} | ||
6918 | +.fix_add_user_img_ { | ||
6919 | + width: 82px; | ||
6920 | +} | ||
6921 | +.fancybox-wrap .title_addUsers { | ||
6922 | + font-size: 16px; | ||
6923 | + font-weight: 700; | ||
6924 | + width: 100%; | ||
6925 | + float: left; | ||
6926 | + margin-bottom: 16px; | ||
6863 | } | 6927 | } |
6864 | \ No newline at end of file | 6928 | \ No newline at end of file |