Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Twenty Twenty-One: Correct the DocBlock for `map-deep-set()` Sass function. 

Props mukesh27.
Merges [49799] to the 5.6 branch.
Fixes #52064.
Built from https://develop.svn.wordpress.org/branches/5.6@49815


git-svn-id: http://core.svn.wordpress.org/branches/5.6@49534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
desrosj 2020-12-17 12:52:09 +00:00
parent e2b6b7309e
commit b5b4bc3cd1
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-content/themes/twentytwentyone/assets/sass/02-tools/functions.scss
View File

@ -46,16 +46,16 @@
@return $map;
}
// ep set function to set a value in nested maps
// uthor Hugo Giraudel
// ccess public
// aram {Map} $map - Map
// aram {List} $keys - Key chaine
// aram {*} $value - Value to assign
// eturn {Map}
// Deep set function to set a value in nested maps
// @author Hugo Giraudel
// @access public
// @param {Map} $map - Map
// @param {List} $keys - Key chaine
// @param {*} $value - Value to assign
// @return {Map}
//
// ample:
// _prefix-default-config: map-deep-set($__prefix-default-config, "layouts" "M", 650px);
// Example:
// $__prefix-default-config: map-deep-set($__prefix-default-config, "layouts" "M", 650px);
@function map-deep-set($map, $keys, $value) {
$maps: ($map);
$result: null;
@ -63,7 +63,7 @@
// If the last key is a map already
// Warn the user we will be overriding it with $value
@if type-of(nth($keys, -1)) == "map" {
@warn "The last key you specified is a map; it will be overrided with `#{$value}`.";
@warn "The last key you specified is a map; it will be overridden with `#{$value}`.";
}
// If $keys is a single key

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.6.1-alpha-49809';
$wp_version = '5.6.1-alpha-49815';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.