diff --git a/profiles/drupalru/themes/druru/css/style.css b/profiles/drupalru/themes/druru/css/style.css index af926e47..dd8179f8 100644 --- a/profiles/drupalru/themes/druru/css/style.css +++ b/profiles/drupalru/themes/druru/css/style.css @@ -7862,7 +7862,7 @@ form#user-admin-permissions .form-type-checkbox { content: "\f070"; font-size: 13px; } -.comment__content, +.comment__content:not(:first-child), .comment__links { margin-top: 15px; } @@ -9012,7 +9012,7 @@ ul.li-accent > *:before { content: "\f070"; font-size: 13px; } -.node__content, +.node__content:not(:first-child), .node__links { margin-top: 15px; } @@ -10581,22 +10581,6 @@ h3.popover-title { .page-messages .privatemsg-message.first-of-author-stack:not(.current-user) .media-body.new:after { border-top-color: #a6d593; } -.page-messages .privatemsg-message.first-of-author-stack.current-user .media-body:before { - border-width: 15px 30px 15px 10px; - border-top-color: #e9eff3; - right: -26px; - top: 30px; - -webkit-transform: rotate(36.25deg); - transform: rotate(36.25deg); -} -.page-messages .privatemsg-message.first-of-author-stack.current-user .media-body:after { - border-width: 17px 32px 17px 13px; - border-top-color: #a9c1d3; - right: -30px; - top: 30px; - -webkit-transform: rotate(36.25deg); - transform: rotate(36.25deg); -} .page-messages .privatemsg-message.first-of-author-stack.current-user .media-body.new:before { border-bottom-color: #dff0d8; } @@ -11389,5 +11373,17 @@ blockquote footer:before { max-width: 100%; height: auto; } +.forum-topic-list .row:not(:first-child) { + margin-top: 5px; +} +.forum-topic-list .row > *:not(.title) { + font-size: 13px; +} +.forum-topic-list .row .author { + white-space: nowrap; +} +li.ticket-assign a:before { + content: unset; +} /*# sourceMappingURL=style.css.map */ diff --git a/profiles/drupalru/themes/druru/less/drupal/modules/_privatemsg.less b/profiles/drupalru/themes/druru/less/drupal/modules/_privatemsg.less index b6bb713f..d51be45d 100644 --- a/profiles/drupalru/themes/druru/less/drupal/modules/_privatemsg.less +++ b/profiles/drupalru/themes/druru/less/drupal/modules/_privatemsg.less @@ -126,22 +126,6 @@ &.current-user { .media-body { - &:before { - border-width: @pmgs-bt @pmgs-br @pmgs-bb @pmgs-bl; - border-top-color: @privatemsg-bg; - right: -@pmsg-p-width+4; - top: @pmsg-p-top + 10; - .rotate(@pmgs-rotate*@pmsg-right-rotate-coeff); - } - - &:after { - border-width: @pmgs-bt+2 @pmgs-br+2 @pmgs-bb+2 @pmgs-bl+3; - border-top-color: @privatemsg-border; - right: -@pmsg-p-width; - top: @pmsg-p-top + 10; - .rotate(@pmgs-rotate*@pmsg-right-rotate-coeff); - } - &.new { &:before { border-bottom-color: @privatemsg-bg-new; diff --git a/profiles/drupalru/themes/druru/less/drupal/placeholders/_entity.less b/profiles/drupalru/themes/druru/less/drupal/placeholders/_entity.less index df673d13..4ddb0410 100644 --- a/profiles/drupalru/themes/druru/less/drupal/placeholders/_entity.less +++ b/profiles/drupalru/themes/druru/less/drupal/placeholders/_entity.less @@ -39,7 +39,7 @@ } } - &__content, + &__content:not(:first-child), &__links { margin-top: @gap-entity; } diff --git a/profiles/drupalru/themes/druru/less/fixes.less b/profiles/drupalru/themes/druru/less/fixes.less index 421fc961..c3880ce6 100644 --- a/profiles/drupalru/themes/druru/less/fixes.less +++ b/profiles/drupalru/themes/druru/less/fixes.less @@ -3,4 +3,24 @@ .node-event img { max-width: 100%; height: auto; -} \ No newline at end of file +} + +.forum-topic-list { + .row { + &:not(:first-child) { + margin-top: @gap-listing-page; + } + + > *:not(.title) { + font-size: @font-size-aux; + } + + .author { + white-space: nowrap; + } + } +} + +li.ticket-assign a:before { + content: unset; +} diff --git a/profiles/drupalru/themes/druru/theme/privatemsg/privatemsg-view.vars.php b/profiles/drupalru/themes/druru/theme/privatemsg/privatemsg-view.vars.php index cd0c66cd..820d1c7a 100644 --- a/profiles/drupalru/themes/druru/theme/privatemsg/privatemsg-view.vars.php +++ b/profiles/drupalru/themes/druru/theme/privatemsg/privatemsg-view.vars.php @@ -30,4 +30,20 @@ function druru_preprocess_privatemsg_view(&$vars) { if (!$vars['author_place']) { $vars['author_place'] = $author_place; } + + $picture = isset($message->author->picture) ? $message->author->picture : null; + + if (!empty($picture->uri)) { + $filepath = $picture->uri; + } + elseif (variable_get('user_picture_default', '')) { + $filepath = variable_get('user_picture_default', ''); + } + + if (isset($filepath)) { + $vars['author_picture'] = theme('image_style', array( + 'style_name' => 'thumbnail', + 'path' => $filepath, + )); + } } diff --git a/profiles/drupalru/themes/druru/theme/system/node.tpl.php b/profiles/drupalru/themes/druru/theme/system/node.tpl.php index 6773b9c9..97daf704 100644 --- a/profiles/drupalru/themes/druru/theme/system/node.tpl.php +++ b/profiles/drupalru/themes/druru/theme/system/node.tpl.php @@ -93,32 +93,34 @@ -
+