Skip to content

Commit 206d3d8

Browse files
authored
Merge pull request #2954 from input-output-hk/fix/ddw-756-fix-popover-overlap
2 parents 844b584 + 07dd7fe commit 206d3d8

File tree

5 files changed

+89
-359
lines changed

5 files changed

+89
-359
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
### Fixes
1414

15+
- Fixed PopOver overlap ([PR 2954](https://github.com/input-output-hk/daedalus/pull/2954))
1516
- Fixed tooltip being hidden in several places ([PR-2934](https://github.com/input-output-hk/daedalus/pull/2934))
1617
- Adjusted padding for search field in stake pools ([PR 2945](https://github.com/input-output-hk/daedalus/pull/2945))
1718
- Fixed margin for dialogs content and token table header ([PR 2944](https://github.com/input-output-hk/daedalus/pull/2944))

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,12 @@ Most of the commands need `nix` and will run only on Linux or macOS.
160160
- Windows 10/11
161161
- Daedalus testnet installation (similar version used in branch) in `C:\Program Files\Daedalus Testnet`
162162
- NodeJS 16
163-
- Python2 *
164-
- `yarn global add windows-build-tools` * (if this does not work extract daedalus\nix\windows-usb-libs.zip under daedalus\build folder)
165-
- Microsoft Build Tools 2015 *
166-
- Microsoft Visual Studio 2017 (Include Desktop development with C++) *
163+
- Python2
164+
- `yarn global add windows-build-tools` (if this does not work extract daedalus\nix\windows-usb-libs.zip under daedalus\build folder)
165+
- Microsoft Build Tools 2015
166+
- Microsoft Visual Studio 2017 (Include Desktop development with C++)
167167
- `yarn config set msvsversion 2015 --global`
168168

169-
*needed for compiling [email protected] on Windows
170-
171169
#### Steps
172170
- `yarn install`
173171
- `yarn dev:windows`

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
"eslint-plugin-react": "7.21.2",
140140
"eslint-plugin-react-hooks": "4.1.2",
141141
"esm": "3.2.25",
142-
"fast-sass-loader": "1.5.0",
142+
"fast-sass-loader": "2.0.1",
143143
"file-loader": "4.2.0",
144144
"gulp-shell": "0.8.0",
145145
"hash.js": "1.1.7",
@@ -156,7 +156,6 @@
156156
"mobx-react-devtools": "6.1.1",
157157
"node-forge": "1.0.0",
158158
"node-libs-browser": "2.2.1",
159-
"node-sass": "4.14.1",
160159
"nodemon": "2.0.4",
161160
"npmlog": "4.1.2",
162161
"postcss": "8.2.13",
@@ -168,7 +167,8 @@
168167
"react-intl-translations-manager": "5.0.3",
169168
"react-syntax-highlighter": "13.5.3",
170169
"regenerator-runtime": "0.13.7",
171-
"sass-loader": "7.1.0",
170+
"sass": "1.32.13",
171+
"sass-loader": "10.1.1",
172172
"seedrandom": "3.0.5",
173173
"sinon": "9.2.2",
174174
"spawn-sync": "2.0.0",
@@ -257,7 +257,7 @@
257257
"react-intl": "2.7.2",
258258
"react-lottie": "1.2.3",
259259
"react-markdown": "4.3.1",
260-
"react-polymorph": "1.0.3",
260+
"react-polymorph": "1.0.4",
261261
"react-router": "5.2.0",
262262
"react-router-dom": "5.2.0",
263263
"react-svg-inline": "2.1.1",

0 commit comments

Comments
 (0)