LoweBowe/libarea
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

FIX: Подписка (фасеты) и Профиль (css)

Browse source
This commit is contained in:
Evg 2022-08-08 11:41:26 +03:00
parent 9b90e4ec97
commit e5b16e3d32
8 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Models/HomeModel.php
View file

@ -212,8 +212,9 @@ class HomeModel extends \Hleb\Scheme\App\Models\MainModel
facet_img,
facet_type
FROM facets
LEFT JOIN facets_signed ON signed_facet_id = facet_id AND signed_user_id = :id
AND facet_type = 'topic' AND facet_type = 'blog'";
LEFT JOIN facets_signed ON signed_facet_id = facet_id
WHERE signed_user_id = :id AND (facet_type = 'topic' OR facet_type = 'blog')
ORDER BY facet_id DESC";
return DB::run($sql, ['id' => $user_id])->fetchAll();
}

2
public/assets/css/style.css
View file

File diff suppressed because one or more lines are too long

2
resources/views/default/_block/recommended-topics.php
View file

@ -16,7 +16,7 @@
<?= Html::image($topic['facet_img'], $topic['facet_title'], 'img-base', 'logo', 'max'); ?>
<?= $topic['facet_title']; ?>
</a>
<div class="mt5 text-sm gray-600">
<div class="mt5 text-sm max-w780 gray">
<?= $topic['facet_description']; ?>
</div>
</div>

2
resources/views/default/content/search/search.php
View file

@ -31,7 +31,7 @@ $sw = $sw ?? '?';
}
?>
<div class="max-w880 mb20">
<div class="max-w780 mb20">
<div>
<a class="text-xl" target="_blank" rel="nofollow noreferrer" href="<?= $url_content; ?>">
<?= $result['title']; ?>

4
resources/views/default/content/user/profile/header.php
View file

@ -16,10 +16,10 @@ endif;
<?php if ($profile['cover_art'] != 'cover_art.jpeg') : ?>
<div class="relative">
<img class="w-100" src="<?= Html::coverUrl($profile['cover_art'], 'user'); ?>" alt="<?= $profile['login']; ?>">
<img class="profile-bg-img" src="<?= Html::coverUrl($profile['cover_art'], 'user'); ?>" alt="<?= $profile['login']; ?>">
</div>
<?php else : ?>
<div class="w-100 relative bg-profile"></div>
<div class="profile-bg-img relative bg-profile"></div>
<?php endif; ?>
<div class="profile-header-footer mt15">

1
resources/views/default/css/components/basic.css
View file

@ -194,7 +194,6 @@ li.br-li-bottom-no:last-child { border-bottom: 1px solid transparent; }
.max-w-100 { max-width: 100%; }
.max-w780 { max-width: 780px; }
.max-w880 { max-width: 880px; }
.max-w300 { max-width: 300px; }
.text-xs { font-size: 0.75rem; }

7
resources/views/default/css/components/components.css
View file

@ -347,3 +347,10 @@ article iframe {
display: flex;
gap: 1rem;
}
.profile-bg-img {
width: 100%;
height: 225px;
}
.profile-bg-img.bg-profile { height: 90px; }

2
resources/views/default/css/components/media.css
View file

@ -63,6 +63,8 @@ main { flex: 1; }
height: 80px;
width: 80px;
}
.profile-bg-img { height: 75px; }
.mb-block,
#contentWrapper { display: block; }