Skip to content
Snippets Groups Projects
Unverified Commit 1015c1b3 authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #3279640 by alexpott, Spokje, mherchel, lauriii, catch: Standard install...

Issue #3279640 by alexpott, Spokje, mherchel, lauriii, catch: Standard install profile uses Olivero for update.php
parent 1b9a758b
No related branches found
No related tags found
42 merge requests!85673265330-fix-missing-hyphens: Create patch to MR and fix remaining words,!8394[warning] array_flip(): Can only flip STRING and INTEGER values, when saving a non-revisionable custom content entity,!7780issue 3443822: fix for 'No route found for the specified format html. Supported formats: json, xml.',!7416Simplify the HTML of field.html.twig,!7150Revert "Issue #3137119 by munish.kumar, johnwebdev, Jaypan, jungle, xjm,...,!6445Issue #3034692: Renamed the getHandler function which return the configuration of a handler instance on given display,!5013Issue #3071143: Table Render Array Example Is Incorrect,!4848Issue #1566662: Update module should send notifications on Thursdays,!4792Issue #2230689: Remove redundant "Italic" style,!4782Issue #2662898: "Links" field not displaying on custom view modes,!4220Issue #3368223: Link field > Access to internal links is not checked on display.,!4173Issue #2123543: Add string context and location filters to the translate interface,!3884Issue #3356842,!3870Issue #3087868,!3812Draft: Issue #3339373 by alexpott, andypost, mondrake:...,!3736Issue #3294005: Refactor Claro's form--password-confirm stylesheet,!3686Issue #3219967 against 9.5.x,!3683Issue #2939397: Clearing AliasManager cache with root path raises warning,!3543Issue #3344259: Allow ajax dialog to have focus configurable,!3437Issue #3106205: Length of menu_tree.url and menu_tree.route_param_key are too short (255 characters),!3356Issue #3209129: Scrolling problems when adding a block via layout builder,!2982Issue #3301562: Translate the default settings for this plugin (TimestampAgoFormatter),!2921Issue #1383696: Allow a custom HTML element to be selected for a grouping field,!2920Issue #3260175: Saving media entity without an owner crashes,!2857Issue #3314541: Remove unnecessary fill from SVG icon for the "Media Library" CKEditor 5 button — enabling dark mode support in contrib,!2841Resolve #3296811 "Resourceresponsetrait needs a",!2803Issue #3041402: Add option absolute url in formatter URL to image,!2733Issue #3293855: Update the outdated user_help text for user.admin_permissions and the description of the select box on the role settings page,!2527Issue #3298714: Undefined #options and Count Warning in Radios.php,!2447Issue #3293135: shouldUpdateThumbnail does not update thumbnail is source field changed,!2428Issue #3032078: Multiple webheads can cause infinite growth of Twig cache,!2280Issue #3280415: Metapackage Generator Breaks Under Composer --no-dev,!2205Quote all names in the regions section.,!2050Issue #3272969: Remove UnqiueField constraint.,!1956Issue #3268872: hook_views_invalidate_cache not called when a view is deleted,!1893Issue #3217260: Add a way to make media captions not editable in CKEditor,!1690fixing include_source documentation at SubProcess.php,!1520Issue #2815221: Add ability to use Quick Edit to the latest_revision route,!1459Issue #3087632: menu_name max length is too long,!878Issue #3221534: throw an exception when IDs passed to loadMultiple() are badly formed,!866Issue #2845319: The highlighting of the 'Home' menu-link does not respect query strings and fragment identifiers,!204Issue #3040556: It is not possible to react to an entity being duplicated
......@@ -3,6 +3,7 @@
namespace Drupal\system\Theme;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Extension\ThemeHandlerInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Site\Settings;
use Drupal\Core\Theme\ThemeNegotiatorInterface;
......@@ -19,14 +20,28 @@ class DbUpdateNegotiator implements ThemeNegotiatorInterface {
*/
protected $configFactory;
/**
* The theme handler.
*
* @var \Drupal\Core\Extension\ThemeHandlerInterface
*/
protected $themeHandler;
/**
* Constructs a DbUpdateNegotiator.
*
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
* The config factory.
* @param \Drupal\Core\Extension\ThemeHandlerInterface|null $theme_handler
* The theme handler.
*/
public function __construct(ConfigFactoryInterface $config_factory) {
public function __construct(ConfigFactoryInterface $config_factory, ThemeHandlerInterface $theme_handler = NULL) {
$this->configFactory = $config_factory;
if ($theme_handler === NULL) {
@trigger_error('Calling ' . __METHOD__ . '() without the $theme_handler argument is deprecated in drupal:9.4.0 and $theme_handler argument will be required in drupal:10.0.0. See https://www.drupal.org/node/3279699', E_USER_DEPRECATED);
$theme_handler = \Drupal::service('theme_handler');
}
$this->themeHandler = $theme_handler;
}
/**
......@@ -40,10 +55,9 @@ public function applies(RouteMatchInterface $route_match) {
* {@inheritdoc}
*/
public function determineActiveTheme(RouteMatchInterface $route_match) {
$custom_theme = Settings::get('maintenance_theme', 'seven');
$custom_theme = Settings::get('maintenance_theme');
if (!$custom_theme) {
$config = $this->configFactory->get('system.theme');
$custom_theme = $config->get('default');
$custom_theme = $this->themeHandler->themeExists('claro') ? 'claro' : 'seven';
}
return $custom_theme;
......
......@@ -30,7 +30,7 @@ services:
- { name: theme_negotiator, priority: 1000 }
theme.negotiator.system.db_update:
class: Drupal\system\Theme\DbUpdateNegotiator
arguments: ['@config.factory']
arguments: ['@config.factory', '@theme_handler']
tags:
- { name: theme_negotiator, priority: 100 }
system.config_subscriber:
......
......@@ -15,6 +15,10 @@
background-color: #dedfe4;
}
.title {
margin-top: 0;
}
.site-name {
margin-top: 1rem;
word-wrap: break-word;
......@@ -179,6 +183,19 @@
[dir="rtl"] .layout-sidebar-first {
float: right;
}
/* Positioning sidebar & content */
main {
float: left; /* LTR */
clear: none;
box-sizing: border-box;
width: 65%;
padding-left: 3.85em; /* LTR */
}
[dir="rtl"] main {
float: right;
padding-right: 3.85em;
padding-left: 0;
}
}
/**
......
......@@ -10,6 +10,10 @@
background-color: var(--color-gray-100);
}
.title {
margin-top: 0;
}
.site-name {
margin-top: var(--space-m);
word-wrap: break-word;
......@@ -171,6 +175,19 @@
[dir="rtl"] .layout-sidebar-first {
float: right;
}
/* Positioning sidebar & content */
main {
float: left; /* LTR */
clear: none;
box-sizing: border-box;
width: 65%;
padding-left: 3.85em; /* LTR */
}
[dir="rtl"] main {
float: right;
padding-right: 3.85em;
padding-left: 0;
}
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment