style(core): 🎨 rename personal menu to user menu

This commit is contained in:
alistair3149 2022-10-05 18:22:40 -04:00
parent 41bfd4d4a4
commit 7bd34caad5
No known key found for this signature in database
25 changed files with 61 additions and 61 deletions

View file

@ -11,7 +11,7 @@
"citizen.css": "/* All CSS here will be loaded for users of the Citizen skin */",
"citizen.js": "/* All JavaScript here will be loaded for users of the Citizen skin */",
"citizen-drawer-toggle": "Toggle menu",
"citizen-personalmenu-toggle": "Toggle personal menu",
"citizen-usermenu-toggle": "Toggle personal menu",
"citizen-search-toggle": "Toggle search",
"citizen-languages-toggle": "More languages",
"citizen-actions-more-toggle": "More actions",

View file

@ -12,7 +12,7 @@
"citizen.css": "/* همه کدهای سی‌اس‌اس که در این بخش قرار بگیرد برای کاربرانی که از پوستهٔ شهروند استفاده کنند بارگزاری می‌شود */",
"citizen.js": "/ * همه کدهای جاوااسکریپتی که در اینجا قرار می‌گیرند برای کاربران پوستهٔ مدرن بارگیری می‌شود * /",
"citizen-drawer-toggle": "تغییر منو",
"citizen-personalmenu-toggle": "تغییر منوی شخصی",
"citizen-usermenu-toggle": "تغییر منوی شخصی",
"citizen-search-toggle": "تغییر جست‌وجو",
"citizen-sitestats-articles-label": "مقالات",
"citizen-sitestats-images-label": "پرونده‌ها",

View file

@ -13,7 +13,7 @@
"citizen.css": "/* La totalité du CSS placé ici sappliquera aux utilisateurs de lhabillage Citizen. */",
"citizen.js": "/* Tout code JavaScript placé ici sera chargé avec les pages accédées par les utilisateurs de lhabillage Citizen. */",
"citizen-drawer-toggle": "Basculer le menu",
"citizen-personalmenu-toggle": "Basculer le menu personnel",
"citizen-usermenu-toggle": "Basculer le menu personnel",
"citizen-search-toggle": "Basculer la recherche",
"citizen-languages-toggle": "Autres langues",
"citizen-actions-more-toggle": "Autres actions",

View file

@ -11,8 +11,8 @@
"citizen.css": "/* Мұндағы барлық CSS Citizen мұқабасы бар қатысушыларға жүктеледі */",
"citizen.js": "/* Мұндағы барлық JavaScript Citizen мұқабасы бар қатысушыларға жүктеледі */",
"citizen-drawer-toggle": "Мәзірді ашу",
"citizen-personalmenu-toggle": "Жеке мәзірді ашу",
"citizen-search-toggle": "Іздеу",
"citizen-usermenu-toggle": "Жеке мәзірді ашу",
"citizen-search-toggle": "Іздеуді ашу",
"citizen-languages-toggle": "Басқа тілдер",
"citizen-actions-more-toggle": "Басқа әрекеттер",
"citizen-sitestats-articles-label": "мақала",

View file

@ -5,7 +5,7 @@
"Ykhwong"
]
},
"citizen-personalmenu-toggle": "개인 메뉴 토글",
"citizen-usermenu-toggle": "개인 메뉴 토글",
"citizen-languages-toggle": "기타 언어",
"citizen-actions-more-toggle": "다른 명령",
"citizen-sitestats-articles-label": "문서",

View file

@ -10,7 +10,7 @@
"citizen.css": "/* Сиот тука поставен JavaScript ќе им се вчитува на корисниците што го користат рувото „Граѓанин“ */",
"citizen.js": "/* Сиот тука поставен JavaScript ќе им се вчитува на корисниците што го користат рувото „Граѓанин“ */",
"citizen-drawer-toggle": "Дај/скриј мени",
"citizen-personalmenu-toggle": "Дај/скриј лично мени",
"citizen-usermenu-toggle": "Дај/скриј лично мени",
"citizen-search-toggle": "Дај/скриј пребарување",
"citizen-languages-toggle": "Повеќе јазици",
"citizen-actions-more-toggle": "Повеќе дејства",

View file

@ -4,7 +4,7 @@
"Aandeginini"
]
},
"citizen-personalmenu-toggle": "aanji-gi=ozhibii'an-niibiwa-mazina'igan",
"citizen-usermenu-toggle": "aanji-gi=ozhibii'an-niibiwa-mazina'igan",
"prefs-citizen-theme-label": "Maaminonendam",
"prefs-citizen-theme-option-auto": "Michi-dibendan",
"prefs-citizen-theme-option-light": "Waaseyaaban",

View file

@ -9,7 +9,7 @@
"citizen.css": "/* Umieszczony tutaj kod CSS zostanie załadowany przez użytkowników korzystających ze skórki Citizen */",
"citizen.js": "/* Umieszczony tutaj kod JavaScript zostanie załadowany wyłącznie przez użytkowników korzystających ze skórki Citizen */",
"citizen-drawer-toggle": "Przełącz menu",
"citizen-personalmenu-toggle": "Przełącz menu użytkownika",
"citizen-usermenu-toggle": "Przełącz menu użytkownika",
"citizen-search-toggle": "Przełącz wyszukiwanie",
"citizen-sitestats-articles-label": "artykułów",
"citizen-sitestats-images-label": "plików",

View file

@ -12,7 +12,7 @@
"citizen.css": "/* Todo o CSS aqui será carregado para usuários do tema Citizen */",
"citizen.js": "/* Todo o JavaScript aqui será carregado para os usuários do tema Citizen */",
"citizen-drawer-toggle": "Ativa o menu",
"citizen-personalmenu-toggle": "Alternar menu pessoal",
"citizen-usermenu-toggle": "Alternar menu pessoal",
"citizen-search-toggle": "Ativa a pesquisa",
"citizen-sitestats-articles-label": "artigos",
"citizen-sitestats-images-label": "arquivos",

View file

@ -13,7 +13,7 @@
"citizen.css": "{{optional}}",
"citizen.js": "{{optional}}",
"citizen-drawer-toggle": "Tooltip of drawer menu toggle",
"citizen-personalmenu-toggle": "Tooltip of personal menu toggle",
"citizen-usermenu-toggle": "Tooltip of personal menu toggle",
"citizen-search-toggle": "Tooltip of search box toggle",
"citizen-languages-toggle": "Tooltip of languages menu toggle",
"citizen-actions-more-toggle": "Tooltip of more page actions menu toggle",

View file

@ -9,7 +9,7 @@
"citizen.css": "/* Tutte le CSS aqquà avène carecate pe le utinde ca ausane 'a masckere Citizen */",
"citizen.js": "/* Tutte le JavaScript aqquà avène carecate pe le utinde ca ausane 'a masckere Citizen */",
"citizen-drawer-toggle": "Live/mitte 'u menù",
"citizen-personalmenu-toggle": "Live/mitte 'u menù personale",
"citizen-usermenu-toggle": "Live/mitte 'u menù personale",
"citizen-search-toggle": "Live/mitte 'a recerche",
"citizen-sitestats-articles-label": "vôsce",
"citizen-sitestats-images-label": "fail",

View file

@ -13,7 +13,7 @@
"citizen.css": "/* Размещённый здесь CSS-код будет загружаться для пользователей, использующих тему оформления Citizen */",
"citizen.js": "/* Размещённый здесь код JavaScript будет загружаться для пользователей, использующих тему оформления Citizen */",
"citizen-drawer-toggle": "Открыть меню",
"citizen-personalmenu-toggle": "Открыть персональное меню",
"citizen-usermenu-toggle": "Открыть персональное меню",
"citizen-search-toggle": "Открыть поиск",
"citizen-sitestats-articles-label": "статей",
"citizen-sitestats-images-label": "файлов",

View file

@ -18,7 +18,7 @@
"citizen.css": "/* Buradaki tüm CSS'ler Citizen görünüm kullanıcıları için yüklenecek */",
"citizen.js": "/* Buradaki tüm JavaScript Citizen görünümü kullanıcıları için yüklenecek */",
"citizen-drawer-toggle": "Menüyü değiştir",
"citizen-personalmenu-toggle": "Kişisel menüyü aç / kapat",
"citizen-usermenu-toggle": "Kişisel menüyü aç / kapat",
"citizen-search-toggle": "Aramayı değiştir",
"citizen-sitestats-articles-label": "maddeler",
"citizen-sitestats-images-label": "dosyalar",

