Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/edge' into edge
Browse files Browse the repository at this point in the history
  • Loading branch information
@math-GH
math-GH committed May 12, 2024
2 parents 68a6491 + 3b953d7 commit 78ade92
Show file tree
Hide file tree
Showing 19 changed files with 32 additions and 40 deletions.
4 changes: 2 additions & 2 deletions app/views/helpers/index/normal/entry_header.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
?></li><?php
endif; ?>
<li class="item titleAuthorSummaryDate">
<span class="item-element title<?= (($topline_thumbnail !== 'none') || $topline_summary) ? ' multiline' : '' ?>" dir="auto"><a target="_blank" rel="noreferrer" href="<?= $this->entry->link() ?>"><?= $this->entry->title() ?><?php
<a target="_blank" rel="noreferrer" href="<?= $this->entry->link() ?>" class="item-element title<?= (($topline_thumbnail !== 'none') || $topline_summary) ? ' multiline' : '' ?>" dir="auto"><?= $this->entry->title() ?><?php
if ($topline_display_authors):
?><span class="author"><?php
$authors = $this->entry->authors();
Expand All @@ -65,7 +65,7 @@
}
?></span><?php
endif;
?></a></span>
?></a>
<?php
if ($topline_summary):
?><div class="summary"><?= trim(mb_substr(strip_tags($this->entry->content(false)), 0, 500, 'UTF-8')) ?></div><?php
Expand Down
2 changes: 1 addition & 1 deletion p/themes/Alternative-Dark/adark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ kbd {
background: var(--background-color-hover);
}

