Commit 3faf12eebd2d4b5ab1eb4590e80fd7e9c7a0beeb
1 parent
46abec5f
git
Showing
3 changed files
with
75 additions
and
7 deletions
Show diff stats
common/modules/comment/widgets/views/_question_comment_view.php
@@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
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> | 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;"> | 26 | <div style="width: 500px; float: left; margin-left: 12px;"> |
27 | <div class="comments-name style <?= CommentWidget::$baseClass[ 'comment_author' ] ?>"> | 27 | <div class="comments-name style <?= CommentWidget::$baseClass[ 'comment_author' ] ?>"> |
28 | - <a href="/fdf"><?= $model->getAuthor(' (Гость)') ?></a> | 28 | + <a href="/"><?= $model->getAuthor(' (Гость)') ?></a> |
29 | 29 | ||
30 | </div> | 30 | </div> |
31 | 31 | ||
@@ -42,7 +42,7 @@ | @@ -42,7 +42,7 @@ | ||
42 | <!-- <div class="comments-date style">--><?//= \Yii::$app->formatter->asDate($model->date_add, 'php:d.m.Y') ?><!--</div>--> | 42 | <!-- <div class="comments-date style">--><?//= \Yii::$app->formatter->asDate($model->date_add, 'php:d.m.Y') ?><!--</div>--> |
43 | </div> | 43 | </div> |
44 | <div class="comments-content"> | 44 | <div class="comments-content"> |
45 | - <div class="style" style="font-weight: 700">Вопрос</div> | 45 | + <div class="style" style="font-weight: 700;">Вопрос</div> |
46 | <div class="style" style="margin-top: 2px"><?= $model->text ?></div> | 46 | <div class="style" style="margin-top: 2px"><?= $model->text ?></div> |
47 | </div> | 47 | </div> |
48 | <?php | 48 | <?php |
@@ -61,7 +61,7 @@ | @@ -61,7 +61,7 @@ | ||
61 | ]); | 61 | ]); |
62 | } | 62 | } |
63 | ?> | 63 | ?> |
64 | - <div class="buutons_comm" style="margin-top: 16px"> | 64 | + <div class="buutons_comm style" style="margin-top: 15px"> |
65 | <?php | 65 | <?php |
66 | if(!empty( $model->buttons[ 'delete' ] )) { | 66 | if(!empty( $model->buttons[ 'delete' ] )) { |
67 | 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' ]); |
frontend/views/tender/view.php
@@ -231,8 +231,8 @@ $this->title = 'My Yii Application'; | @@ -231,8 +231,8 @@ $this->title = 'My Yii Application'; | ||
231 | <div class="box-wr"> | 231 | <div class="box-wr"> |
232 | <div class="box-all"> | 232 | <div class="box-all"> |
233 | <ul> | 233 | <ul> |
234 | - <li class="active">Заявки</li> | ||
235 | - <li>Вопрос-Ответ</li> | 234 | + <li class="active"><a href="#tabs_1">Заявки</a></li> |
235 | + <li><a href="#tabs_2">Вопрос-Ответ</a></li> | ||
236 | </ul> | 236 | </ul> |
237 | </div> | 237 | </div> |
238 | </div> | 238 | </div> |
frontend/web/css/style.css
@@ -6923,7 +6923,7 @@ li.active-menu-admin:hover a .ico_num { | @@ -6923,7 +6923,7 @@ li.active-menu-admin:hover a .ico_num { | ||
6923 | } | 6923 | } |
6924 | .hint-link.hint-link-check .hint-block { | 6924 | .hint-link.hint-link-check .hint-block { |
6925 | top:0; | 6925 | top:0; |
6926 | - margin-top: -3px; | 6926 | + margin-top: 2px; |
6927 | left: 133px; | 6927 | left: 133px; |
6928 | } | 6928 | } |
6929 | .hint-link-check {margin-top: 23px} | 6929 | .hint-link-check {margin-top: 23px} |
@@ -7011,9 +7011,17 @@ li.active-menu-admin:hover a .ico_num { | @@ -7011,9 +7011,17 @@ li.active-menu-admin:hover a .ico_num { | ||
7011 | line-height: 42px; | 7011 | line-height: 42px; |
7012 | color: inherit; | 7012 | color: inherit; |
7013 | font-size: 15px; | 7013 | font-size: 15px; |
7014 | - padding: 0 20px; | ||
7015 | cursor: pointer; | 7014 | cursor: pointer; |
7016 | border-top: 3px solid #f1f1f1; | 7015 | border-top: 3px solid #f1f1f1; |
7016 | + | ||
7017 | +} | ||
7018 | +.tabs_list ul li a { | ||
7019 | + color: inherit; | ||
7020 | + text-decoration: none; | ||
7021 | + width: 100%; | ||
7022 | + height: 100%; | ||
7023 | + display: block; | ||
7024 | + padding: 0 20px; | ||
7017 | box-sizing: border-box; | 7025 | box-sizing: border-box; |
7018 | } | 7026 | } |
7019 | .tabs_list ul li.active { | 7027 | .tabs_list ul li.active { |
@@ -8046,3 +8054,63 @@ li.active-menu-admin:hover a .ico_num { | @@ -8046,3 +8054,63 @@ li.active-menu-admin:hover a .ico_num { | ||
8046 | display: none; | 8054 | display: none; |
8047 | } | 8055 | } |
8048 | .tender_questions_ .input-blocks-comm-button {margin-top: 20px} | 8056 | .tender_questions_ .input-blocks-comm-button {margin-top: 20px} |
8057 | +._tabs .comments-name { | ||
8058 | + font-weight: normal; | ||
8059 | + color: #0072bc; | ||
8060 | + margin-top: -3px; | ||
8061 | +} | ||
8062 | +._tabs .comments-name a { | ||
8063 | + color: inherit; | ||
8064 | + text-decoration: none; | ||
8065 | + } | ||
8066 | +._tabs .comments-name a:hover {text-decoration: underline} | ||
8067 | +.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer { | ||
8068 | + border-radius: 4px; | ||
8069 | + display: block; | ||
8070 | + float: left; | ||
8071 | + margin-left: 20px; | ||
8072 | + color: #0072bc; | ||
8073 | + border: 1px solid #0072bc; | ||
8074 | + width: 170px; | ||
8075 | + height: 27px; | ||
8076 | + line-height: 27px; | ||
8077 | + text-align: center; | ||
8078 | + text-decoration: none; | ||
8079 | +} | ||
8080 | +.fix_te .artbox_comment_delete_answer { | ||
8081 | + color: #f10b00; | ||
8082 | + border: 1px solid #f10b00; | ||
8083 | +} | ||
8084 | +.fix_te .blog-post-date {margin-top: 20px;} | ||
8085 | +._tabs .artbox_comment_form, ._tabs .tender-offer-proj-title-all, ._tabs .comments-content, ._tabs div.artbox_comment_container, .has-child .artbox_comment_container > div { | ||
8086 | + width: 100%; | ||
8087 | + float: left; | ||
8088 | +} | ||
8089 | +._tabs ul.proektant-comments { | ||
8090 | + margin-top: 25px; | ||
8091 | +} | ||
8092 | +._tabs .comments-content {margin-top: 9px} | ||
8093 | +.has-child .comments-content { | ||
8094 | + padding-bottom: 14px; | ||
8095 | + position: relative; | ||
8096 | + border-bottom:1px solid #dcdcdc; | ||
8097 | +} | ||
8098 | +.has-child .comments-content:before { | ||
8099 | + position: absolute; | ||
8100 | + content: ''; | ||
8101 | + width: 15px; | ||
8102 | + height: 13px; | ||
8103 | + left: 92px; | ||
8104 | + bottom:-13px; | ||
8105 | + background: #fff url("../images/comments_arrow.png") no-repeat; | ||
8106 | +} | ||
8107 | +.has-child .artbox_comment_container { | ||
8108 | + margin-top: 30px; | ||
8109 | + padding-left: 30px; | ||
8110 | + box-sizing: border-box; | ||
8111 | +} | ||
8112 | +.has-child .artbox_comment_container .comments-content { | ||
8113 | + padding-bottom: 0; | ||
8114 | + border-bottom: 0; | ||
8115 | +} | ||
8116 | +.has-child .artbox_comment_container .comments-content:before {display: none} | ||
8049 | \ No newline at end of file | 8117 | \ No newline at end of file |