View file

@ -11,7 +11,7 @@
"citizen.css": "/* Увесь розміщений тут CSS буде завантажений для всіх користувачів теми оформлення «Громадянин» */",
"citizen.js": "/* Увесь розміщений тут код JavaScript буде завантажений для всіх користувачів теми оформлення «Громадянин» */",
"citizen-drawer-toggle": "Переключити меню",
"citizen-personalmenu-toggle": "Переключити особисте меню",
"citizen-usermenu-toggle": "Переключити особисте меню",
"citizen-search-toggle": "Переключити пошук",
"citizen-sitestats-articles-label": "статей",
"citizen-sitestats-images-label": "файли",

View file

@ -12,7 +12,7 @@
"citizen.css": "/* 呢度放置嘅CSS會影響所有使用Citizen外觀嘅用戶 */",
"citizen.js": "/* 響每一次個頁面載入時,用 Citizen 畫面嘅用戶都會載入呢度任何嘅JavaScript */",
"citizen-drawer-toggle": "切換選單",
"citizen-personalmenu-toggle": "切換個人選單",
"citizen-usermenu-toggle": "切換個人選單",
"citizen-search-toggle": "切換搜尋",
"citizen-languages-toggle": "多啲語言",
"citizen-actions-more-toggle": "版嘅動作",

View file

@ -17,7 +17,7 @@
"citizen.css": "/* 这里的任何CSS将为使用Citizen皮肤的用户加载 */",
"citizen.js": "/* 这里的任何JavaScript将为使用Citizen皮肤的用户加载 */",
"citizen-drawer-toggle": "切换菜单",
"citizen-personalmenu-toggle": "切换个人菜单",
"citizen-usermenu-toggle": "切换个人菜单",
"citizen-search-toggle": "切换搜索",
"citizen-languages-toggle": "更多语言",
"citizen-actions-more-toggle": "更多操作",

View file

@ -16,7 +16,7 @@
"citizen.css": "/* 此CSS會用於使用Citizen外觀的使用者 */",
"citizen.js": "/* 此Javascript會用於使用Citizen外觀的使用者 */",
"citizen-drawer-toggle": "切換選單",
"citizen-personalmenu-toggle": "切換個人選單",
"citizen-usermenu-toggle": "切換個人選單",
"citizen-search-toggle": "切換搜尋",
"citizen-languages-toggle": "更多語言",
"citizen-actions-more-toggle": "更多操作",

View file

@ -14,7 +14,7 @@
"citizen.css": "/* 此CSS會用於使用Citizen外觀的用戶 */",
"citizen.js": "/* 此Javascript會用於使用Citizen外觀的用戶 */",
"citizen-drawer-toggle": "切換菜單",
"citizen-personalmenu-toggle": "切換個人選單",
"citizen-usermenu-toggle": "切換個人選單",
"citizen-search-toggle": "切換搜尋",
"citizen-languages-toggle": "更多語言",
"citizen-actions-more-toggle": "更多操作",

View file

