diff --git a/locales/de-DE.yml b/locales/de-DE.yml index fe1f499eacbc00d54fa3e8690004be9d9e53d3bc..ffd2aa93f965b03963efeaac48b86b096a221843 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -746,8 +746,13 @@ gallery: "Galerie" recentPosts: "Neue Beiträge" popularPosts: "Beliebte Beiträge" shareWithNote: "Mit Notiz teilen" -expiration: "Abstimmung endet am" +ads: "Werbung" +expiration: "Frist" +memo: "Merkzettel" +priority: "Priorität" +high: "Hoch" middle: "Mittel" +low: "Niedrig" emailNotConfiguredWarning: "Keine Email-Adresse hinterlegt" _forgotPassword: enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese wird ein Link gesendet, mit der du dein Passwort zurücksetzen kannst." diff --git a/locales/en-US.yml b/locales/en-US.yml index 15bf985f3e22ca791f64c480b722a295bbffa727..22dbd3524378bada1a7280b4c8590667051bc978 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -748,8 +748,13 @@ gallery: "Gallery" recentPosts: "Recent posts" popularPosts: "Popular posts" shareWithNote: "Share with note" -expiration: "Poll ends on" +ads: "Advertisements" +expiration: "Deadline" +memo: "Memo" +priority: "Priority" +high: "High" middle: "Medium" +low: "Low" emailNotConfiguredWarning: "Email address not set" _forgotPassword: enterEmail: "Enter the email address you used to register. A link with which you can reset your password will then be sent to it." diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index da2932fae3b39144dc03198b0947b97a22ab14cf..8dc1b98fdfee71da70a6e9c7192993fa9d1eaa09 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -7,6 +7,7 @@ search: "Rechercher" notifications: "Notifications" username: "Nom d’utilisateur·rice" password: "Mot de passe" +forgotPassword: "Mot de passe oublié" fetchingAsApObject: "Récupération depuis le fédiverse …" ok: "OK" gotIt: "J’ai compris !" @@ -747,8 +748,18 @@ gallery: "Galerie" recentPosts: "Les plus récentes" popularPosts: "Les plus consultées" shareWithNote: "Partager dans une note" -expiration: "Fin du sondage" +ads: "Publicité" +expiration: "Échéance" +memo: "Mémo" +priority: "Priorité" +high: "Haute" middle: "Moyen" +low: "Basse" +emailNotConfiguredWarning: "Vous n'avez pas configuré d'adresse e-mail." +_forgotPassword: + enterEmail: "Entrez ici l'adresse e-mail que vous avez enregistrée pour votre compte. Un lien vous permettant de réinitialiser votre mot de passe sera envoyé à cette adresse." + ifNoEmail: "Si vous n'avez pas enregistré d'adresse e-mail, merci de contacter l'administrateur·rice de votre instance." + contactAdmin: "Cette instance ne permettant pas l'utilisation d'adresses e-mail, prenez contact avec l'administrateur·rice pour procéder à la réinitialisation de votre mot de passe." _gallery: my: "Mes publications" liked: " Publications que j'ai aimées" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index d30a6cc8c85765911ac856cadecaa5a421a60ccb..16f9eb23b09b436d8899ff36f6d292f2aa77c826 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -643,8 +643,12 @@ goBack: "戻る" info: "æƒ…å ±" user: "ユーザー" administration: "管ç†" +ads: "広告" expiration: "期é™" +memo: "メモ" +high: "高ã„" middle: "ä¸" +low: "低ã„" _gallery: unlike: "良ããªã„ã‚" _email: diff --git a/package.json b/package.json index e0f3405d275320c2a22718ae13be7e1eae5d7add..1680177268c6c8c2fc8ee3e71374d136e0645766 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo <syuilotan@yahoo.co.jp>", - "version": "12.80.1", + "version": "12.80.2", "codename": "indigo", "repository": { "type": "git", diff --git a/src/client/components/date-separated-list.vue b/src/client/components/date-separated-list.vue index c7ca67582ab832c8749192d4c6475d801976e893..9636ee053cda8ea75f528f7fedffbab02c9a91d8 100644 --- a/src/client/components/date-separated-list.vue +++ b/src/client/components/date-separated-list.vue @@ -90,7 +90,7 @@ export default defineComponent({ } else { if (this.ad && item._shouldInsertAd_) { return [h(MkAd, { - class: 'ad', + class: 'a', // advertiseã®æ„(ブãƒãƒƒã‚«ãƒ¼å¯¾ç–) key: item.id + ':ad', prefer: 'horizontal', }), el]; diff --git a/src/client/components/global/ad.vue b/src/client/components/global/ad.vue index 53e6e8b8bbd3bd96abae9399e8c553bcf89bc193..ee2a7ebe92b3c32ca08fffcdc878fe1870fa37e3 100644 --- a/src/client/components/global/ad.vue +++ b/src/client/components/global/ad.vue @@ -85,16 +85,23 @@ export default defineComponent({ background-image: repeating-linear-gradient(45deg, transparent, transparent 8px, var(--ad) 8px, var(--ad) 14px ); > .main { + text-align: center; + > a { - display: block; + display: inline-block; position: relative; - margin: 0 auto; + vertical-align: bottom; + + &:hover { + > img { + filter: contrast(120%); + } + } > img { display: block; - width: 100%; - height: 100%; object-fit: contain; + margin: auto; } > .menu { @@ -106,23 +113,26 @@ export default defineComponent({ } &.square { - > a { + > a , + > a > img { max-width: min(300px, 100%); - max-height: min(300px, 100%); + max-height: 300px; } } &.horizontal { padding: 8px; - > a { + > a , + > a > img { max-width: min(600px, 100%); - max-height: min(100px, 100%); + max-height: 80px; } } &.vertical { - > a { + > a , + > a > img { max-width: min(100px, 100%); } } diff --git a/src/client/ui/default.widgets.vue b/src/client/ui/default.widgets.vue index 0dd073409b8c44e9d3d9efdfb73e2d046529b8bd..c475e4272cc70d004ca2a24da773d5f78bb5869a 100644 --- a/src/client/ui/default.widgets.vue +++ b/src/client/ui/default.widgets.vue @@ -1,7 +1,7 @@ <template> -<div class="efzpzdvf"> +<div class="ddiqwdnk"> <XWidgets class="widgets" :edit="editMode" :widgets="$store.reactiveState.widgets.value" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/> - <MkAd prefer="square"/> + <MkAd class="ad" prefer="square"/> <button v-if="editMode" @click="editMode = false" class="_textButton edit" style="font-size: 0.9em;"><i class="fas fa-check"></i> {{ $ts.editWidgetsExit }}</button> <button v-else @click="editMode = true" class="_textButton edit" style="font-size: 0.9em;"><i class="fas fa-pencil-alt"></i> {{ $ts.editWidgets }}</button> @@ -57,13 +57,14 @@ export default defineComponent({ </script> <style lang="scss" scoped> -.efzpzdvf { +.ddiqwdnk { position: sticky; height: min-content; box-sizing: border-box; padding-bottom: 8px; - > .widgets { + > .widgets, + > .ad { width: 300px; }