Skip to content

Commit

Permalink
Merge branch '5.x' into 5.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/web/assets/cp/dist/css/cp.css
#	src/web/assets/cp/dist/css/cp.css.map
  • Loading branch information
brandonkelly committed Apr 24, 2024
2 parents bf677fb + 11a31e8 commit 30f21f4
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- Fixed a bug where element caches weren’t getting invalidated when an element was moved within a structure. ([#14846](https://github.com/craftcms/cms/issues/14846))
- Fixed a bug where CSV’s header rows weren’t using the configured delimiter. ([#14855](https://github.com/craftcms/cms/issues/14855))
- Fixed a bug where editable table cell text styling could change after initial focus. ([#14857](https://github.com/craftcms/cms/issues/14857))
- Fixed a bug where clicking on drag handles within element index tables could select the element. ([#14669](https://github.com/craftcms/cms/issues/14669))
- Fixed a bug where nested related categories and entries weren’t removable when the Categories/Entries field’s “Maintain hierarchy” setting was enabled. ([#14843](https://github.com/craftcms/cms/issues/14843))

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.

13 changes: 10 additions & 3 deletions src/web/assets/cp/src/css/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -557,16 +557,22 @@ ol {

/* code */
code,
.code,
.code input,
.code textarea {
.code {
@include fixed-width-font;

&.smalltext {
font-size: 0.8em !important;
}
}

.code {
input,
textarea {
@include fixed-width-font;
font-size: 1em !important;
}
}

pre code {
display: block;
overflow-x: auto;
Expand Down Expand Up @@ -4114,6 +4120,7 @@ table.editable {
box-shadow: none;
border-radius: 0;
padding: 7px 10px;
line-height: 20px;
background-color: transparent;
overflow: hidden;
transition: none;
Expand Down

0 comments on commit 30f21f4

Please sign in to comment.