mirror of
https://github.com/humhub/humhub.git
synced 2025-01-17 06:08:21 +01:00
This commit is contained in:
parent
74b57663f0
commit
5899616837
@ -38,6 +38,7 @@ HumHub Changelog
|
|||||||
- Enh #7224: Added `user\Module::$invitesTimeToLiveInDays` to automatically clean up User Invites after a specified number of days
|
- Enh #7224: Added `user\Module::$invitesTimeToLiveInDays` to automatically clean up User Invites after a specified number of days
|
||||||
- Enh #7231: Removed deprecated `ShowMorePager` widget
|
- Enh #7231: Removed deprecated `ShowMorePager` widget
|
||||||
- Fix #7230: Update module with new id
|
- Fix #7230: Update module with new id
|
||||||
|
- Enh #7233: Mobile view: enlarge images in gallery preview of entries for the wall stream
|
||||||
|
|
||||||
1.16.3 (Unreleased)
|
1.16.3 (Unreleased)
|
||||||
--------------------------
|
--------------------------
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
use humhub\components\ActiveRecord;
|
use humhub\components\ActiveRecord;
|
||||||
use humhub\modules\file\converter\PreviewImage;
|
use humhub\modules\file\converter\PreviewImage;
|
||||||
use humhub\modules\file\widgets\FilePreview;
|
|
||||||
use humhub\modules\file\libs\FileHelper;
|
use humhub\modules\file\libs\FileHelper;
|
||||||
|
use humhub\modules\file\widgets\FilePreview;
|
||||||
use humhub\modules\ui\view\helpers\ThemeHelper;
|
use humhub\modules\ui\view\helpers\ThemeHelper;
|
||||||
use humhub\widgets\JPlayerPlaylistWidget;
|
use humhub\widgets\JPlayerPlaylistWidget;
|
||||||
use yii\helpers\Html;
|
use yii\helpers\Html;
|
||||||
@ -29,14 +29,24 @@ foreach ($files as $file) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$fullWidthColumnClass = 'col-media col-xs-12 col-sm-12 col-md-12';
|
$nbFiles = count($files);
|
||||||
$nonFluidColumnClass = 'col-media col-xs-3 col-sm-3 col-md-4';
|
$isFluid = ThemeHelper::isFluid();
|
||||||
$fluidColumnClass = 'col-media col-xs-3 col-sm-3 col-md-2';
|
|
||||||
|
|
||||||
$galleryColumnClass = ThemeHelper::isFluid() ? $fluidColumnClass : $nonFluidColumnClass;
|
// Image height is defined in file.less and matches this template
|
||||||
|
$mobileBsColumns = 6;
|
||||||
|
$desktopBsColumns = $isFluid ? 3 : 4;
|
||||||
|
if ($nbFiles === 1) {
|
||||||
|
$mobileBsColumns = 12;
|
||||||
|
$desktopBsColumns = $isFluid ? 4 : 6;
|
||||||
|
}
|
||||||
|
if ($nbFiles === 2) {
|
||||||
|
$desktopBsColumns = $isFluid ? 4 : 6;
|
||||||
|
}
|
||||||
|
$fullWidthColumnClass = 'col-media col-xs-12 col-sm-12 col-md-12';
|
||||||
|
$galleryColumnClass = 'col-media col-xs-' . $mobileBsColumns . ' col-sm-' . $desktopBsColumns . ' col-md-' . $desktopBsColumns;
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<?php if (count($files) > 0): ?>
|
<?php if ($nbFiles > 0): ?>
|
||||||
<!-- hideOnEdit mandatory since 1.2 -->
|
<!-- hideOnEdit mandatory since 1.2 -->
|
||||||
<div class="hideOnEdit">
|
<div class="hideOnEdit">
|
||||||
<!-- Show Images as Thumbnails -->
|
<!-- Show Images as Thumbnails -->
|
||||||
|
@ -65,30 +65,43 @@ ul.files {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
& when (@isFluid) {
|
// Matches the protected/humhub/modules/file/widgets/views/showFiles.php template
|
||||||
@media (min-width: 1200px) and (max-width: 1700px) {
|
|
||||||
.post-files img {
|
// extra-small
|
||||||
height: 100px;
|
@media (max-width: 768px) {
|
||||||
}
|
.post-files {
|
||||||
|
img {
|
||||||
|
height: 150px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: 992px) and (max-width: 1199px) {
|
.col-xs-12 img { // One image
|
||||||
.post-files img {
|
height: 300px;
|
||||||
height: 80px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 991px) {
|
|
||||||
.post-files img {
|
|
||||||
height: 100px;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
& when not(@isFluid) {
|
// small
|
||||||
@media (max-width: 650px) {
|
@media (min-width: 768px) and (max-width: 991px) {
|
||||||
.post-files img {
|
.post-files {
|
||||||
height: 100px;
|
img {
|
||||||
|
height: 150px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.col-sm-6 img { // One or two images
|
||||||
|
height: 250px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// medium
|
||||||
|
@media (min-width: 992px) {
|
||||||
|
.post-files {
|
||||||
|
img {
|
||||||
|
height: 200px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.col-sm-6 img { // One or two images
|
||||||
|
height: 300px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -322,6 +322,10 @@ span.likeLinkContainer .unlike.disabled {
|
|||||||
#topbar-first .nav > .account .dropdown-toggle #user-account-image {
|
#topbar-first .nav > .account .dropdown-toggle #user-account-image {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
#topbar-first .nav > .account .dropdown-toggle #user-account-image + .caret {
|
||||||
|
float: right;
|
||||||
|
margin: 12px 0 0 6px;
|
||||||
|
}
|
||||||
#topbar-first .topbar-brand {
|
#topbar-first .topbar-brand {
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
@ -1932,13 +1936,23 @@ input[type=checkbox]:checked {
|
|||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
input[type=checkbox]:checked::after {
|
input[type=checkbox]:checked::after {
|
||||||
content: '\2714';
|
content: '\f00c';
|
||||||
font-size: 14px;
|
/* FontAwesome checkmark */
|
||||||
|
font-family: 'FontAwesome';
|
||||||
|
/* FontAwesome Font */
|
||||||
|
font-size: 12px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: -3px;
|
top: 0;
|
||||||
left: 1px;
|
left: 1px;
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
/* Chromium */
|
||||||
|
@supports (-webkit-appearance: none) {
|
||||||
|
input[type=checkbox]:checked::after {
|
||||||
|
top: 1px;
|
||||||
|
left: 1px;
|
||||||
|
}
|
||||||
|
}
|
||||||
input[type=radio] {
|
input[type=radio] {
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
@ -3356,9 +3370,28 @@ ul.files li.file-preview-item .file-fileInfo {
|
|||||||
object-fit: cover;
|
object-fit: cover;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
}
|
}
|
||||||
@media (max-width: 650px) {
|
@media (max-width: 768px) {
|
||||||
.post-files img {
|
.post-files img {
|
||||||
height: 100px;
|
height: 150px;
|
||||||
|
}
|
||||||
|
.post-files .col-xs-12 img {
|
||||||
|
height: 300px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media (min-width: 768px) and (max-width: 991px) {
|
||||||
|
.post-files img {
|
||||||
|
height: 150px;
|
||||||
|
}
|
||||||
|
.post-files .col-sm-6 img {
|
||||||
|
height: 250px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media (min-width: 992px) {
|
||||||
|
.post-files img {
|
||||||
|
height: 200px;
|
||||||
|
}
|
||||||
|
.post-files .col-sm-6 img {
|
||||||
|
height: 300px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.post-file-list {
|
.post-file-list {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user