rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/10.7.2' into develop

Browse Source
This commit is contained in:
Mo
2022-01-12 12:06:23 -06:00
parent a2b2d3f0bb 3e68e3b4af
commit fb59111b41
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@@ -7,14 +7,13 @@
"url": "https://github.com/standardnotes/web" "url": "https://github.com/standardnotes/web"
}, },
"scripts": { "scripts": {
"setup": "yarn install",
"start": "webpack-dev-server --config webpack.dev.js", "start": "webpack-dev-server --config webpack.dev.js",
"watch": "webpack -w --config webpack.dev.js", "watch": "webpack -w --config webpack.dev.js",
"watch:desktop": "webpack -w --config webpack.dev.js --env platform='desktop'", "watch:desktop": "webpack -w --config webpack.dev.js --env platform='desktop'",
"bundle": "webpack --config webpack.prod.js && cp -r node_modules/@standardnotes/components/dist/ public/components && yarn tsc", "bundle": "webpack --config webpack.prod.js && cp -r node_modules/@standardnotes/components/dist/ public/components && yarn tsc",
"bundle:desktop": "webpack --config webpack.prod.js --env platform='desktop'", "bundle:desktop": "webpack --config webpack.prod.js --env platform='desktop'",
"bundle:desktop:beta": "webpack --config webpack.prod.js --env platform='desktop' --env public_beta='true'", "bundle:desktop:beta": "webpack --config webpack.prod.js --env platform='desktop' --env public_beta='true'",
"build": "bundle install && yarn install --frozen-lockfile && bundle exec rails assets:precompile && yarn bundle", "setup": "bundle install && yarn install --frozen-lockfile && bundle exec rails assets:precompile && yarn bundle",
"lint": "eslint --fix app/assets/javascripts", "lint": "eslint --fix app/assets/javascripts",
"tsc": "tsc --project app/assets/javascripts/tsconfig.json", "tsc": "tsc --project app/assets/javascripts/tsconfig.json",
"test": "jest --config app/assets/javascripts/jest.config.js", "test": "jest --config app/assets/javascripts/jest.config.js",
@@ -28,7 +27,7 @@
"@babel/preset-typescript": "^7.15.0", "@babel/preset-typescript": "^7.15.0",
"@reach/disclosure": "^0.16.2", "@reach/disclosure": "^0.16.2",
"@reach/visually-hidden": "^0.16.0", "@reach/visually-hidden": "^0.16.0",
"@standardnotes/components": "^1.2.5", "@standardnotes/components": "^1.2.7",
"@svgr/webpack": "^5.5.0", "@svgr/webpack": "^5.5.0",
"@types/angular": "^1.8.3", "@types/angular": "^1.8.3",
"@types/jest": "^27.0.3", "@types/jest": "^27.0.3",

6
public/components/checksums.json
View File

@@ -30,9 +30,9 @@
"binary": "1928aa349a04471afd273725cc4befe711eeda91aca70aee00c7ad356241c252" "binary": "1928aa349a04471afd273725cc4befe711eeda91aca70aee00c7ad356241c252"
}, },
"org.standardnotes.theme-dynamic": { "org.standardnotes.theme-dynamic": {
"version": "1.0.2", "version": "1.0.3",
"base64": "7a5075a265e67ae54cb7c49bad6aa8b6f84f8fb4883ca859327e8e794cbfff0c", "base64": "81d1465772d0233e3a9648ed0e0ea289f51d1dcf12fef8b29b25488268256521",
"binary": "01a1356c879aa1ef38e856ee0028e6afbff1fa40544e24e3297af863d6cac669" "binary": "42d28f3598669b801821879f0b7e26389300f151bfbc566b11c214e6091719ed"
}, },
"org.standardnotes.code-editor": { "org.standardnotes.code-editor": {
"version": "1.3.8", "version": "1.3.8",

2
public/components/org.standardnotes.theme-dynamic/dist/dist.css vendored
View File

@@ -1,3 +1,4 @@
#navigation.section,
.section.tags, .section.tags,
navigation { navigation {
flex: none !important; flex: none !important;
@@ -5,6 +6,7 @@ navigation {
transition: width 0.25s; transition: width 0.25s;
} }
#navigation.section:hover,
.section.tags:hover, .section.tags:hover,
navigation:hover { navigation:hover {
flex: initial; flex: initial;

2
public/components/org.standardnotes.theme-dynamic/dist/dist.css.map vendored
View File

@@ -1,6 +1,6 @@
{ {
"version": 3, "version": 3,
"mappings": "AAAA;UACW;EACT,IAAI,EAAE,eAAe;EACrB,KAAK,EAAE,gBAAgB;EACvB,UAAU,EAAE,WAAW;;;AAGzB;gBACiB;EACf,IAAI,EAAE,OAAO;EACb,KAAK,EAAE,gBAAgB;EACvB,UAAU,EAAE,WAAW;;;AAGzB;UACW;EACT,IAAI,EAAE,eAAe;EACrB,KAAK,EAAE,gBAAgB;EACvB,UAAU,EAAE,WAAW;;;AAGzB;gBACiB;EACf,IAAI,EAAE,OAAO;EACb,KAAK,EAAE,gBAAgB;EACvB,UAAU,EAAE,WAAW", "mappings": "AAAA;;UAEW;EACT,IAAI,EAAE,eAAe;EACrB,KAAK,EAAE,gBAAgB;EACvB,UAAU,EAAE,WAAW;;;AAGzB;;gBAEiB;EACf,IAAI,EAAE,OAAO;EACb,KAAK,EAAE,gBAAgB;EACvB,UAAU,EAAE,WAAW;;;AAGzB;UACW;EACT,IAAI,EAAE,eAAe;EACrB,KAAK,EAAE,gBAAgB;EACvB,UAAU,EAAE,WAAW;;;AAGzB;gBACiB;EACf,IAAI,EAAE,OAAO;EACb,KAAK,EAAE,gBAAgB;EACvB,UAAU,EAAE,WAAW",
"sources": ["../src/main.scss"], "sources": ["../src/main.scss"],
"names": [], "names": [],
"file": "dist.css" "file": "dist.css"

2
public/components/org.standardnotes.theme-dynamic/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "sn-theme-dynamic", "name": "sn-theme-dynamic",
"version": "1.0.2", "version": "1.0.3",
"main": "dist/dist.css", "main": "dist/dist.css",
"devDependencies": { "devDependencies": {
"grunt": "^1.0.1", "grunt": "^1.0.1",

8
yarn.lock
View File

@@ -2616,10 +2616,10 @@
resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.2.1.tgz#9db212db86ccbf08b347da02549b3dbe4bedbb02" resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.2.1.tgz#9db212db86ccbf08b347da02549b3dbe4bedbb02"
integrity sha512-HilBxS50CBlC6TJvy1mrnhGVDzOH63M/Jf+hyMxQ0Vt1nYzpd0iyxVEUrgMh7ZiyO1b9CLnCDED99Jy9rnZWVQ== integrity sha512-HilBxS50CBlC6TJvy1mrnhGVDzOH63M/Jf+hyMxQ0Vt1nYzpd0iyxVEUrgMh7ZiyO1b9CLnCDED99Jy9rnZWVQ==
"@standardnotes/components@^1.2.5": "@standardnotes/components@^1.2.7":
version "1.2.5" version "1.2.7"
resolved "https://registry.yarnpkg.com/@standardnotes/components/-/components-1.2.5.tgz#3e1e959bc40e5e0d34a0a44ac68fda4b29807f8e" resolved "https://registry.yarnpkg.com/@standardnotes/components/-/components-1.2.7.tgz#99e4d90088589cef038fa3b1ced36acbe364ed21"
integrity sha512-/E87R6wpMK0nLeS6ugCyjHht3M5hqZUH4lWA179jE9N4A6WXYvlqcFYO4t2RiG6yErRPZOHfpUFFsL1agXVuwA== integrity sha512-vojXzml3c5ZWRvTVFS+iVy6YUX1J5lKD9JXz4EWoKck08zlIyF7C+jdZYdT0wFKb0Kgen8nXXW8jIS0kRk6wzA==
"@standardnotes/domain-events@2.5.1": "@standardnotes/domain-events@2.5.1":
version "2.5.1" version "2.5.1"