This is an automated email from the ASF dual-hosted git repository.
amaranhao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-fauxton.git
The following commit(s) were added to refs/heads/main by this push:
new 44d0683e Fix layout of the "Solve Conflicts" modal (#1470)
44d0683e is described below
commit 44d0683e619935f81e15905f0c2eab8caa1ced0f
Author: Antonio Maranhao <[email protected]>
AuthorDate: Mon Jan 20 07:53:22 2025 -0500
Fix layout of the "Solve Conflicts" modal (#1470)
* Fix: misaligned buttons in the doc conflicts confirmation modal
* Fix: npm audit failures
* Fix: bump Node used in CI to 20 to address failure with latest 'npm'
---
.github/workflows/main.yml | 4 +-
.../documents/assets/scss/revision-browser.scss | 9 +-
.../rev-browser/components/confirmmodal.js | 31 +++---
package-lock.json | 106 +++++++++++----------
package.json | 2 +-
5 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 63320d0e..3e2616d5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
- node-version: '18'
+ node-version: '20'
- name: Install npm packages
run: |
npm install -g npm@latest
@@ -39,7 +39,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
- node-version: '18'
+ node-version: '20'
cache: 'npm'
- run: ./bin/build-couchdb-dev.sh
env:
diff --git a/app/addons/documents/assets/scss/revision-browser.scss
b/app/addons/documents/assets/scss/revision-browser.scss
index a855b83d..bc596c64 100644
--- a/app/addons/documents/assets/scss/revision-browser.scss
+++ b/app/addons/documents/assets/scss/revision-browser.scss
@@ -142,7 +142,12 @@ div#dashboard-content div.revision-wrapper {
}
.delete-conflicts-modal {
- .do-not-show-again label {
- font-size: 13px;
+ .do-not-show-again {
+ &.form-check {
+ padding-left: 2em;
+ }
+ label {
+ font-size: 13px;
+ }
}
}
diff --git a/app/addons/documents/rev-browser/components/confirmmodal.js
b/app/addons/documents/rev-browser/components/confirmmodal.js
index 23b7f771..bcbc1e98 100644
--- a/app/addons/documents/rev-browser/components/confirmmodal.js
+++ b/app/addons/documents/rev-browser/components/confirmmodal.js
@@ -54,31 +54,24 @@ export default class ConfirmModal extends React.Component {
</p>
</Modal.Body>
<Modal.Footer>
-
<div className='col-12'>
<Form.Check type="checkbox"
className='do-not-show-again'
label="Do not show this warning message again"
onChange={() => { this.setState({checked: !this.state.checked
}); }} />
</div>
-
- <div className="col-auto">
- <Button href="#"
- variant="cf-cancel"
- className='cancel-link'
- onClick={this.close}
- data-bypass="true"
- >
- Cancel
- </Button>
- </div>
- <div className="col-auto">
- <ConfirmButton
- onClick={this.onDeleteConflicts}
- text="Delete Revisions"
- variant="danger" />
- </div>
-
+ <Button href="#"
+ variant="cf-cancel"
+ className='cancel-link'
+ onClick={this.close}
+ data-bypass="true"
+ >
+ Cancel
+ </Button>
+ <ConfirmButton
+ onClick={this.onDeleteConflicts}
+ text="Delete Revisions"
+ variant="danger" />
</Modal.Footer>
</Modal>
);
diff --git a/package-lock.json b/package-lock.json
index 51d86184..79945f2f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6541,9 +6541,9 @@
}
},
"node_modules/cross-spawn": {
- "version": "7.0.3",
- "resolved":
"https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz";,
- "integrity":
"sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+ "version": "7.0.6",
+ "resolved":
"https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz";,
+ "integrity":
"sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
"dev": true,
"dependencies": {
"path-key": "^3.1.0",
@@ -8433,9 +8433,9 @@
}
},
"node_modules/express": {
- "version": "4.21.1",
- "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz";,
- "integrity":
"sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+ "version": "4.21.2",
+ "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz";,
+ "integrity":
"sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
"dev": true,
"dependencies": {
"accepts": "~1.3.8",
@@ -8457,7 +8457,7 @@
"methods": "~1.1.2",
"on-finished": "2.4.1",
"parseurl": "~1.3.3",
- "path-to-regexp": "0.1.10",
+ "path-to-regexp": "0.1.12",
"proxy-addr": "~2.0.7",
"qs": "6.13.0",
"range-parser": "~1.2.1",
@@ -8472,6 +8472,10 @@
},
"engines": {
"node": ">= 0.10.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/express";
}
},
"node_modules/express/node_modules/array-flatten": {
@@ -10128,9 +10132,9 @@
"dev": true
},
"node_modules/http-proxy-middleware": {
- "version": "2.0.6",
- "resolved":
"https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz";,
- "integrity":
"sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+ "version": "2.0.7",
+ "resolved":
"https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz";,
+ "integrity":
"sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
"dev": true,
"dependencies": {
"@types/http-proxy": "^1.17.8",
@@ -14225,6 +14229,24 @@
"optional": true,
"peer": true
},
+ "node_modules/nanoid": {
+ "version": "3.3.8",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz";,
+ "integrity":
"sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai";
+ }
+ ],
+ "bin": {
+ "nanoid": "bin/nanoid.cjs"
+ },
+ "engines": {
+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+ }
+ },
"node_modules/natural-compare": {
"version": "1.4.0",
"resolved":
"https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz";,
@@ -15483,9 +15505,9 @@
}
},
"node_modules/path-to-regexp": {
- "version": "0.1.10",
- "resolved":
"https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz";,
- "integrity":
"sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+ "version": "0.1.12",
+ "resolved":
"https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz";,
+ "integrity":
"sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
"dev": true
},
"node_modules/pathval": {
@@ -15678,24 +15700,6 @@
"integrity":
"sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
"dev": true
},
- "node_modules/postcss/node_modules/nanoid": {
- "version": "3.3.6",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz";,
- "integrity":
"sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/ai";
- }
- ],
- "bin": {
- "nanoid": "bin/nanoid.cjs"
- },
- "engines": {
- "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
- }
- },
"node_modules/prelude-ls": {
"version": "1.1.2",
"resolved":
"https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";,
@@ -24034,9 +24038,9 @@
}
},
"cross-spawn": {
- "version": "7.0.3",
- "resolved":
"https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz";,
- "integrity":
"sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+ "version": "7.0.6",
+ "resolved":
"https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz";,
+ "integrity":
"sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
"dev": true,
"requires": {
"path-key": "^3.1.0",
@@ -25439,9 +25443,9 @@
"requires": {}
},
"express": {
- "version": "4.21.1",
- "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz";,
- "integrity":
"sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+ "version": "4.21.2",
+ "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz";,
+ "integrity":
"sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
"dev": true,
"requires": {
"accepts": "~1.3.8",
@@ -25463,7 +25467,7 @@
"methods": "~1.1.2",
"on-finished": "2.4.1",
"parseurl": "~1.3.3",
- "path-to-regexp": "0.1.10",
+ "path-to-regexp": "0.1.12",
"proxy-addr": "~2.0.7",
"qs": "6.13.0",
"range-parser": "~1.2.1",
@@ -26712,9 +26716,9 @@
}
},
"http-proxy-middleware": {
- "version": "2.0.6",
- "resolved":
"https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz";,
- "integrity":
"sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+ "version": "2.0.7",
+ "resolved":
"https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz";,
+ "integrity":
"sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
"dev": true,
"requires": {
"@types/http-proxy": "^1.17.8",
@@ -29751,6 +29755,12 @@
"optional": true,
"peer": true
},
+ "nanoid": {
+ "version": "3.3.8",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz";,
+ "integrity":
"sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+ "dev": true
+ },
"natural-compare": {
"version": "1.4.0",
"resolved":
"https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz";,
@@ -30692,9 +30702,9 @@
"dev": true
},
"path-to-regexp": {
- "version": "0.1.10",
- "resolved":
"https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz";,
- "integrity":
"sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+ "version": "0.1.12",
+ "resolved":
"https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz";,
+ "integrity":
"sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
"dev": true
},
"pathval": {
@@ -30769,14 +30779,6 @@
"nanoid": "^3.3.6",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
- },
- "dependencies": {
- "nanoid": {
- "version": "3.3.6",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz";,
- "integrity":
"sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
- "dev": true
- }
}
},
"postcss-modules-extract-imports": {
diff --git a/package.json b/package.json
index 7679e146..12f7f7b7 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
"fauxton": "./bin/fauxton"
},
"engines": {
- "node": "^18"
+ "node": "^20"
},
"devDependencies": {
"@babel/cli": "^7.18.10",
