Skip to content

Commit

Permalink
Merge pull request #16309 from craftcms/bugfix/cms-16298-stacking-issues
Browse files Browse the repository at this point in the history
Stacking issues
  • Loading branch information
brandonkelly authored Dec 11, 2024
2 parents f38e72e + 4c62818 commit 665c919
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release Notes for Craft CMS 5

## Unreleased

- Fixed a styling issue in Safari. ([#16298](https://github.com/craftcms/cms/issues/16298))

## 5.5.6 - 2024-12-10

- Fixed a bug where some blank user group and entry type values weren’t getting omitted from project config data. ([#16272](https://github.com/craftcms/cms/pull/16272), [#16273](https://github.com/craftcms/cms/pull/16273))
Expand Down
4 changes: 2 additions & 2 deletions src/templates/_layouts/cp.twig
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ history.replaceState(undefined, undefined, window.location.href.match(/^[^#]*/)[
{% endif %}
<div id="app-info">
{% set fullEditionName = '{edition} edition'|t('app', {edition: editionName}) %}
<span>
<span lang="en">
<span class="flex items-center">
<span lang="en" class="flex items-center">
Craft CMS
<span id="edition-logo" title="{{ fullEditionName }}">
<span aria-hidden="true">{{ editionName }}</span>
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/css/cp.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/css/cp.css.map

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions src/web/assets/cp/src/css/_cp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -275,20 +275,17 @@ a#system-info {
}

#edition-logo {
position: relative;
inset-block-start: -1px;
user-select: none;
border: 1px solid var(--gray-600);
border-radius: 3px;
display: inline-flex;
box-sizing: content-box;
font-size: 11px;
padding-block: 6px;
padding-inline: 7px;
padding-inline: 7px 5px;
line-height: 8px;
font-weight: 600;
letter-spacing: 1.7px;
padding-inline-end: 5px;
text-transform: uppercase;
}

Expand Down
2 changes: 0 additions & 2 deletions src/web/assets/cp/src/css/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -872,8 +872,6 @@ li.sel > a {
font-size: 11px;
margin-block-start: -1px;
padding-inline-start: 4px;
color: var(--link-color);
opacity: 0.9;

body.ltr & {
content: 'circlerarr';
Expand Down

0 comments on commit 665c919

Please sign in to comment.