Skip to content
Snippets Groups Projects
Unverified Commit e72fe022 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3155258 by jwilson3, alexpott, lauriii: Use American English spelling of "gray"

parent 01b2e5a4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 31 deletions
core/.cspell.json
+ 2
− 0
View file @ e72fe022
......@@ -3,6 +3,7 @@
"language": "en-US",
"allowCompoundWords": false,
"ignorePaths": [
".cspell.json",
"composer.lock",
"assets/vendor/**",
"lib/Drupal/Component/Diff/**",
......@@ -34,6 +35,7 @@
{ "name": "drupal", "path": "./misc/cspell/dictionary.txt"}
],
"flagWords": [
"grey",
"hte"
],
"overrides": [
......
core/misc/cspell/dictionary.txt
+ 2
− 2
View file @ e72fe022
......@@ -414,7 +414,7 @@ datetimecallback
datetimeiso
datetimeplus
datetype
davysgrey
davysgray
daycount
daycounter
dblog
......@@ -753,8 +753,8 @@ grandgrandchild
grandgrandchild's
granularities
grayblue
grayskull
greeking
greyskull
gripsmall
groupable
groupby
......
core/misc/dialog/off-canvas.reset.css
+ 5
− 5
View file @ e72fe022
......@@ -268,7 +268,7 @@
#drupal-off-canvas input[type="reset"]:active,
#drupal-off-canvas input[type="submit"]:active,
#drupal-off-canvas input[type="button"]:active {
border-color: grey;
border-color: gray;
background-image: none;
box-shadow: none;
}
......@@ -313,7 +313,7 @@
#drupal-off-canvas input[type="time"][disabled],
#drupal-off-canvas input[type="url"][disabled],
#drupal-off-canvas input[type="week"][disabled] {
background-color: grey;
background-color: gray;
}
#drupal-off-canvas input[type="hidden"] {
visibility: hidden;
......@@ -333,7 +333,7 @@
}
#drupal-off-canvas input:placeholder,
#drupal-off-canvas textarea:placeholder {
color: grey;
color: gray;
}
#drupal-off-canvas textarea,
#drupal-off-canvas select[size],
......@@ -366,7 +366,7 @@
vertical-align: middle;
text-decoration: none;
color: black;
border: 1px solid grey;
border: 1px solid gray;
background: none;
}
#drupal-off-canvas * textarea,
......@@ -376,7 +376,7 @@
padding: 0;
vertical-align: top;
color: black;
border: 1px solid grey;
border: 1px solid gray;
background: white;
}
......
core/modules/media/tests/fixtures/oembed/rich_twitter.json
+ 1
− 1
View file @ e72fe022
......@@ -2,7 +2,7 @@
"url": "https:\/\/twitter.com\/drupaldevdays\/status\/935643039741202432",
"author_name": "Drupal Dev Days",
"author_url": "https:\/\/twitter.com\/drupaldevdays",
"html": "<h1>By the power of Greyskull, Twitter works!</h1>",
"html": "<h1>By the power of Grayskull, Twitter works!</h1>",
"width": 550,
"height": 360,
"type": "rich",
......
core/modules/media/tests/fixtures/oembed/video_collegehumor.xml
+ 1
− 1
View file @ e72fe022
......@@ -10,7 +10,7 @@
<provider_url>http://www.collegehumor.com</provider_url>
<width>610</width>
<height>343</height>
<html><h1>By the power of Greyskull, CollegeHumor works!</h1>
<html><h1>By the power of Grayskull, CollegeHumor works!</h1>
</html>
<thumbnail_url>internal:/core/misc/druplicon.png</thumbnail_url>
<thumbnail_width>88</thumbnail_width>
......
core/modules/media/tests/fixtures/oembed/video_vimeo-no-title.json
+ 1
− 1
View file @ e72fe022
......@@ -6,7 +6,7 @@
"title": "",
"author_name": "Tendenci - The Open Source AMS",
"author_url": "https:\/\/vimeo.com\/schipul",
"html": "<iframe width=\"480\">By the power of Greyskull, Vimeo works!</iframe>",
"html": "<iframe width=\"480\">By the power of Grayskull, Vimeo works!</iframe>",
"width": 480,
"height": 360,
"description": "Special thanks to Tendenci, formerly Schipul for sponsoring this video with training, equipment and time. The open source way. All creative however was self directed by the individuals - A. Hughes (www.schipul.com\/ahughes) featuring QCait (www.schipul.com\/qcait) - Hands On Drupal\n\nDrupal is a free software package that allows an individual or a community of users to easily publish, manage and organize a wide variety of content on a website.\n\nNeed a little Drupal help or just want to geek out with us? Visit our www.schipul.com\/drupal for more info - we'd love to connect!\n\nGo here for Drupal Common Terms and Suggested Modules : http:\/\/schipul.com\/en\/helpfiles\/v\/229",
......
core/modules/media/tests/fixtures/oembed/video_vimeo.json
+ 1
− 1
View file @ e72fe022
......@@ -6,7 +6,7 @@
"title": "Drupal Rap Video - Schipulcon09",
"author_name": "Tendenci - The Open Source AMS",
"author_url": "https:\/\/vimeo.com\/schipul",
"html": "<iframe width=\"480\">By the power of Greyskull, Vimeo works!</iframe>",
"html": "<iframe width=\"480\">By the power of Grayskull, Vimeo works!</iframe>",
"width": 480,
"height": 360,
"description": "Special thanks to Tendenci, formerly Schipul for sponsoring this video with training, equipment and time. The open source way. All creative however was self directed by the individuals - A. Hughes (www.schipul.com\/ahughes) featuring QCait (www.schipul.com\/qcait) - Hands On Drupal\n\nDrupal is a free software package that allows an individual or a community of users to easily publish, manage and organize a wide variety of content on a website.\n\nNeed a little Drupal help or just want to geek out with us? Visit our www.schipul.com\/drupal for more info - we'd love to connect!\n\nGo here for Drupal Common Terms and Suggested Modules : http:\/\/schipul.com\/en\/helpfiles\/v\/229",
......
core/modules/media/tests/fixtures/oembed/video_youtube.json
+ 1
− 1
View file @ e72fe022
......@@ -6,7 +6,7 @@
"title": "Everyday I'm Drupalin' Drupal Rap (Rick Ross - Hustlin)",
"author_name": "Mirakolous",
"author_url": "https:\/\/www.youtube.com\/user\/Mirakolous",
"html": "<h1>By the power of Greyskull, YouTube works!</h1>",
"html": "<h1>By the power of Grayskull, YouTube works!</h1>",
"width": 480,
"height": 270,
"thumbnail_url": "internal:\/core\/misc\/druplicon.png",
......
core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php
+ 4
− 4
View file @ e72fe022
......@@ -170,13 +170,13 @@ public function testMediaOEmbedVideoSource() {
// Without a hash should be denied.
$no_hash_query = array_diff_key($query, ['hash' => '']);
$this->drupalGet('media/oembed', ['query' => $no_hash_query]);
$assert_session->pageTextNotContains('By the power of Greyskull, Vimeo works!');
$assert_session->pageTextNotContains('By the power of Grayskull, Vimeo works!');
$assert_session->pageTextContains('Access denied');
// A correct query should be allowed because the anonymous role has the
// 'view media' permission.
$this->drupalGet('media/oembed', ['query' => $query]);
$assert_session->pageTextContains('By the power of Greyskull, Vimeo works!');
$assert_session->pageTextContains('By the power of Grayskull, Vimeo works!');
$this->assertRaw('core/themes/stable/templates/content/media-oembed-iframe.html.twig');
$this->assertNoRaw('core/modules/media/templates/media-oembed-iframe.html.twig');
......@@ -184,7 +184,7 @@ public function testMediaOEmbedVideoSource() {
\Drupal::service('theme_installer')->install(['stark']);
$this->config('system.theme')->set('default', 'stark')->save();
$this->drupalGet('media/oembed', ['query' => $query]);
$assert_session->pageTextContains('By the power of Greyskull, Vimeo works!');
$assert_session->pageTextContains('By the power of Grayskull, Vimeo works!');
$this->assertNoRaw('core/themes/stable/templates/content/media-oembed-iframe.html.twig');
$this->assertRaw('core/modules/media/templates/media-oembed-iframe.html.twig');
......@@ -193,7 +193,7 @@ public function testMediaOEmbedVideoSource() {
$role->revokePermission('view media');
$role->save();
$this->drupalGet('media/oembed', ['query' => $query]);
$assert_session->pageTextNotContains('By the power of Greyskull, Vimeo works!');
$assert_session->pageTextNotContains('By the power of Grayskull, Vimeo works!');
$assert_session->pageTextContains('Access denied');
}
......
core/modules/settings_tray/css/settings_tray.theme.css
+ 1
− 1
View file @ e72fe022
......@@ -41,7 +41,7 @@
background-color: #0066a1;
background-image: linear-gradient(to bottom, #0066a1, #005b98);
}
/* Make the inactive icon grey. */
/* Make the inactive icon gray. */
.toolbar-tab > .toolbar-icon.toolbar-icon-edit.toolbar-item:before {
background-image: url(../../../misc/icons/bebebe/pencil.svg);
}
......
core/modules/shortcut/shortcut.module
+ 1
− 1
View file @ e72fe022
......@@ -28,7 +28,7 @@ function shortcut_help($route_name, RouteMatchInterface $route_match) {
$output .= '<dt>' . t('Choosing shortcut sets') . '</dt>';
$output .= '<dd>' . t('Users with permission to switch shortcut sets can choose a shortcut set to use from the Shortcuts tab of their user account page.') . '</dd>';
$output .= '<dt>' . t('Adding and removing shortcuts') . '</dt>';
$output .= '<dd>' . t('The Shortcut module creates an add/remove link for each page on your site; the link lets you add or remove the current page from the currently-enabled set of shortcuts (if your theme displays it and you have permission to edit your shortcut set). The core Seven administration theme displays this link next to the page title, as a grey or yellow star. If you click on the grey star, you will add that page to your preferred set of shortcuts. If the page is already part of your shortcut set, the link will be a yellow star, and will allow you to remove the current page from your shortcut set.') . '</dd>';
$output .= '<dd>' . t('The Shortcut module creates an add/remove link for each page on your site; the link lets you add or remove the current page from the currently-enabled set of shortcuts (if your theme displays it and you have permission to edit your shortcut set). The core Seven administration theme displays this link next to the page title, as a gray or yellow star. If you click on the gray star, you will add that page to your preferred set of shortcuts. If the page is already part of your shortcut set, the link will be a yellow star, and will allow you to remove the current page from your shortcut set.') . '</dd>';
$output .= '<dt>' . t('Displaying shortcuts') . '</dt>';
$output .= '<dd>' . t('You can display your shortcuts by enabling the <em>Shortcuts</em> block on the <a href=":blocks">Blocks administration page</a>. Certain administrative modules also display your shortcuts; for example, the core <a href=":toolbar-help">Toolbar module</a> provides a corresponding menu item.', [':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? Url::fromRoute('block.admin_display')->toString() : '#', ':toolbar-help' => (\Drupal::moduleHandler()->moduleExists('toolbar')) ? Url::fromRoute('help.page', ['name' => 'toolbar'])->toString() : '#']) . '</dd>';
$output .= '</dl>';
......
core/themes/claro/css/base/elements.css
+ 1
− 1
View file @ e72fe022
......@@ -29,7 +29,7 @@
*/
/*
* Inputs.
*/ /* Absolute zero with opacity. */ /* Davy's grey with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
*/ /* Absolute zero with opacity. */ /* Davy's gray with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
/*
* Details.
*/
......
core/themes/claro/css/base/off-canvas.theme.css
+ 1
− 1
View file @ e72fe022
......@@ -32,7 +32,7 @@
*/
/*
* Inputs.
*/ /* Absolute zero with opacity. */ /* Davy's grey with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
*/ /* Absolute zero with opacity. */ /* Davy's gray with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
/*
* Details.
*/
......
core/themes/claro/css/base/variables.css
+ 1
− 1
View file @ e72fe022
......@@ -24,7 +24,7 @@
*/
/*
* Inputs.
*/ /* Absolute zero with opacity. */ /* Davy's grey with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
*/ /* Absolute zero with opacity. */ /* Davy's gray with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
/*
* Details.
*/
......
core/themes/claro/css/base/variables.pcss.css
+ 5
− 5
View file @ e72fe022
......@@ -14,7 +14,7 @@
--color-lightgray-o-80: rgba(212, 212, 218, 0.8);
--color-grayblue: #8e929c;
--color-oldsilver: #82828c;
--color-davysgrey: #545560;
--color-davysgray: #545560;
--color-maximumred: #d72222;
--color-sunglow: #ffd23f;
--color-sunglow-shaded: #977405;
......@@ -82,7 +82,7 @@
*/
--input-fg-color: var(--color-fg);
--input-bg-color: var(--color-bg);
--input-fg-color--description: var(--color-davysgrey);
--input-fg-color--description: var(--color-davysgray);
--input-fg-color--placeholder: var(--color-grayblue);
--input-border-color: var(--color-grayblue);
--input--hover-border-color: var(--color-text);
......@@ -90,7 +90,7 @@
--input--focus-shadow-color: rgba(0, 74, 220, 0.3); /* Absolute zero with opacity. */
--input--error-color: var(--color-maximumred);
--input--error-border-color: var(--color-maximumred);
--input--disabled-color: rgba(84, 85, 96, 0.6); /* Davy's grey with 0.6 opacity. */
--input--disabled-color: rgba(84, 85, 96, 0.6); /* Davy's gray with 0.6 opacity. */
--input--disabled-fg-color: var(--color-oldsilver);
--input--disabled-bg-color: #f2f2f3; /* Light gray with 0.3 opacity on white bg. */
--input--disabled-border-color: #bababf; /* Old silver with 0.5 opacity on white bg. */
......@@ -149,7 +149,7 @@
/**
* jQuery.UI dropdown.
*/
--jui-dropdown-fg-color: var(--color-davysgrey);
--jui-dropdown-fg-color: var(--color-davysgray);
--jui-dropdown-bg-color: var(--color-white);
--jui-dropdown--active-fg-color: var(--color-white);
--jui-dropdown--active-bg-color: var(--color-absolutezero);
......@@ -180,7 +180,7 @@
--progress-bar-spacing-size: var(--space-xs);
--progress-bar-transition: width 0.5s ease-out;
--progress-bar-label-color: var(--color-text);
--progress-bar-description-color: var(--color-davysgrey);
--progress-bar-description-color: var(--color-davysgray);
--progress-bar-description-font-size: var(--font-size-xs);
--progress-track-border-color: var(--color-grayblue);
--progress-track-bg-color: var(--color-lightgray);
......
core/themes/claro/css/components/accordion.css
+ 1
− 1
View file @ e72fe022
......@@ -30,7 +30,7 @@
*/
/*
* Inputs.
*/ /* Absolute zero with opacity. */ /* Davy's grey with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
*/ /* Absolute zero with opacity. */ /* Davy's gray with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
/*
* Details.
*/
......
core/themes/claro/css/components/action-link.css
+ 1
− 1
View file @ e72fe022
......@@ -32,7 +32,7 @@
*/
/*
* Inputs.
*/ /* Absolute zero with opacity. */ /* Davy's grey with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
*/ /* Absolute zero with opacity. */ /* Davy's gray with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
/*
* Details.
*/
......
core/themes/claro/css/components/action-link.pcss.css
+ 1
− 1
View file @ e72fe022
......@@ -44,7 +44,7 @@
padding: calc(var(--space-m) - ((var(--space-l) - var(--space-m)) / 2)) var(--space-m);
cursor: pointer;
text-decoration: none;
color: var(--color-davysgrey);
color: var(--color-davysgray);
border-radius: var(--button-border-radius-size);
background-color: var(--color-bg);
font-size: var(--font-size-base);
......
core/themes/claro/css/components/ajax-progress.module.css
+ 1
− 1
View file @ e72fe022
......@@ -30,7 +30,7 @@
*/
/*
* Inputs.
*/ /* Absolute zero with opacity. */ /* Davy's grey with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
*/ /* Absolute zero with opacity. */ /* Davy's gray with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
/*
* Details.
*/
......
core/themes/claro/css/components/autocomplete-loading.module.css
+ 1
− 1
View file @ e72fe022
......@@ -32,7 +32,7 @@
*/
/*
* Inputs.
*/ /* Absolute zero with opacity. */ /* Davy's grey with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
*/ /* Absolute zero with opacity. */ /* Davy's gray with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
/*
* Details.
*/
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment