Compare commits

..

No commits in common. "0de6c3a09f8cccad7ef94fe617c79c475084ad29" and "164768e6c9bbd1a9dc2cdab6e2e168c7ddb3e1bd" have entirely different histories.

12 changed files with 703 additions and 595 deletions

View File

@ -1,7 +1,7 @@
{
"name": "pinafore",
"description": "Alternative web client for Mastodon",
"version": "1.8.0",
"version": "1.7.0",
"scripts": {
"lint": "standard && standard --plugin html 'src/routes/**/*.html'",
"lint-fix": "standard --fix && standard --fix --plugin html 'src/routes/**/*.html'",
@ -43,10 +43,10 @@
"build-now-json": "node -r esm ./bin/build-now-json.js"
},
"dependencies": {
"@babel/core": "^7.4.5",
"@babel/core": "^7.4.4",
"@gamestdio/websocket": "^0.3.2",
"@webcomponents/custom-elements": "^1.2.4",
"babel-loader": "^8.0.6",
"babel-loader": "^8.0.5",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"cheerio": "^1.0.0-rc.2",
"child-process-promise": "^2.2.1",
@ -63,7 +63,7 @@
"escape-html": "^1.0.3",
"esm": "^3.2.25",
"events-light": "^1.0.5",
"express": "^4.17.1",
"express": "^4.16.4",
"file-api": "^0.10.4",
"file-drop-element": "0.2.0",
"form-data": "^2.3.3",
@ -74,7 +74,7 @@
"lodash-es": "^4.17.11",
"lodash-webpack-plugin": "^0.11.5",
"mkdirp": "^0.5.1",
"node-fetch": "^2.6.0",
"node-fetch": "^2.5.0",
"node-sass": "^4.12.0",
"npm-run-all": "^4.1.5",
"p-any": "^2.1.0",
@ -86,28 +86,28 @@
"quick-lru": "^4.0.0",
"remount": "^0.11.0",
"requestidlecallback": "^0.3.0",
"rollup": "^1.12.4",
"rollup": "^1.11.3",
"rollup-plugin-replace": "^2.2.0",
"rollup-plugin-terser": "^5.0.0",
"sapper": "nolanlawson/sapper#for-pinafore-14",
"stringz": "^2.0.0",
"svelte": "^2.16.1",
"svelte-extras": "^2.0.2",
"svelte-loader": "^2.13.4",
"svelte-loader": "^2.13.3",
"svelte-transitions": "^1.2.0",
"svgo": "^1.2.2",
"terser-webpack-plugin": "^1.3.0",
"terser-webpack-plugin": "^1.2.3",
"text-encoding": "^0.7.0",
"tiny-queue": "^0.2.1",
"webpack": "^4.32.2",
"webpack": "^4.31.0",
"webpack-bundle-analyzer": "^3.3.2"
},
"devDependencies": {
"assert": "^2.0.0",
"eslint-plugin-html": "^5.0.5",
"eslint-plugin-html": "^5.0.3",
"fake-indexeddb": "^2.1.0",
"mocha": "^6.1.4",
"now": "^15.3.0",
"now": "^15.2.0",
"standard": "^12.0.1",
"testcafe": "^1.1.4"
},

View File

@ -6,7 +6,7 @@
.compose-box-length {
grid-area: length;
justify-self: right;
color: var(--length-indicator-color);
color: var(--main-theme-color);
font-size: 1.3em;
align-self: center;
}
@ -53,4 +53,4 @@
observe
}
}
</script>
</script>

View File

@ -305,7 +305,7 @@
timelineType !== 'search' && 'status-in-timeline',
isStatusInOwnThread && 'status-in-own-thread',
$underlineLinks && 'underline-links',
!$disableTapOnStatus && !isStatusInOwnThread && 'tap-on-status'
!$disableTapOnStatus && 'tap-on-status'
)),
content: ({ originalStatus }) => originalStatus.content || '',
showContent: ({ spoilerText, spoilerShown }) => !spoilerText || spoilerShown,

View File

@ -116,6 +116,4 @@
--floating-button-bg: #{rgba($main-bg-color, 0.8)};
--floating-button-bg-hover: #{darken(rgba($main-bg-color, 0.9), 5%)};
--floating-button-bg-active: #{darken(rgba($main-bg-color, 0.9), 10%)};
--length-indicator-color: #{$main-theme-color};
}

View File

@ -46,6 +46,4 @@
--tab-bg-hover-non-selected: #{darken($main-bg-color, 1%)};
--toast-anchor-color: #{$anchor-color};
--length-indicator-color: var(--action-button-fill-color);
}

View File

@ -17,11 +17,7 @@ $compose-background: lighten($main-theme-color, 32%);
:root {
--settings-list-item-text: #{$main-text-color};
--settings-list-item-text-hover: #{$main-text-color};
--action-button-fill-color: #{lighten($main-theme-color, 30%)};
--action-button-fill-color-hover: #{lighten($main-theme-color, 35%)};
--action-button-fill-color-active: #{lighten($main-theme-color, 40%)};
--action-button-fill-color-pressed: #{$anchor-color};
--action-button-fill-color-pressed-hover: #{darken($anchor-color, 2%)};
--action-button-fill-color-pressed-active: #{darken($anchor-color, 15%)};
@ -34,4 +30,4 @@ $compose-background: lighten($main-theme-color, 32%);
--nav-text-color-hover: #{$main-text-color};
--nav-a-selected-border: #{$anchor-color};
--nav-a-selected-border-hover: #{$anchor-color};
}
}

View File

@ -29,9 +29,9 @@ $compose-background: darken($main-theme-color, 12%);
--form-border: #{darken($border-color, 10%)};
--action-button-fill-color: #{lighten($main-theme-color, 5%)};
--action-button-fill-color-hover: #{lighten($main-theme-color, 12%)};
--action-button-fill-color-active: #{darken($main-theme-color, 15%)};
--action-button-fill-color: #{$main-theme-color};
--action-button-fill-color-hover: #{lighten($main-theme-color, 4%)};
--action-button-fill-color-active: #{darken($main-theme-color, 13%)};
--action-button-fill-color-pressed: #{lighten($main-theme-color, 20%)};
--action-button-fill-color-pressed-hover: #{lighten($main-theme-color, 24%)};
--action-button-fill-color-pressed-active: #{lighten($main-theme-color, 7%)};

View File

@ -134,12 +134,10 @@ async function showRichNotification (data, notification) {
const { icon, body } = data
const tag = notification.id
const { origin } = self.location
const badge = '/icon-push-badge.png'
switch (notification.type) {
case 'follow': {
await self.registration.showNotification(data.title, {
badge,
icon,
body,
tag,
@ -153,7 +151,6 @@ async function showRichNotification (data, notification) {
case 'favourite':
case 'poll':
await self.registration.showNotification(data.title, {
badge,
icon,
body,
tag,
@ -165,20 +162,17 @@ async function showRichNotification (data, notification) {
case 'mention':
const isPublic = ['public', 'unlisted'].includes(notification.status.visibility)
const actions = [
isPublic && {
action: 'reblog',
icon: '/icon-push-fa-retweet.png', // generated manually from font-awesome-svg
title: 'Boost'
},
{
action: 'favourite',
icon: '/icon-push-fa-star.png', // generated manually from font-awesome-svg
title: 'Favorite'
},
isPublic && {
action: 'reblog',
title: 'Boost'
}
].filter(Boolean)
await self.registration.showNotification(data.title, {
badge,
icon,
body,
tag,
@ -197,12 +191,10 @@ async function showRichNotification (data, notification) {
const cloneNotification = notification => {
const clone = {}
// Object.assign() does not work with notifications
for (let k in notification) {
// deliberately not doing a hasOwnProperty check, but skipping
// functions and null props like onclick and onshow and showTrigger
if (typeof notification[k] !== 'function' && notification[k] !== null) {
clone[k] = notification[k]
}
// intentionally not doing a hasOwnProperty check
clone[k] = notification[k]
}
return clone

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 505 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 905 B

1230
yarn.lock

File diff suppressed because it is too large Load Diff