.flux .flux_header .item .title a {
.flux .flux_header .item .title {
color: var(--font-color-light);
}

Expand Down
2 changes: 1 addition & 1 deletion p/themes/Alternative-Dark/adark.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ kbd {
background: var(--background-color-hover);
}

.flux .flux_header .item .title a {
.flux .flux_header .item .title {
color: var(--font-color-light);
}

Expand Down
1 change: 0 additions & 1 deletion p/themes/Ansum/_sidebar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@
color: variables.$grey-dark;
text-transform: uppercase;
letter-spacing: 1px;
margin-top: 1rem;
}

.nav-form {
Expand Down
1 change: 0 additions & 1 deletion p/themes/Ansum/ansum.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,6 @@ th {
color: #766556;
text-transform: uppercase;
letter-spacing: 1px;
margin-top: 1rem;
}
.nav-list .nav-form {
padding: 3px;
Expand Down
1 change: 0 additions & 1 deletion p/themes/Ansum/ansum.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,6 @@ th {
color: #766556;
text-transform: uppercase;
letter-spacing: 1px;
margin-top: 1rem;
}
.nav-list .nav-form {
padding: 3px;
Expand Down
3 changes: 1 addition & 2 deletions p/themes/Dark/dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ button.as-link[disabled] {

.nav-list .nav-header {
background-color: var(--dark-background-color1);
border-bottom: 1px solid var(--dark-border-color3);
}

/*=== Dropdown */
Expand Down Expand Up @@ -452,7 +451,7 @@ button.as-link[disabled] {
background-color: var(--dark-background-color1);
}

.flux .flux_header .item .title a {
.flux .flux_header .item .title {
color: var(--dark-font-color8);
}

Expand Down
3 changes: 1 addition & 2 deletions p/themes/Dark/dark.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ button.as-link[disabled] {

.nav-list .nav-header {
background-color: var(--dark-background-color1);
border-bottom: 1px solid var(--dark-border-color3);
}

/*=== Dropdown */
Expand Down Expand Up @@ -452,7 +451,7 @@ button.as-link[disabled] {
background-color: var(--dark-background-color1);
}

.flux .flux_header .item .title a {
.flux .flux_header .item .title {
color: var(--dark-font-color8);
}

Expand Down
1 change: 0 additions & 1 deletion p/themes/Mapco/_sidebar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@
color: variables.$grey-dark;
text-transform: uppercase;
letter-spacing: 1px;
margin-top: 1rem;
}

.nav-form {
Expand Down
1 change: 0 additions & 1 deletion p/themes/Mapco/mapco.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,6 @@ th {
color: #5b6871;
text-transform: uppercase;
letter-spacing: 1px;
margin-top: 1rem;
}
.nav-list .nav-form {
padding: 3px;
Expand Down
1 change: 0 additions & 1 deletion p/themes/Mapco/mapco.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,6 @@ th {
color: #5b6871;
text-transform: uppercase;
letter-spacing: 1px;
margin-top: 1rem;
}
.nav-list .nav-form {
padding: 3px;
Expand Down
6 changes: 3 additions & 3 deletions p/themes/Nord/nord.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ img.favicon {
}

.aside_feed .tree-folder-items.active {
padding-bottom: 2rem;
padding-bottom: 1rem;
background-color: var(--main-background);
}

Expand Down Expand Up @@ -810,7 +810,7 @@ li.item.active {
transition: .3s;
}

.flux .flux_header .item .title a {
.flux .flux_header .item .title {
color: var(--text-default);
}

Expand Down Expand Up @@ -1114,7 +1114,7 @@ optgroup::before {
}

.nav-list .nav-header {
padding: 1rem 1rem 0 1rem;
padding: 0 1rem;
font-weight: bold;
}

Expand Down
6 changes: 3 additions & 3 deletions p/themes/Nord/nord.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ img.favicon {
}

.aside_feed .tree-folder-items.active {
padding-bottom: 2rem;
padding-bottom: 1rem;
background-color: var(--main-background);
}

Expand Down Expand Up @@ -810,7 +810,7 @@ li.item.active {
transition: .3s;
}

.flux .flux_header .item .title a {
.flux .flux_header .item .title {
color: var(--text-default);
}

Expand Down Expand Up @@ -1114,7 +1114,7 @@ optgroup::before {
}

.nav-list .nav-header {
padding: 1rem 1rem 0 1rem;
padding: 0 1rem;
font-weight: bold;
}

Expand Down
1 change: 0 additions & 1 deletion p/themes/Origine/origine.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@ a:hover .icon {
.nav-list .nav-header {
background-color: var(--background-color-grey);
color: var(--font-color-grey);
border-bottom: 1px solid var(--border-color);
font-weight: bold;
}

Expand Down
1 change: 0 additions & 1 deletion p/themes/Origine/origine.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@ a:hover .icon {
.nav-list .nav-header {
background-color: var(--background-color-grey);
color: var(--font-color-grey);
border-bottom: 1px solid var(--border-color);
font-weight: bold;
}

Expand Down
3 changes: 1 addition & 2 deletions p/themes/Pafat/pafat.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ th {
padding: 0 1rem;
background-color: var(--background-color-grey);
color: var(--font-color-grey);
border-bottom: 1px solid var(--border-color-grey-light);
font-weight: bold;
}

Expand Down Expand Up @@ -803,7 +802,7 @@ a.signin {
background-color: var(--background-color-grey-hover);
}

.flux .flux_header:hover .title a {
.flux .flux_header:hover .title {
color: var(--font-color-hover);
}

Expand Down
3 changes: 1 addition & 2 deletions p/themes/Pafat/pafat.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ th {
padding: 0 1rem;
background-color: var(--background-color-grey);
color: var(--font-color-grey);
border-bottom: 1px solid var(--border-color-grey-light);
font-weight: bold;
}

Expand Down Expand Up @@ -803,7 +802,7 @@ a.signin {
background-color: var(--background-color-grey-hover);
}

.flux .flux_header:hover .title a {
.flux .flux_header:hover .title {
color: var(--font-color-hover);
}

Expand Down
16 changes: 9 additions & 7 deletions p/themes/base-theme/frss.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,10 @@ input[type="checkbox"]:focus-visible {
text-overflow: ellipsis;
}

.nav-list .item.nav-section > ul {
margin-bottom: 1rem;
}

/*=== Horizontal-list */
.horizontal-list {
margin: 0;
Expand Down Expand Up @@ -1294,11 +1298,6 @@ a.website:hover .favicon {
vertical-align: top;
}

.flux .flux_header .item .title a {
color: var(--frss-font-color-dark);
text-decoration: none;
}

.flux .flux_header .item.thumbnail {
line-height: 0;
padding: var(--frss-padding-top-bottom) var(--frss-padding-flux-items);
Expand Down Expand Up @@ -1353,13 +1352,16 @@ a.website:hover .favicon {
}

.flux .flux_header .item .title {
display: inline-block;
max-width: 100%;
min-width: calc(100% - 155px);
color: var(--frss-font-color-dark);
position: absolute;
top: 0;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
box-sizing: border-box;
max-width: 100%;
text-decoration: none;
}

.flux .flux_header .item .title:has(~.date) {
Expand Down
16 changes: 9 additions & 7 deletions p/themes/base-theme/frss.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,10 @@ input[type="checkbox"]:focus-visible {
text-overflow: ellipsis;
}

.nav-list .item.nav-section > ul {
margin-bottom: 1rem;
}

/*=== Horizontal-list */
.horizontal-list {
margin: 0;
Expand Down Expand Up @@ -1294,11 +1298,6 @@ a.website:hover .favicon {
vertical-align: top;
}

.flux .flux_header .item .title a {
color: var(--frss-font-color-dark);
text-decoration: none;
}

.flux .flux_header .item.thumbnail {
line-height: 0;
padding: var(--frss-padding-top-bottom) var(--frss-padding-flux-items);
Expand Down Expand Up @@ -1353,13 +1352,16 @@ a.website:hover .favicon {
}

.flux .flux_header .item .title {
display: inline-block;
max-width: 100%;
min-width: calc(100% - 155px);
color: var(--frss-font-color-dark);
position: absolute;
top: 0;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
box-sizing: border-box;
max-width: 100%;
text-decoration: none;
}

.flux .flux_header .item .title:has(~.date) {
Expand Down

0 comments on commit 78ade92

Please sign in to comment.