@ -32,7 +32,7 @@ use User;
/**
* Header partial of Skin Citizen
* Generates the following partials:
* - Personal Menu
* - User Menu
* - Search
*/
final class Header extends Partial {

View file

@ -1,8 +1,13 @@
.citizen-personalMenu {
.citizen-userMenu {
&__card {
font-size: 0.875rem;
.citizen-header-card( right );
}
&__header {
padding: var( --space-md ) 0;
border-bottom: 1px solid var( --border-color-base );
}
}
.mw-portlet {
@ -21,7 +26,7 @@
.menu-item-link;
align-items: center;
justify-content: space-between;
// TODO: Need to revisit this spacing
// TODO: Need to revisit this spacing, maybe set a min-height instead?
padding: 0.625rem var( --space-md );
&:after {
@ -53,11 +58,6 @@
}
}
.citizen-userMenu__header {
padding: var( --space-md ) 0;
border-bottom: 1px solid var( --border-color-base );
}
#p-user-info {
> ul > li {
margin-right: var( --space-md );
@ -67,7 +67,7 @@
#pt {
&-anonuserpage span,
&userpage-2 a {
&-userpage-2 a {
padding: var( --space-xs ) 0;
color: var( --color-base--emphasized );
font-size: 1rem;
@ -140,14 +140,14 @@
}
// Checkbox hack
#citizen-personalMenu__checkbox:checked {
~ .citizen-personalMenu__card {
#citizen-userMenu__checkbox:checked {
~ .citizen-userMenu__card {
.citizen-card-show();
}
}
.citizen-animations-ready {
.citizen-personalMenu__card {
.citizen-userMenu__card {
.citizen-card-transition();
}
}

View file

@ -22,7 +22,7 @@
@import 'Drawer.less';
@import 'Drawer__button.less';
@import 'Siteinfo.less';
@import 'Personalmenu.less';
@import 'Usermenu.less';
@import 'Search.less';
@import 'Search__button.less';
@import 'Pagetools.less';

View file

@ -40,7 +40,7 @@
"citizen-actions-more-toggle",
"citizen-drawer-toggle",
"citizen-languages-toggle",
"citizen-personalmenu-toggle",
"citizen-usermenu-toggle",
"citizen-search-toggle",
"randompage",
"search",
@ -297,7 +297,7 @@
}
},
".toctogglecheckbox:checked ~ .toctitle .toctogglelabel:before": "resources/skins.citizen.icons/shared/close.svg",
"#citizen-personalMenu__buttonCheckbox:after": "resources/skins.citizen.icons/shared/userAvatar.svg",
"#citizen-userMenu__buttonCheckbox:after": "resources/skins.citizen.icons/shared/userAvatar.svg",
".citizen-search__icon:after": "resources/skins.citizen.icons/shared/search.svg",
".citizen-search__random:after": "resources/skins.citizen.icons/shared/random.svg",
"#citizen-languages__buttonCheckbox:after": "resources/skins.citizen.icons/shared/language.svg",

View file

@ -9,7 +9,7 @@
<div class="citizen-header__start"></div>
<div class="citizen-header__end">
{{#data-portlets.data-notifications}}{{>Menu}}{{/data-portlets.data-notifications}}
{{>PersonalMenu}}
{{>UserMenu}}
</div>
</div>
</header>

View file

@ -1,26 +0,0 @@
{{!
string msg-citizen-personalmenu-toggle The label used by the personal menu button.
}}
<div class="citizen-personalMenu citizen-header__item mw-checkbox-hack-container">
<input
type="checkbox"
id="citizen-personalMenu__checkbox"
class="mw-checkbox-hack-checkbox"
role="button"
aria-labelledby="citizen-personalMenu__buttonCheckbox"
aria-haspopup="true">
<aside id="citizen-personalMenu__card" class="citizen-personalMenu__card mw-checkbox-hack-target">
{{#data-user-info}}
<div class="citizen-userMenu__header">{{>Menu}}</div>
{{/data-user-info}}
{{#data-portlets.data-user-menu}}{{>Menu}}{{/data-portlets.data-user-menu}}
</aside>
<label
id="citizen-personalMenu__buttonCheckbox"
class="mw-checkbox-hack-button citizen-header__button citizen-header__button--icon"
for="citizen-personalMenu__checkbox"
title="{{msg-citizen-personalmenu-toggle}}"
aria-hidden="true">
<span>{{msg-citizen-personalmenu-toggle}}</span>
</label>
</div>

View file

@ -0,0 +1,26 @@
{{!
string msg-citizen-usermenu-toggle The label used by the user menu button.
}}
<div class="citizen-userMenu citizen-header__item mw-checkbox-hack-container">
<input
type="checkbox"
id="citizen-userMenu__checkbox"
class="mw-checkbox-hack-checkbox"
role="button"
aria-labelledby="citizen-userMenu__buttonCheckbox"
aria-haspopup="true">
<aside id="citizen-userMenu__card" class="citizen-userMenu__card mw-checkbox-hack-target">
{{#data-user-info}}
<div class="citizen-userMenu__header">{{>Menu}}</div>
{{/data-user-info}}
{{#data-portlets.data-user-menu}}{{>Menu}}{{/data-portlets.data-user-menu}}
</aside>
<label
id="citizen-userMenu__buttonCheckbox"
class="mw-checkbox-hack-button citizen-header__button citizen-header__button--icon"
for="citizen-userMenu__checkbox"
title="{{msg-citizen-usermenu-toggle}}"
aria-hidden="true">
<span>{{msg-citizen-usermenu-toggle}}</span>
</label>
</div>