From 13c75031f034230e2bedc4344129aa1e4148c801 Mon Sep 17 00:00:00 2001 From: Aaron Christian Date: Wed, 15 Feb 2017 20:17:42 -0800 Subject: [PATCH] no message --- core/modules/user/css/user.admin.css | 20 ++++++++++++++++++++ core/modules/user/user.module | 4 ++++ core/themes/bartik/css/components/toolbar.css | 19 +++++++++++++++++++ core/themes/seven/css/components/toolbar.css | 23 +++++++++++++++++++++++ core/themes/seven/seven.libraries.yml | 1 + 5 files changed, 67 insertions(+) create mode 100644 core/themes/seven/css/components/toolbar.css 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 638ed64..7d9f051 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -1372,6 +1372,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; +} diff --git a/core/themes/seven/css/components/toolbar.css b/core/themes/seven/css/components/toolbar.css new file mode 100644 index 0000000..88278ca --- /dev/null +++ b/core/themes/seven/css/components/toolbar.css @@ -0,0 +1,23 @@ +/** + * @file + * Toolbar overrides for Seven. + */ + + /* 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/themes/seven/seven.libraries.yml b/core/themes/seven/seven.libraries.yml index 424e7f5..9e41fea 100644 --- a/core/themes/seven/seven.libraries.yml +++ b/core/themes/seven/seven.libraries.yml @@ -25,6 +25,7 @@ global-styling: css/components/panel.css: {} css/components/skip-link.css: {} css/components/tables.css: {} + css/components/toolbar.css: {} css/components/search-admin-settings.css: {} css/components/tablesort-indicator.css: {} css/components/system-status-report-general-info.css: {} -- 2.8.1