diff --git a/i18n/en.json b/i18n/en.json
index a606f178..baca871e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -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",
diff --git a/i18n/fa.json b/i18n/fa.json
index 51382a6e..57707b75 100644
--- a/i18n/fa.json
+++ b/i18n/fa.json
@@ -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": "پرونده‌ها",
diff --git a/i18n/fr.json b/i18n/fr.json
index 9c871dce..3cc45b82 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -13,7 +13,7 @@
"citizen.css": "/* La totalité du CSS placé ici s’appliquera aux utilisateurs de l’habillage Citizen. */",
"citizen.js": "/* Tout code JavaScript placé ici sera chargé avec les pages accédées par les utilisateurs de l’habillage 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",
diff --git a/i18n/kk-cyrl.json b/i18n/kk-cyrl.json
index 6e4f08e1..f78e992f 100644
--- a/i18n/kk-cyrl.json
+++ b/i18n/kk-cyrl.json
@@ -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": "мақала",
diff --git a/i18n/ko.json b/i18n/ko.json
index f0df05a0..9b57269d 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -5,7 +5,7 @@
"Ykhwong"
]
},
- "citizen-personalmenu-toggle": "개인 메뉴 토글",
+ "citizen-usermenu-toggle": "개인 메뉴 토글",
"citizen-languages-toggle": "기타 언어",
"citizen-actions-more-toggle": "다른 명령",
"citizen-sitestats-articles-label": "문서",
diff --git a/i18n/mk.json b/i18n/mk.json
index 15f41d47..a4a3cb3d 100644
--- a/i18n/mk.json
+++ b/i18n/mk.json
@@ -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": "Повеќе дејства",
diff --git a/i18n/ojb.json b/i18n/ojb.json
index 0d16a1af..3eae8d38 100644
--- a/i18n/ojb.json
+++ b/i18n/ojb.json
@@ -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",
diff --git a/i18n/pl.json b/i18n/pl.json
index 64f86c6c..a83259c1 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -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",
diff --git a/i18n/pt-br.json b/i18n/pt-br.json
index fd16745d..14cf6d81 100644
--- a/i18n/pt-br.json
+++ b/i18n/pt-br.json
@@ -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",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 117dcf6d..cf74908a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -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",
diff --git a/i18n/roa-tara.json b/i18n/roa-tara.json
index 2fb855c3..6125b78d 100644
--- a/i18n/roa-tara.json
+++ b/i18n/roa-tara.json
@@ -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",
diff --git a/i18n/ru.json b/i18n/ru.json
index 1eba9be7..12e79525 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -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": "файлов",
diff --git a/i18n/tr.json b/i18n/tr.json
index 2f73053c..5560c1ff 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -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",
diff --git a/i18n/uk.json b/i18n/uk.json
index 6910048b..e1c19ae0 100644
--- a/i18n/uk.json
+++ b/i18n/uk.json
@@ -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": "файли",
diff --git a/i18n/yue.json b/i18n/yue.json
index 105f6f5b..a8595643 100644
--- a/i18n/yue.json
+++ b/i18n/yue.json
@@ -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": "版嘅動作",
diff --git a/i18n/zh-hans.json b/i18n/zh-hans.json
index 8a4ff4cb..ac8e2f02 100644
--- a/i18n/zh-hans.json
+++ b/i18n/zh-hans.json
@@ -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": "更多操作",
diff --git a/i18n/zh-hant.json b/i18n/zh-hant.json
index 6cc9f2fc..bac5b865 100644
--- a/i18n/zh-hant.json
+++ b/i18n/zh-hant.json
@@ -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": "更多操作",
diff --git a/i18n/zh-hk.json b/i18n/zh-hk.json
index ccc8977b..2d60ce3f 100644
--- a/i18n/zh-hk.json
+++ b/i18n/zh-hk.json
@@ -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": "更多操作",
diff --git a/includes/Partials/Header.php b/includes/Partials/Header.php
index bb89dd09..4e34805e 100644
--- a/includes/Partials/Header.php
+++ b/includes/Partials/Header.php
@@ -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 {
diff --git a/resources/skins.citizen.styles/Personalmenu.less b/resources/skins.citizen.styles/Usermenu.less
similarity index 86%
rename from resources/skins.citizen.styles/Personalmenu.less
rename to resources/skins.citizen.styles/Usermenu.less
index e5122374..624b3159 100644
--- a/resources/skins.citizen.styles/Personalmenu.less
+++ b/resources/skins.citizen.styles/Usermenu.less
@@ -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();
}
}
diff --git a/resources/skins.citizen.styles/skin.less b/resources/skins.citizen.styles/skin.less
index 08000996..ec52a892 100644
--- a/resources/skins.citizen.styles/skin.less
+++ b/resources/skins.citizen.styles/skin.less
@@ -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';
diff --git a/skin.json b/skin.json
index d4503bd7..abc3a8a2 100644
--- a/skin.json
+++ b/skin.json
@@ -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",
diff --git a/templates/Header.mustache b/templates/Header.mustache
index 1c1ad76d..9c5ea81c 100644
--- a/templates/Header.mustache
+++ b/templates/Header.mustache
@@ -9,7 +9,7 @@
diff --git a/templates/PersonalMenu.mustache b/templates/PersonalMenu.mustache
deleted file mode 100644
index 6011b91b..00000000
--- a/templates/PersonalMenu.mustache
+++ /dev/null
@@ -1,26 +0,0 @@
-{{!
- string msg-citizen-personalmenu-toggle The label used by the personal menu button.
-}}
-
\ No newline at end of file
diff --git a/templates/UserMenu.mustache b/templates/UserMenu.mustache
new file mode 100644
index 00000000..e8a5271d
--- /dev/null
+++ b/templates/UserMenu.mustache
@@ -0,0 +1,26 @@
+{{!
+ string msg-citizen-usermenu-toggle The label used by the user menu button.
+}}
+
\ No newline at end of file