From f52b68098a36379ce122bac04dd613b0cf9f41b3 Mon Sep 17 00:00:00 2001 From: yarik Date: Wed, 27 Jul 2016 18:28:35 +0300 Subject: [PATCH] Commit --- common/modules/comment/models/Comment.php | 2 +- frontend/web/css/style.css | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------- 2 files changed, 123 insertions(+), 33 deletions(-) diff --git a/common/modules/comment/models/Comment.php b/common/modules/comment/models/Comment.php index 1b8704d..52d0a4c 100755 --- a/common/modules/comment/models/Comment.php +++ b/common/modules/comment/models/Comment.php @@ -151,7 +151,7 @@ public function attributeLabels() { return [ - 'text' => \Yii::t('app', 'Комментарий'), + 'text' => \Yii::t('app', 'Мнение'), 'user_name' => \Yii::t('app', 'Имя'), 'user_email' => \Yii::t('app', 'Email'), ]; diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 83dfdcf..a4736db 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -938,6 +938,7 @@ li.project-home-active span { padding: 0 155px; overflow: hidden; } + .footer-all-wr { width: 100%; float: left; @@ -2490,14 +2491,23 @@ input[type=file]::-webkit-file-upload-button { .performance-vacancy-sidebar-stars { margin-top: 24px; } + .gallery-page-sidebar .performance-vacancy-sidebar-stars { margin-top: -5px; - } +} + .gallery-page-sidebar .performer-vacancy-sidebar-img { margin-bottom: 10px; } -.gallery-performer-margin .empty {margin-left: 33px;} -.performance-vacancy-sidebar-stars .rating-container {height: 19px} + +.gallery-performer-margin .empty { + margin-left: 33px; +} + +.performance-vacancy-sidebar-stars .rating-container { + height: 19px +} + /****perform-vacancy-page****/ .performer-vacancy-list { border-bottom: 1px solid #dcdcdc; @@ -2640,9 +2650,10 @@ input[type=file]::-webkit-file-upload-button { .section-box-16 { height: 380px; } + .section-box-16:before, .section-box-14:before { position: absolute; - top:0; + top: 0; left: 0; width: 100%; height: 100%; @@ -2651,6 +2662,7 @@ input[type=file]::-webkit-file-upload-button { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; content: ''; } + .blog-buttons-wr { margin-top: 305px; width: 526px; @@ -2757,7 +2769,7 @@ input[type=file]::-webkit-file-upload-button { } /*.blog-post-wr:first-child {*/ - /*margin-top: -1px*/ +/*margin-top: -1px*/ /*}*/ .blog-post-title p { @@ -3534,6 +3546,7 @@ input[type=file]::-webkit-file-upload-button { font-weight: 700; margin-bottom: 5px; } + .search-work-form .info-search-input .form-control { height: 29px; color: #636363; @@ -4898,15 +4911,35 @@ ul.proektant-comments { #modal_form_question { height: 533px } -#modal_form_contacts {height: 553px} + +#modal_form_contacts { + height: 553px +} + #modal_form_login { height: 423px } -#modal_form_contacts .form-resume-wr {overflow: visible} -#modal_form_contacts .contacts-form-help span {font-weight: 400} -#modal_form_contacts .field-feedback-answer {margin-bottom: 20px} -#modal_form_contacts .field-feedback-answer .help-block{top:41px;} -#modal_form_contacts .contacts-form-wrapper {cursor: pointer} + +#modal_form_contacts .form-resume-wr { + overflow: visible +} + +#modal_form_contacts .contacts-form-help span { + font-weight: 400 +} + +#modal_form_contacts .field-feedback-answer { + margin-bottom: 20px +} + +#modal_form_contacts .field-feedback-answer .help-block { + top: 41px; +} + +#modal_form_contacts .contacts-form-wrapper { + cursor: pointer +} + #modal_form_login .form-resume-wr form label, #modal_form_contacts .form-resume-wr form label { float: none } @@ -5372,9 +5405,11 @@ form.offer-project { float: left; width: 100%; } + .search-profile-blocks:hover { box-shadow: 0px 0px 5px 0px rgba(149, 149, 149, 0.75); } + .search-profile-blocks:first-child { margin-top: 0 } @@ -5814,7 +5849,7 @@ ul.min_markers_two { .right-proektant-cabinet { width: 222px; position: absolute; - top:0; + top: 0; right: 0; height: 100%; } @@ -5901,8 +5936,6 @@ ul.min_markers_two { } - - .right-proektant-cabinet-candidate span { font-size: 11px; color: #0072bc; @@ -5916,7 +5949,7 @@ ul.min_markers_two { } .right-proektant-cabinet-message-new { - width: 100%; + width: 100%; margin-top: 12px; } @@ -12210,17 +12243,20 @@ li.active-menu-admin:hover a .ico_num { margin-top: -3px; } + .comments-name span { - color: inherit; + color: inherit; } .comments-name a { color: #0072bc; text-decoration: none; } + .new-portf-comm-read .comments-name a, .new-portf-comm-read .comments-name span { font-size: 13px; } + .comments-name a:hover { text-decoration: underline } @@ -12238,11 +12274,16 @@ li.active-menu-admin:hover a .ico_num { text-align: center; text-decoration: none; } + .artbox_project_make_trash, .artbox_project_make_new { margin-left: 0; } -.artbox_comment_delete {font-size: 13px; - margin-top:15px;} + +.artbox_comment_delete { + font-size: 13px; + margin-top: 15px; +} + .fix_te .artbox_comment_delete_answer, .artbox_comment_delete { color: #f10b00; border: 1px solid #f10b00; @@ -12357,19 +12398,23 @@ li.active-menu-admin:hover a .ico_num { top: 50px; z-index: 10; } + .portfolio_user_figure { width: 25%; padding: 0 10px; display: inline-block; } + .portfolio_user_figure .portfolio_user_image { width: 100%; } + .portfolio_user_figure .portfolio_user_caption { text-align: center; } + /*.field-portfolio-cover.has-error.success_download .help-block {*/ - /*display: none;*/ +/*display: none;*/ /*}*/ .new-portf-comm-read .blog-post-date { margin-top: 17px; @@ -12378,8 +12423,12 @@ li.active-menu-admin:hover a .ico_num { .new-portf-add-comm .input-blocks-comm:first-child { margin-left: 0; } -.input-blocks-comm.fix_marg_ {margin-left: 0} -.new-portf-add-comm .field-comment-user_email .hint-block{ + +.input-blocks-comm.fix_marg_ { + margin-left: 0 +} + +.new-portf-add-comm .field-comment-user_email .hint-block { position: absolute; font-size: 13px; color: #b7b7b7; @@ -12388,7 +12437,8 @@ li.active-menu-admin:hover a .ico_num { left: 240px; width: 165px; } -.fix_onions .comments-name{ + +.fix_onions .comments-name { font-weight: 700; } @@ -12399,7 +12449,12 @@ li.active-menu-admin:hover a .ico_num { color: #b7b7b7;; font-size: 13px; } -.left-proektant-cabinet .summary {color: inherit;margin-top: 0} + +.left-proektant-cabinet .summary { + color: inherit; + margin-top: 0 +} + #modal_form_contacts .fileloader-list { position: absolute; top: 34px; @@ -12408,6 +12463,7 @@ li.active-menu-admin:hover a .ico_num { height: 19px; text-align: right; } + #modal_form_contacts .fileloader-item-name { width: 100%; height: 19px; @@ -12416,12 +12472,14 @@ li.active-menu-admin:hover a .ico_num { box-sizing: border-box; padding-left: 20px; } + #modal_form_contacts .fileloader-item-name a { position: relative; font-size: 13px; color: #333 !important; border-bottom: 0 !important; } + #modal_form_contacts .fileloader-item-name a:before { position: absolute; content: ''; @@ -12431,6 +12489,7 @@ li.active-menu-admin:hover a .ico_num { top: 4px; left: -17px; } + #modal_form_contacts .fileloader-item-remove { position: absolute; top: 50%; @@ -12441,8 +12500,16 @@ li.active-menu-admin:hover a .ico_num { background: url("/images/delet-file.png") no-repeat; padding-left: 0 !important; } -#modal_form_contacts .fileloader-item-remove:before {display:none;} -.command-block-name {overflow: hidden; font-size: 16px;} + +#modal_form_contacts .fileloader-item-remove:before { + display: none; +} + +.command-block-name { + overflow: hidden; + font-size: 16px; +} + .general_avatar-wr #image_remove_img { left: auto !important; right: -13px; @@ -12453,13 +12520,17 @@ li.active-menu-admin:hover a .ico_num { /* specialisations */ -.new-spec-block{ +.new-spec-block { width: 100%; position: relative; font-size: 13px; margin-bottom: 15px; } -.new-spec-block .content-menu-first{width: 100%;} + +.new-spec-block .content-menu-first { + width: 100%; +} + .new-spec-block ul.content-menu-first li { width: 100%; list-style: none; @@ -12472,6 +12543,7 @@ li.active-menu-admin:hover a .ico_num { transition: 0.3s; background: #fff; } + .new-spec-block ul.content-menu-first li > ul { position: absolute; top: 0; @@ -12479,6 +12551,7 @@ li.active-menu-admin:hover a .ico_num { width: 235px; height: 100%; } + .new-spec-block ul.content-menu-first li > ul li { height: auto; line-height: 14px; @@ -12486,6 +12559,7 @@ li.active-menu-admin:hover a .ico_num { padding: 8px 8px 7px 19px; width: 235px; } + .new-spec-block ul.content-menu-first li > ul { position: absolute; top: 0; @@ -12493,12 +12567,14 @@ li.active-menu-admin:hover a .ico_num { width: 235px; height: 100%; } + .new-spec-block ul.third-ul-menu li { background: #fff !important; border-left: 1px solid #dfdfdf; - line-height: 18px!important; - width: 235px!important; + line-height: 18px !important; + width: 235px !important; } + .new-spec-block .search-work-form input[type="checkbox"] + label span { width: 12px; height: 12px; @@ -12507,13 +12583,21 @@ li.active-menu-admin:hover a .ico_num { transition: 0.2s; margin-top: 3px; } + .new-spec-block ul.content-menu-first li > ul li { height: auto; min-height: 30px; padding: 8px 8px 7px 19px; } -.new-spec-block .form-group {margin-bottom: 0px!important;} -.new-spec-block .control-label {font-weight: 100!important;} + +.new-spec-block .form-group { + margin-bottom: 0px !important; +} + +.new-spec-block .control-label { + font-weight: 100 !important; +} + .left-search-work .admin-specialization-selected ul { width: 105%; max-height: 250px; @@ -12521,7 +12605,13 @@ li.active-menu-admin:hover a .ico_num { overflow-y: auto; margin: 0px 0px 15px -10px; } -.left-search-work .admin-specialization-selected ul li {border-bottom:none;float: initial;padding-right: 20px;} + +.left-search-work .admin-specialization-selected ul li { + border-bottom: none; + float: initial; + padding-right: 20px; +} + .left-search-work .admin-specialization-selected ul li:before { right: 8px; } \ No newline at end of file -- libgit2 0.21.4