Skip to content
Snippets Groups Projects
Commit ed25429d authored by catch's avatar catch
Browse files

Issue #3281444 by ravi.shankar, _shY, nod_, Vighneshh, deviantintegral,...

Issue #3281444 by ravi.shankar, _shY, nod_, Vighneshh, deviantintegral, lauriii: Update Installer tests to not use Bartik and Seven

(cherry picked from commit a223aa1c)
parent ada31938
Branches
Tags
24 merge requests!8506Draft: Issue #3456536 by ibrahim tameme,!5646Issue #3350972 by nod_: [random test failure]...,!5600Issue #3350972 by nod_: [random test failure]...,!5343Issue #3305066 by quietone, Rename RedirectLeadingSlashesSubscriber,!4350Issue #3307718: Implement xxHash for non-cryptographic use-cases,!3603#ISSUE 3346218 Add a different message on edit comment,!3555Issue #2473873: Views entity operations lack cacheability support, resulting in incorrect dropbuttons,!3494Issue #3327018 by Spokje, longwave, xjm, mondrake: Update PHPStan to 1.9.3 and...,!3410Issue #3340128: UserLoginForm::submitForm has some dead code,!3389Issue #3325184 by Spokje, andypost, xjm, smustgrave: $this->configFactory is...,!3381Issue #3332363: Refactor Claro's menus-and-lists stylesheet,!3307Issue #3326193: CKEditor 5 can grow past the viewport when there is a lot of content,!3236Issue #3332419: Refactor Claro's messages stylesheet,!3231Draft: Issue #3049525 by longwave, fougere, larowlan, kim.pepper, AaronBauman, Wim...,!3212Issue #3294003: Refactor Claro's entity-meta stylesheet,!3194Issue #3330981: Fix PHPStan L1 error "Relying on entity queries to check access by default is deprecated...",!3143Issue #3313342: [PHP 8.1] Deprecated function: strpos(): Passing null to parameter #1 LayoutBuilderUiCacheContext.php on line 28,!3024Issue #3307509: Empty option for views bulk form,!2972Issue #1845004: Replace custom password hashing library with PHP 5.5 password_hash(),!2719Issue #3110137: Remove Classy from core.,!2688Issue #3261452: [PP-1] Remove tracker module from core,!2437Issue #3238257 by hooroomoo, Wim Leers: Fragment link pointing to <textarea>...,!2296Issue #3100732: Allow specifying `meta` data on JSON:API objects,!1626Issue #3256642: Make life better for database drivers that extend another database driver
......@@ -38,7 +38,7 @@ protected function prepareEnvironment() {
'distribution' => [
'name' => 'My Distribution',
'install' => [
'theme' => 'bartik',
'theme' => 'olivero',
],
],
];
......
......@@ -32,7 +32,7 @@ protected function prepareEnvironment() {
'distribution' => [
'name' => 'My Distribution',
'install' => [
'theme' => 'bartik',
'theme' => 'claro',
'finish_url' => '/root-user',
],
],
......
......@@ -43,7 +43,7 @@ protected function prepareEnvironment() {
'name' => 'My Distribution',
'langcode' => $this->langcode,
'install' => [
'theme' => 'bartik',
'theme' => 'claro',
],
],
];
......
......@@ -45,7 +45,7 @@ protected function prepareEnvironment() {
'name' => 'My Distribution',
'langcode' => $this->langcode,
'install' => [
'theme' => 'bartik',
'theme' => 'claro',
],
],
];
......
......@@ -53,7 +53,7 @@ public function testInstaller() {
protected function setUpLanguage() {
// Test that \Drupal\Core\Render\BareHtmlPageRenderer adds assets and
// metatags as expected to the first page of the installer.
$this->assertSession()->responseContains("core/themes/claro/css/components/button.css");
$this->assertSession()->responseContains("css/components/button.css");
$this->assertSession()->responseContains('<meta charset="utf-8" />');
// Assert that the expected title is present.
......
......@@ -37,7 +37,7 @@ protected function prepareEnvironment() {
'distribution' => [
'name' => $name,
'install' => [
'theme' => 'bartik',
'theme' => 'claro',
],
],
];
......@@ -57,7 +57,7 @@ protected function setUpLanguage() {
// Verify that the distribution name appears.
$this->assertSession()->pageTextContains('distribution_one');
// Verify that the requested theme is used.
$this->assertSession()->responseContains('bartik');
$this->assertSession()->responseContains('claro');
// Verify that the "Choose profile" step does not appear.
$this->assertSession()->pageTextNotContains('profile');
......
......@@ -29,7 +29,7 @@ public function testInstaller() {
protected function setUpSite() {
// Test that the correct theme is being used.
$this->assertSession()->responseNotContains('olivero');
$this->assertSession()->responseContains('themes/claro/css/theme/install-page.css');
$this->assertSession()->responseContains('css/theme/install-page.css');
parent::setUpSite();
}
......
......@@ -23,7 +23,7 @@ function olivero_preprocess_html(&$variables) {
}
// Convert custom hex to hsl so we can use the hue value
$brand_color_hex = theme_get_setting('base_primary_color');
$brand_color_hex = theme_get_setting('base_primary_color') ?? '#1b9ae4';
[$h, $s, $l] = _olivero_hex_to_hsl($brand_color_hex);
$variables['html_attributes']->setAttribute('style', "--color--primary-hue:$h;--color--primary-saturation:$s%;--color--primary-lightness:$l");
......@@ -633,7 +633,7 @@ function olivero_form_views_exposed_form_alter(&$form) {
*
* @internal
*/
function _olivero_hex_to_hsl($hex_string) {
function _olivero_hex_to_hsl(string $hex_string) {
// Convert hexcode pairs to rgb values (0-255).
$hex_val = trim($hex_string, '#');
$r0 = hexdec($hex_val[0] . $hex_val[1]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment