Skip to content

[4.0] Remove comments re IE11 from core code #26263

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

Merged
wilsonge merged 11 commits into from
Oct 19, 2019
Merged

[4.0] Remove comments re IE11 from core code #26263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
59f8630
redo since I messed it up.
N6REJ Sep 9, 2019
27cd209
syncing 4.0-dev branch
N6REJ Sep 9, 2019
ae9dd05
added stylesheet ordering per
N6REJ Sep 9, 2019
2924942
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 4…
N6REJ Sep 11, 2019
5016f43
redo due to #26237
N6REJ Sep 11, 2019
3225aca
redo due to #26237
N6REJ Sep 11, 2019
6355b5d
redo due to #26237
N6REJ Sep 11, 2019
dbbab7b
removing erroneously added .editorconfig file
N6REJ Sep 11, 2019
e41995b
Merge branch '4.0-dev' into ie11
N6REJ Sep 19, 2019
ffa554f
Update components/com_content/tmpl/category/blog.php
N6REJ Sep 20, 2019
9cea4a2
Merge branch '4.0-dev' into ie11
N6REJ Oct 18, 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
4 changes: 0 additions & 4 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 All @@ -98,12 +96,10 @@
<?php foreach ($this->intro_items as $key => &$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 endforeach; ?>
</div>
Expand Down
4 changes: 0 additions & 4 deletions components/com_content/tmpl/featured/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,10 @@
<?php foreach ($this->lead_items as &$item) : ?>
<div class="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 All @@ -49,12 +47,10 @@
<?php foreach ($this->intro_items as $key => &$item) : ?>
<div class="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 endforeach; ?>
</div>
Expand Down
87 changes: 42 additions & 45 deletions templates/cassiopeia/scss/blocks/_modifiers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,48 @@

.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: column;

@include media-breakpoint-up(sm) {
flex-direction: row;
}
}
}

@supports (display: grid) {
Expand Down Expand Up @@ -146,51 +188,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: column;

@include media-breakpoint-up(sm) {
flex-direction: row;
}
}
}

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