Skip to content

Commit

Permalink
Merge branch 'release/4.1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
vincent-gao committed Sep 19, 2024
2 parents fba584d + 4ab1618 commit 3d271ca
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
9 changes: 4 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"drupal/config_perms": "2.x-dev@dev",
"drupal/config_split": "^2.0",
"drupal/config_update": "^2.0@alpha",
"drupal/core": "10.2.5",
"drupal/core-recommended": "10.2.5",
"drupal/core": "10.3.x",
"drupal/core-recommended": "10.3.x",
"drupal/ckeditor_templates": "dev-feature/d10-compatible-with-ck5-support",
"drupal/ctools": "^3.14",
"drupal/diff": "^1.1",
Expand Down Expand Up @@ -212,10 +212,9 @@
},
"drupal/core": {
"Refactor Xss::attributes() to allow filtering of style attribute values - https://www.drupal.org/project/drupal/issues/3109650#comment-15443091": "https://www.drupal.org/files/issues/2024-02-15/drupal-n3109650-72-102x.patch",
"Empty breadcrumb at node/add and node/add/{content_type} when frontpage view is enabled - https://www.drupal.org/project/drupal/issues/3220437": "https://www.drupal.org/files/issues/2021-08-25/3220437-61.patch",
"Add a 'machine_name' widget for string field types with a UniqueField constraint - https://www.drupal.org/project/drupal/issues/2685749#comment-15361693": "https://www.drupal.org/files/issues/2023-12-15/machine-name-widget-2685749-130.patch",
"PathBasedBreadcrumbBuilder needs to be able to exclude pointless paths - https://www.drupal.org/project/drupal/issues/3344200": "https://www.drupal.org/files/issues/2024-06-26/3344200-17.patch",
"Add a 'machine_name' widget for string field types with a UniqueField constraint - https://www.drupal.org/project/drupal/issues/2685749#comment-15361693": "https://www.drupal.org/files/issues/2024-06-21/machine-name-widget-2685749-140.patch",
"Paragraphs fields cause overflow of content forms in Claro-https://www.drupal.org/project/drupal/issues/3145188": "https://www.drupal.org/files/issues/2023-01-25/3145188-37_0.patch",
"Autocomplete widget in node sidebar causes overflow-https://www.drupal.org/project/drupal/issues/3268619#comment-14955369": "https://www.drupal.org/files/issues/2023-03-07/3268619_autocomplete_overflow_5.patch",
"Form Required Class Missing from Claro - https://www.drupal.org/project/drupal/issues/3160987#comment-14609681": "https://www.drupal.org/files/issues/2022-07-17/3160987-10.patch",
"DateTimeComputed tries to compute from an empty value - https://www.drupal.org/project/drupal/issues/3052608#comment-14666671": "https://www.drupal.org/files/issues/2022-08-25/DateTimeComputed-tries-to-compute-from-an-empty-value-3052608-16.patch",
"Querying with NULL values results in warning mb_strtolower() - https://www.drupal.org/project/drupal/issues/3302838": "https://www.drupal.org/files/issues/2022-08-23/3302838-13.patch",
Expand Down
18 changes: 5 additions & 13 deletions css/claro_layout.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
@media screen and (min-width: 61rem) {
.layout-region--node-main,
.layout-region--node-footer {
margin-inline: unset !important;
width: unset !important;
}
.layout-region--node-main .layout-region__content,
.layout-region--node-footer .layout-region__content {
max-width: 100rem !important;
}
.layout-region--node-secondary {
margin-top: unset !important;
}
:root {
/**
* The variable is designated exclusively for use in the footer and the main section of nodes, making it safe to overwrite.
*/
--layout-region-edit-width: min(100rem, 100%) !important;
}

0 comments on commit 3d271ca

Please sign in to comment.