diff --git a/app/.meteor/packages b/app/.meteor/packages index 7a6a43b..75bbab9 100644 --- a/app/.meteor/packages +++ b/app/.meteor/packages @@ -4,24 +4,24 @@ # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -meteor-base@1.4.0 # Packages every Meteor app needs to have -mobile-experience@1.1.0 # Packages for a great mobile UX -mongo@1.10.1 # The database Meteor supports right now -reactive-var@1.0.11 # Reactive variable for tracker -tracker@1.2.0 # Meteor's client-side reactive programming library +meteor-base@1.5.1 # Packages every Meteor app needs to have +mobile-experience@1.1.1 # Packages for a great mobile UX +mongo@1.16.8 # The database Meteor supports right now +reactive-var@1.0.12 # Reactive variable for tracker +tracker@1.3.3 # Meteor's client-side reactive programming library #standard-minifier-css@1.4.0 # CSS minifier run for production mode -standard-minifier-js@2.6.0 # JS minifier run for production mode +standard-minifier-js@2.8.1 # JS minifier run for production mode es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers -ecmascript@0.15.0 # Enable ECMAScript2015+ syntax in app code +ecmascript@0.16.8 # Enable ECMAScript2015+ syntax in app code shell-server@0.5.0 # Server-side component of the `meteor shell` command insecure@1.0.7 # Allow all DB writes from clients (for prototyping) react-meteor-data@2.0.1 less@2.8.0 -static-html -underscore@1.0.10 -accounts-password@1.7.0 +static-html@1.3.2 +underscore@1.6.0 +accounts-password@2.4.0 refapp:meteor-typescript mdg:validation-error -service-configuration +service-configuration@1.3.3 diff --git a/app/.meteor/release b/app/.meteor/release index fd169bc..966586c 100644 --- a/app/.meteor/release +++ b/app/.meteor/release @@ -1 +1 @@ -METEOR@2.1 +METEOR@2.15 diff --git a/app/.meteor/versions b/app/.meteor/versions index 223e1b4..5b921e0 100644 --- a/app/.meteor/versions +++ b/app/.meteor/versions @@ -1,85 +1,81 @@ -accounts-base@1.8.0 -accounts-password@1.7.0 -allow-deny@1.1.0 -autoupdate@1.7.0 -babel-compiler@7.6.0 -babel-runtime@1.5.0 +accounts-base@2.2.10 +accounts-password@2.4.0 +allow-deny@1.1.1 +autoupdate@1.8.0 +babel-compiler@7.10.5 +babel-runtime@1.5.1 base64@1.0.12 binary-heap@1.0.11 -blaze-tools@1.0.10 -boilerplate-generator@1.7.1 +blaze-tools@1.1.2 +boilerplate-generator@1.7.2 caching-compiler@1.2.2 -caching-html-compiler@1.1.3 -callback-hook@1.3.0 -check@1.3.1 -ddp@1.4.0 -ddp-client@2.4.0 +caching-html-compiler@1.2.1 +callback-hook@1.5.1 +check@1.3.2 +ddp@1.4.1 +ddp-client@2.6.1 ddp-common@1.4.0 -ddp-rate-limiter@1.0.9 -ddp-server@2.3.2 -deps@1.0.12 -diff-sequence@1.1.1 -dynamic-import@0.6.0 -ecmascript@0.15.0 -ecmascript-runtime@0.7.0 -ecmascript-runtime-client@0.11.0 -ecmascript-runtime-server@0.10.0 -ejson@1.1.1 -email@2.0.0 +ddp-rate-limiter@1.2.1 +ddp-server@2.7.0 +diff-sequence@1.1.2 +dynamic-import@0.7.3 +ecmascript@0.16.8 +ecmascript-runtime@0.8.1 +ecmascript-runtime-client@0.12.1 +ecmascript-runtime-server@0.11.0 +ejson@1.1.3 +email@2.2.5 es5-shim@4.8.0 -fetch@0.1.1 -geojson-utils@1.0.10 +fetch@0.1.4 +geojson-utils@1.0.11 hot-code-push@1.0.4 -html-tools@1.0.11 -htmljs@1.0.11 -id-map@1.1.0 +html-tools@1.1.2 +htmljs@1.1.0 +id-map@1.1.1 insecure@1.0.7 inter-process-messaging@0.1.1 -launch-screen@1.2.0 +launch-screen@2.0.0 less@2.8.0 -livedata@1.0.18 localstorage@1.2.0 -logging@1.2.0 +logging@1.3.3 mdg:validation-error@0.5.1 -meteor@1.9.3 -meteor-base@1.4.0 -minifier-js@2.6.0 -minimongo@1.6.1 -mobile-experience@1.1.0 +meteor@1.11.5 +meteor-base@1.5.1 +minifier-js@2.7.5 +minimongo@1.9.3 +mobile-experience@1.1.1 mobile-status-bar@1.1.0 -modern-browsers@0.1.5 -modules@0.16.0 -modules-runtime@0.12.0 -mongo@1.10.1 -mongo-decimal@0.1.2 +modern-browsers@0.1.10 +modules@0.20.0 +modules-runtime@0.13.1 +mongo@1.16.8 +mongo-decimal@0.1.3 mongo-dev-server@1.1.0 -mongo-id@1.0.7 -npm-bcrypt@0.9.3 -npm-mongo@3.8.1 +mongo-id@1.0.8 +npm-mongo@4.17.2 ordered-dict@1.1.0 -promise@0.11.2 -random@1.2.0 -rate-limit@1.0.9 -react-fast-refresh@0.1.1 +promise@0.12.2 +random@1.2.1 +rate-limit@1.1.1 +react-fast-refresh@0.2.8 react-meteor-data@2.0.1 -reactive-var@1.0.11 +reactive-var@1.0.12 refapp:meteor-typescript@0.3.6 refapp:meteor-typescript-compiler@0.3.6 reload@1.3.1 retry@1.1.0 -routepolicy@1.1.0 -service-configuration@1.0.11 +routepolicy@1.1.1 +service-configuration@1.3.3 sha@1.0.9 shell-server@0.5.0 -socket-stream-client@0.3.1 -spacebars-compiler@1.1.3 -srp@1.1.0 -standard-minifier-js@2.6.0 -static-html@1.2.2 -templating-tools@1.1.2 -tracker@1.2.0 -typescript@4.1.2 -underscore@1.0.10 +socket-stream-client@0.5.2 +spacebars-compiler@1.3.0 +standard-minifier-js@2.8.1 +static-html@1.3.2 +templating-tools@1.2.1 +tracker@1.3.3 +typescript@4.9.5 +underscore@1.6.0 url@1.3.2 -webapp@1.10.0 -webapp-hashing@1.1.0 +webapp@1.13.8 +webapp-hashing@1.1.1 diff --git a/app/client/chordsheet.less b/app/client/chordsheet.less index 79982a2..6bada55 100644 --- a/app/client/chordsheet.less +++ b/app/client/chordsheet.less @@ -155,7 +155,7 @@ display: inline-block; font-family: "Input Mono", Courier New, Courier, monospace; font-size: 0.9em; - font-weight: 300; + font-weight: 400; padding: 0 0.5em; border-radius: 0.4em; line-height: 1.5em; @@ -277,6 +277,10 @@ margin-top: -2px; } + &.hasChord:hover span { + color: var(--text); + } + text-indent: 0 !important; padding-left: 0 !important; diff --git a/app/client/main.less b/app/client/main.less index 3065ba9..d6c85a3 100644 --- a/app/client/main.less +++ b/app/client/main.less @@ -254,6 +254,11 @@ aside.drawer { h1, h2, h3 { font-size: 2em; font-weight: 600; + font-variation-settings: "wdth" 85; + } + + p { + font-variation-settings: "wdth" 90; } h1:first-child { diff --git a/app/client/songlist.less b/app/client/songlist.less index 098f0f3..fa19799 100644 --- a/app/client/songlist.less +++ b/app/client/songlist.less @@ -7,7 +7,7 @@ aside.drawer#list { overflow-y: scroll; .list-colors; - font-weight: 500; + font-weight: 450; font-variation-settings: "wdth" 91; .phone({ @@ -84,9 +84,13 @@ aside.drawer#list { &.filled { display: block; } + &:hover { + color: var(--text); + } } .open-tags { + font-family: "Bricolage Grotesque"; cursor: pointer; margin-left: 0.7rem; .not-phone({ @@ -100,6 +104,7 @@ aside.drawer#list { padding-left: 0.5em; height: 3em; width: 100%; + font-weight: 600; display: block; flex: 1 1 auto; @@ -109,10 +114,8 @@ aside.drawer#list { margin: 0; }); - .noFocusBorder; - - transition: color, background-color 0.5s; + transition: color 0.5s, background-color 0.5s; background-color: var(--bg-list); &::placeholder { @@ -153,12 +156,6 @@ aside.drawer#list { -webkit-backdrop-filter: blur(10px); background-color: var(--bg-filter-translucent); - @media all and (-webkit-min-device-pixel-ratio: 0) and (min-resolution: 0.001dpcm) { - // non-webkit-browsers - background-color: var(--bg-filter-opaque); - } - - & > h4 { display: none !important; } diff --git a/deploy/mup.js b/deploy/mup.js index 7609fa9..3aa1db8 100644 --- a/deploy/mup.js +++ b/deploy/mup.js @@ -1,9 +1,10 @@ +require('dotenv').config(); module.exports = { servers: { one: { host: process.env.SSH_HOST, username: process.env.SSH_USER, - pem: '~/.ssh/id_rsa', + pem: '~/.ssh/id_rsa_github_actor', } }, @@ -27,14 +28,14 @@ module.exports = { }, docker: { - image: 'abernix/meteord:node-12-base', + image: 'zodern/meteor:latest', }, enableUploadProgressBar: false }, mongo: { - version: '3.4.1', + version: '5.0.26', servers: { one: {} } diff --git a/deploy/package-lock.json b/deploy/package-lock.json new file mode 100644 index 0000000..7a99b38 --- /dev/null +++ b/deploy/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "deploy", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "devDependencies": { + "dotenv": "^16.4.5" + } + }, + "node_modules/dotenv": { + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + } + } +} diff --git a/deploy/package.json b/deploy/package.json new file mode 100644 index 0000000..12ea3ae --- /dev/null +++ b/deploy/package.json @@ -0,0 +1,5 @@ +{ + "devDependencies": { + "dotenv": "^16.4.5" + } +}