diff --git a/website/client/src/assets/scss/markdown.scss b/website/client/src/assets/scss/markdown.scss index c1e517ed78..19f9e45bc1 100644 --- a/website/client/src/assets/scss/markdown.scss +++ b/website/client/src/assets/scss/markdown.scss @@ -50,10 +50,7 @@ h3.markdown { } a { - color: $blue-10; - &:hover, &:active, &:focus { - color: $blue-10; text-decoration: underline; } } diff --git a/website/client/src/assets/scss/typography.scss b/website/client/src/assets/scss/typography.scss index a15f2b7eae..970fd41737 100644 --- a/website/client/src/assets/scss/typography.scss +++ b/website/client/src/assets/scss/typography.scss @@ -26,19 +26,17 @@ a:not([href]), a:not([href]):hover { a, a:not([href]):not([tabindex]) { cursor: pointer; + color: $purple-300; - &.standard-link { - color: $blue-10; + &:hover, &:active, &:focus { + text-decoration: underline; + color: $purple-300; + } - &:hover, &:active, &:focus { - text-decoration: underline; - } - - &[disabled="disabled"] { - color: $gray-300; - text-decoration: none; - cursor: default; - } + &[disabled="disabled"] { + color: $gray-300; + text-decoration: none; + cursor: default; } &.small-link { diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue index 371abef107..69ec6b0e2f 100644 --- a/website/client/src/components/appFooter.vue +++ b/website/client/src/components/appFooter.vue @@ -108,6 +108,7 @@ v-if="user" > @@ -479,10 +480,6 @@ footer { color: $purple-300; text-decoration: underline; } - a:not([href]):not([class]):hover { // needed to make "report a bug"'s hover state correct - color: $purple-300; - text-decoration: underline; - } column-gap: 1.5rem; display: grid; @@ -682,11 +679,6 @@ h3 { footer { padding: 24px 16px; - a:not([href]):not([class]):hover { // needed to make "report a bug"'s hover state correct - color: $purple-300; - text-decoration: underline; - } - column-gap: 1.5rem; display: grid; grid-template-areas: @@ -726,10 +718,6 @@ h3 { @media (max-width: 1024px) and (min-width: 768px) { footer { padding: 24px 24px; - a:not([href]):not([class]):hover { // needed to make "report a bug"'s hover state correct - color: $purple-300; - text-decoration: underline; - } } .desktop { diff --git a/website/client/src/components/groups/tavern.vue b/website/client/src/components/groups/tavern.vue index 5853384691..712eed7cb6 100644 --- a/website/client/src/components/groups/tavern.vue +++ b/website/client/src/components/groups/tavern.vue @@ -346,6 +346,7 @@
  • @@ -521,21 +522,6 @@ margin-left: .5em; } -// formats the report a bug link to match the others - a:not([href]) { - &:not([role=button]) { - color: #007bff; - text-decoration: none; - } - } - - a:not([href]):hover { - &:not([role=button]) { - color: #0056b3; - text-decoration: underline; - } - } - .tier1-icon, .tier2-icon { width: 11px; } diff --git a/website/client/src/components/header/notifications/partyInvitation.vue b/website/client/src/components/header/notifications/partyInvitation.vue index b454d02091..b919e9442a 100644 --- a/website/client/src/components/header/notifications/partyInvitation.vue +++ b/website/client/src/components/header/notifications/partyInvitation.vue @@ -5,7 +5,14 @@ :notification="notification" >
    -
    +
    +
    {{ $t('dismissAll') }} diff --git a/website/client/src/components/payments/cancelModalConfirm.vue b/website/client/src/components/payments/cancelModalConfirm.vue index 680e8919aa..d5e0823ac2 100644 --- a/website/client/src/components/payments/cancelModalConfirm.vue +++ b/website/client/src/components/payments/cancelModalConfirm.vue @@ -31,7 +31,6 @@ {{ $t('neverMind') }}
    diff --git a/website/client/src/store/actions/members.js b/website/client/src/store/actions/members.js index 4d045b9743..85e44251a2 100644 --- a/website/client/src/store/actions/members.js +++ b/website/client/src/store/actions/members.js @@ -1,8 +1,5 @@ import axios from 'axios'; -// import omit from 'lodash/omit'; -// import findIndex from 'lodash/findIndex'; - const apiv4Prefix = '/api/v4'; export async function getGroupMembers (store, payload) { @@ -117,38 +114,3 @@ export async function getPurchaseHistory (store, payload) { const response = await axios.get(`${apiv4Prefix}/members/${payload.memberId}/purchase-history`); return response.data.data; } - -// export async function selectMember (uid) { -// let memberIsReady = _checkIfMemberIsReady(members[uid]); -// -// if (memberIsReady) { -// _prepareMember(members[uid], self); -// return -// } else { -// fetchMember(uid) -// .then(function (response) { -// var member = response.data.data; -// addToMembersList(member); // lazy load for later -// _prepareMember(member, self); -// deferred.resolve(); -// }); -// } -// } - -// function addToMembersList (member) { -// if (member._id) { -// members[member._id] = member; -// } -// } - -// function _checkIfMemberIsReady (member) { -// return member && member.items && member.items.weapon; -// } -// -// function _prepareMember(member, self) { -// self.selectedMember = members[member._id]; -// } -// -// $rootScope.$on('userUpdated', function(event, user){ -// addToMembersList(user); -// }) diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index e6ab1a4db2..44cd96feeb 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -25,6 +25,7 @@ "invite": "Invite", "leave": "Leave", "invitedToParty": "You were invited to join the Party <%- party %>", + "invitedToPartyBy": "\" target=\"_blank\">@<%- userName %> has invited you to join the Party <%- party %>", "invitedToPrivateGuild": "You were invited to join the private Guild <%- guild %>", "invitedToPublicGuild": "You were invited to join the Guild <%- guild %>", "invitationAcceptedHeader": "Your Invitation has been Accepted",