Commit 8fdf4f4005ca500aabe0e244add96c972bec0290
1 parent
d0a19e42
git
Showing
4 changed files
with
31 additions
and
17 deletions
Show diff stats
common/modules/comment/widgets/views/_question_comment_view.php
| @@ -22,20 +22,28 @@ | @@ -22,20 +22,28 @@ | ||
| 22 | } | 22 | } |
| 23 | ?> | 23 | ?> |
| 24 | <div class="<?=((!empty($model->child))?'has-child':'')?>"> | 24 | <div class="<?=((!empty($model->child))?'has-child':'')?>"> |
| 25 | - <div class="comments-name <?= CommentWidget::$baseClass[ 'comment_author' ] ?>"> | ||
| 26 | - <?= $model->getAuthor(' (Гость)') ?> | ||
| 27 | - </div> | ||
| 28 | - <div class="imz"><?= Html::img((!empty( $model->user ) && !empty($model->user->userInfo->image) ) ? $model->user->minImg($model->user->userInfo->image, 48, 48) : '/images/ico-profile.png') ?></div> | ||
| 29 | - <?php | 25 | + <div class="header-cabinet-foto" style="background: none;"><?= Html::img((!empty( $model->user ) && !empty($model->user->userInfo->image) ) ? $model->user->minImg($model->user->userInfo->image, 48, 48) : '/images/ico-profile.png') ?></div> |
| 26 | + <div style="width: 500px; float: left; margin-left: 12px;"> | ||
| 27 | + <div class="comments-name style <?= CommentWidget::$baseClass[ 'comment_author' ] ?>"> | ||
| 28 | + <a href="/fdf"><?= $model->getAuthor(' (Гость)') ?></a> | ||
| 29 | + | ||
| 30 | + </div> | ||
| 31 | + | ||
| 32 | + <?php | ||
| 30 | /* == STATUS PRO == | 33 | /* == STATUS PRO == |
| 31 | ?> | 34 | ?> |
| 32 | <div class="comments-status"><span>Pro</span></div> | 35 | <div class="comments-status"><span>Pro</span></div> |
| 33 | <?php | 36 | <?php |
| 34 | */ | 37 | */ |
| 35 | - ?> | ||
| 36 | - <div class="comments-date"><?= \Yii::$app->formatter->asDate($model->date_add, 'php:d.m.Y') ?></div> | 38 | + ?> |
| 39 | + <div class="blog-post-date style"> | ||
| 40 | + <span></span><p><?= \Yii::$app->formatter->asDate($model->date_add, 'php:d.m.Y') ?></p> | ||
| 41 | + </div> | ||
| 42 | +<!-- <div class="comments-date style">--><?//= \Yii::$app->formatter->asDate($model->date_add, 'php:d.m.Y') ?><!--</div>--> | ||
| 43 | + </div> | ||
| 37 | <div class="comments-content"> | 44 | <div class="comments-content"> |
| 38 | - <?= $model->text ?> | 45 | + <div class="style" style="font-weight: 700">Вопрос</div> |
| 46 | + <div class="style" style="margin-top: 2px"><?= $model->text ?></div> | ||
| 39 | </div> | 47 | </div> |
| 40 | <?php | 48 | <?php |
| 41 | if(!empty( $model->child )) { | 49 | if(!empty( $model->child )) { |
| @@ -53,7 +61,7 @@ | @@ -53,7 +61,7 @@ | ||
| 53 | ]); | 61 | ]); |
| 54 | } | 62 | } |
| 55 | ?> | 63 | ?> |
| 56 | - <div> | 64 | + <div class="buutons_comm" style="margin-top: 16px"> |
| 57 | <?php | 65 | <?php |
| 58 | if(!empty( $model->buttons[ 'delete' ] )) { | 66 | if(!empty( $model->buttons[ 'delete' ] )) { |
| 59 | echo Html::a(( $model->user_id != NULL && $model->user_id == \Yii::$app->user->id ) ? 'Удалить' : 'Пожаловаться ', $model->buttons[ 'delete' ], [ 'class' => 'artbox_comment_delete_answer' ]); | 67 | echo Html::a(( $model->user_id != NULL && $model->user_id == \Yii::$app->user->id ) ? 'Удалить' : 'Пожаловаться ', $model->buttons[ 'delete' ], [ 'class' => 'artbox_comment_delete_answer' ]); |
common/modules/comment/widgets/views/list-comment-question.php
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | 'itemView' => '_question_comment_view', | 19 | 'itemView' => '_question_comment_view', |
| 20 | 'options' => [ | 20 | 'options' => [ |
| 21 | 'tag' => 'ul', | 21 | 'tag' => 'ul', |
| 22 | - 'class' => 'proektant-comments style', | 22 | + 'class' => 'proektant-comments tender_list_comm_ style', |
| 23 | ], | 23 | ], |
| 24 | 'itemOptions' => [ | 24 | 'itemOptions' => [ |
| 25 | 'tag' => 'li', | 25 | 'tag' => 'li', |
frontend/views/tender/view.php
| @@ -300,7 +300,7 @@ $this->title = 'My Yii Application'; | @@ -300,7 +300,7 @@ $this->title = 'My Yii Application'; | ||
| 300 | 'tag' => 'span', | 300 | 'tag' => 'span', |
| 301 | ], | 301 | ], |
| 302 | 'options' => [ | 302 | 'options' => [ |
| 303 | - 'class' => 'proektant-comments-wr style', | 303 | + 'class' => 'proektant-comments-wr fix_te style', |
| 304 | ], | 304 | ], |
| 305 | ]); | 305 | ]); |
| 306 | ?> | 306 | ?> |
frontend/web/css/style.css
| @@ -3305,7 +3305,7 @@ ul.proektant-comments {margin-top: 15px} | @@ -3305,7 +3305,7 @@ ul.proektant-comments {margin-top: 15px} | ||
| 3305 | float: left; | 3305 | float: left; |
| 3306 | list-style: none; | 3306 | list-style: none; |
| 3307 | border-bottom: 1px solid #dcdcdc; | 3307 | border-bottom: 1px solid #dcdcdc; |
| 3308 | - padding-bottom: 17px; | 3308 | + padding-bottom: 20px; |
| 3309 | margin-top: 27px; | 3309 | margin-top: 27px; |
| 3310 | } | 3310 | } |
| 3311 | .proektant-comments li:first-child{margin-top: 0} | 3311 | .proektant-comments li:first-child{margin-top: 0} |
| @@ -7099,17 +7099,26 @@ li.active-menu-admin:hover a .ico_num { | @@ -7099,17 +7099,26 @@ li.active-menu-admin:hover a .ico_num { | ||
| 7099 | border: 1px solid #0072bc !important; | 7099 | border: 1px solid #0072bc !important; |
| 7100 | color: #0072bc !important; | 7100 | color: #0072bc !important; |
| 7101 | } | 7101 | } |
| 7102 | -._fix_errors_tender .get-list-new:hover { | 7102 | +._fix_errors_tender .get-list-new:hover, .fix_te .artbox_comment_reply_answer:hover { |
| 7103 | background: #148ad6 !important; | 7103 | background: #148ad6 !important; |
| 7104 | border: 1px solid #148ad6 !important; | 7104 | border: 1px solid #148ad6 !important; |
| 7105 | color: #fff !important; | 7105 | color: #fff !important; |
| 7106 | } | 7106 | } |
| 7107 | +.fix_te .artbox_comment_delete_answer:hover { | ||
| 7108 | + background: #f10b00; | ||
| 7109 | + color: #fff !important; | ||
| 7110 | +} | ||
| 7107 | ._fix_errors_tender .get-list-new:focus {box-shadow: none} | 7111 | ._fix_errors_tender .get-list-new:focus {box-shadow: none} |
| 7108 | -._fix_errors_tender .get-list-new:active { | 7112 | +._fix_errors_tender .get-list-new:active, .fix_te .artbox_comment_reply_answer:active { |
| 7109 | background: #0054a6 !important; | 7113 | background: #0054a6 !important; |
| 7110 | border: 1px solid #0054a6 !important; | 7114 | border: 1px solid #0054a6 !important; |
| 7111 | color: #fff !important; | 7115 | color: #fff !important; |
| 7112 | } | 7116 | } |
| 7117 | +.fix_te .artbox_comment_delete_answer:active { | ||
| 7118 | + background: #D60D04 !important; | ||
| 7119 | + border: 1px solid #D60D04 !important; | ||
| 7120 | + color: #fff !important; | ||
| 7121 | +} | ||
| 7113 | .project_owner_control { | 7122 | .project_owner_control { |
| 7114 | position: relative; | 7123 | position: relative; |
| 7115 | float: right; | 7124 | float: right; |
| @@ -8037,6 +8046,3 @@ li.active-menu-admin:hover a .ico_num { | @@ -8037,6 +8046,3 @@ li.active-menu-admin:hover a .ico_num { | ||
| 8037 | display: none; | 8046 | display: none; |
| 8038 | } | 8047 | } |
| 8039 | .tender_questions_ .input-blocks-comm-button {margin-top: 20px} | 8048 | .tender_questions_ .input-blocks-comm-button {margin-top: 20px} |
| 8040 | -.hidden { | ||
| 8041 | - display: none; | ||
| 8042 | -} | ||
| 8043 | \ No newline at end of file | 8049 | \ No newline at end of file |