Issue #3373557: #toolbar-item-user id can appear twice when user item also in secondary toolbar (cc642a4e) · Commits · project / gin

dist/css/components/toolbar.css

+8 −4

Original line number	Diff line number	Diff line
		@@ -679,22 +679,26 @@ body.gin--classic-toolbar {
		object-position: center;
		}

		#toolbar-item-user {
		#toolbar-item-user,
		#toolbar-item-user-secondary {
		display: inline-block;
		vertical-align: top;
		min-width: unset;
		}

		#toolbar-item-user.icon-user {
		#toolbar-item-user.icon-user,
		#toolbar-item-user-secondary.icon-user {
		margin-top: 2px;
		}

		[dir="ltr"] #toolbar-item-user.icon-user {
		[dir="ltr"] #toolbar-item-user.icon-user,
		[dir="ltr"] #toolbar-item-user-secondary.icon-user {
		padding-left: 0;
		margin-left: var(--gin-spacing-xs);
		}

		[dir="rtl"] #toolbar-item-user.icon-user {
		[dir="rtl"] #toolbar-item-user.icon-user,
		[dir="rtl"] #toolbar-item-user-secondary.icon-user {
		padding-right: 0;
		margin-right: var(--gin-spacing-xs);
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		namespace Drupal\gin;

		use Drupal\Component\Plugin\Exception\PluginNotFoundException;
		use Drupal\Component\Utility\Html;
		use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
		use Drupal\Core\Entity\EntityTypeManagerInterface;
		use Drupal\Core\Security\TrustedCallbackInterface;
		@@ -66,7 +67,7 @@ class GinUserPicture implements ContainerInjectionInterface, TrustedCallbackInte
		'#markup' => $user->getDisplayName(),
		],
		'#attributes' => [
		'id' => 'toolbar-item-user',
		'id' => 'toolbar-item-user-secondary',
		'class' => [
		'toolbar-icon',
		'toolbar-icon-user',

+2 −1