Skip to content

[4.0] blog.php Scrabble96 patch 4 #26160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Scrabble96 wants to merge 14 commits into from
Closed

[4.0] blog.php Scrabble96 patch 4 #26160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ade3852
Update en-GB.com_templates.ini
Scrabble96 Jan 12, 2019
1126b71
Merge pull request #1 from Scrabble96/Scrabble96-patch-2
Scrabble96 Jan 12, 2019
da8d7fe
Merge branch '4.0-dev' into 4.0-dev
wilsonge Jan 12, 2019
cc0fe71
Merge branch '4.0-dev' into 4.0-dev
zero-24 Jan 13, 2019
b4e22ca
Merge pull request #3 from joomla/4.0-dev
Scrabble96 Aug 15, 2019
30721b3
Merge pull request #4 from joomla/4.0-dev
Scrabble96 Aug 17, 2019
616bca9
Merge pull request #5 from joomla/4.0-dev
Scrabble96 Sep 1, 2019
768419f
[J4.0] Update blog.php to remove IE11 code and comment
Scrabble96 Sep 4, 2019
d1bf150
Update blog.php
Scrabble96 Sep 4, 2019
948c756
Update components/com_content/tmpl/category/blog.php
Scrabble96 Sep 4, 2019
9d3375e
Merge branch '4.0-dev' into Scrabble96-patch-4
Scrabble96 Sep 4, 2019
d060ddd
Merge branch '4.0-dev' into Scrabble96-patch-4
Scrabble96 Sep 6, 2019
6c4299d
Merge branch '4.0-dev' into Scrabble96-patch-4
Scrabble96 Sep 8, 2019
044b709
Update_modifier.scss
Scrabble96 Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions components/com_content/tmpl/category/blog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,10 @@
<?php foreach ($this->lead_items as &$item) : ?>
<div class="com-content-category-blog__item blog-item"
itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
<div class="blog-item-content"><!-- Double divs required for IE11 grid fallback -->
<?php
$this->item = & $item;
echo $this->loadTemplate('item');
?>
</div>
</div>
<?php $leadingcount++; ?>
<?php endforeach; ?>
Expand Down
85 changes: 41 additions & 44 deletions templates/cassiopeia/scss/blocks/_modifiers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,47 @@

.blog-item {
padding: 0 ($cassiopeia-grid-gutter / 2) $cassiopeia-grid-gutter ($cassiopeia-grid-gutter / 2);
display: flex;
flex-direction: column;
.boxed & {
background-color: #fff;
box-shadow: 0 0 2px rgba(52, 58, 67, 0.1), 0 2px 5px rgba(52, 58, 67, 0.08), 0 5px 15px rgba(52, 58, 67, 0.08), inset 0 3px 0 $cassiopeia-template-color;
.item-content {
padding: 25px;
}
}
.image-left &, .image-right & {
flex-direction: row;
}
.item-image {
margin-top: 3px;
margin-bottom: 15px;
overflow: hidden;
.boxed & {
margin-bottom: 0;
}
.image-right & {
order: 1;
}
.image-bottom & {
order: 1;
margin-top: -15px;
}
}
.item-content {
.image-left & {
padding-left: 25px;
}
.image-right & {
padding-right: 25px;
}
}
.image-left &, .image-right & {
flex-direction: row;
@include media-breakpoint-down(sm) {
flex-direction: column;
}
}
}

@supports (display: grid) {
Expand Down Expand Up @@ -153,50 +194,6 @@
}
}

.blog-item-content {
display: flex;
flex-direction: column;
.boxed & {
background-color: #fff;
box-shadow: 0 0 2px rgba(52, 58, 67, 0.1), 0 2px 5px rgba(52, 58, 67, 0.08), 0 5px 15px rgba(52, 58, 67, 0.08), inset 0 3px 0 $cassiopeia-template-color;
.item-content {
padding: 25px;
}
}
.image-left &, .image-right & {
flex-direction: row;
}
.item-image {
margin-top: 3px;
margin-bottom: 15px;
overflow: hidden;
.boxed & {
margin-bottom: 0;
}
.image-right & {
order: 1;
}
.image-bottom & {
order: 1;
margin-top: -15px;
}
}
.item-content {
.image-left & {
padding-left: 25px;
}
.image-right & {
padding-right: 25px;
}
}
.image-left &, .image-right & {
flex-direction: row;
@include media-breakpoint-down(sm) {
flex-direction: column;
}
}
}

.image-alternate {
.blog-item:nth-of-type(2n+1) {
.item-image {
Expand Down