diff --git a/core/modules/user/css/user.admin.css b/core/modules/user/css/user.admin.css index 10358c2..bc31386 100644 --- a/core/modules/user/css/user.admin.css +++ b/core/modules/user/css/user.admin.css @@ -20,3 +20,23 @@ font-size: 0.85em; padding-bottom: .5em; } + +/* Align user tab and menu to the right in toolbar. */ +.toolbar-bar .user-toolbar-tab.toolbar-tab { + float: right; /* LTR */ +} +[dir="rtl"] .toolbar-bar .user-toolbar-tab.toolbar-tab { + float: left; +} +/* @todo research a good way to do this for all user menu items if more are added. */ +.toolbar-tray-horizontal .toolbar-menu li.account, +.toolbar-tray-horizontal .toolbar-menu li.account-edit, +.toolbar-tray-horizontal .toolbar-menu li.logout { + float: right; /* LTR */ +} +[dir="rtl"] .toolbar-tray-horizontal .toolbar-menu li.account, +[dir="rtl"] .toolbar-tray-horizontal .toolbar-menu li.account-edit, +[dir="rtl"] .toolbar-tray-horizontal .toolbar-menu li.logout { + float: left; +} + diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 90b813f..12b9a69 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -1359,6 +1359,10 @@ function user_toolbar() { ], ], ), + '#wrapper_attributes' => array( + 'class' => array('user-toolbar-tab'), + 'id' => 'toolbar-tab-user', + ), 'tray' => array( '#heading' => t('User account actions'), 'user_links' => array( diff --git a/core/themes/bartik/css/components/toolbar.css b/core/themes/bartik/css/components/toolbar.css index 35a5762..53198e9 100644 --- a/core/themes/bartik/css/components/toolbar.css +++ b/core/themes/bartik/css/components/toolbar.css @@ -6,3 +6,22 @@ .toolbar a { border-bottom: none; } + +/* Align user tab and menu to the right in toolbar. */ +.toolbar-bar .user-toolbar-tab.toolbar-tab { + float: right; /* LTR */ +} +[dir="rtl"] .toolbar-bar .user-toolbar-tab.toolbar-tab { + float: left; +} +/* @todo research a good way to do this for all user menu items if more are added. */ +.toolbar-tray-horizontal .toolbar-menu li.account, +.toolbar-tray-horizontal .toolbar-menu li.account-edit, +.toolbar-tray-horizontal .toolbar-menu li.logout { + float: right; /* LTR */ +} +[dir="rtl"] .toolbar-tray-horizontal .toolbar-menu li.account, +[dir="rtl"] .toolbar-tray-horizontal .toolbar-menu li.account-edit, +[dir="rtl"] .toolbar-tray-horizontal .toolbar-menu li.logout { + float: left; +}