Skip to content

Commit 45b0729

Browse files
Merge pull request #1261 from cylc/renovate/lumino-widgets-2.x
fix(deps): update dependency @lumino/widgets to v2
2 parents e8009b1 + efb9267 commit 45b0729

File tree

5 files changed

+88
-202
lines changed

5 files changed

+88
-202
lines changed

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
"dependencies": {
2424
"@apollo/client": "^3.5.8",
2525
"@hpcc-js/wasm": "^2.8.0",
26-
"@lumino/algorithm": "^1.9.1",
2726
"@lumino/default-theme": "^2.0.0",
28-
"@lumino/widgets": "^1.31.1",
27+
"@lumino/widgets": "^2.0.0",
2928
"@unhead/vue": "^1.1.17",
3029
"axios": "^1.0.0",
3130
"dedent": "^0.7.0",

src/styles/cylc/_workflow.scss

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,32 @@
3939
flex: 1 1 auto;
4040
.lm-TabBar-content {
4141
padding-left: 0;
42-
43-
.lm-TabBar-tab {
44-
display: flex;
45-
align-items: center;
46-
border-bottom: 1px solid #C0C0C0;
47-
}
48-
49-
.lm-TabBar-tabLabel {
50-
font-family: settings.$body-font-family;
51-
font-size: 1rem;
52-
}
53-
54-
.lm-TabBar-tabCloseIcon {
55-
color: inherit;
56-
cursor: pointer;
57-
}
58-
59-
.lm-TabBar-tabCloseIcon:before {
60-
content: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='currentColor' d='M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z' /%3E%3C/svg%3E");
61-
display: block;
62-
width: 1rem;
63-
height: 1rem;
64-
}
6542
}
6643
}
6744
}
45+
}
6846

47+
.lm-TabBar-tab {
48+
display: flex;
49+
align-items: center;
50+
border-bottom: 1px solid #C0C0C0;
51+
}
52+
.lm-TabBar-tabLabel {
53+
font-family: settings.$body-font-family;
54+
font-size: 1rem;
55+
}
56+
.lm-TabBar-tabCloseIcon {
57+
color: inherit;
58+
cursor: pointer;
59+
}
60+
.lm-TabBar-tabCloseIcon:before {
61+
content: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='currentColor' d='M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z' /%3E%3C/svg%3E") !important;
62+
display: block;
63+
width: 1rem;
64+
height: 1rem;
65+
}
66+
// Workaround https://github.com/jupyterlab/lumino/issues/593:
67+
.lm-mod-drag-image {
68+
top: -10px;
69+
left: -60px;
6970
}

src/views/Workspace.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3838
<script>
3939
import { defineAsyncComponent } from 'vue'
4040
import { uniqueId } from 'lodash'
41-
import { toArray } from '@lumino/algorithm'
4241
import {
4342
mdiChartLine,
4443
mdiFileDocumentMultipleOutline,
@@ -156,7 +155,7 @@ export default {
156155
* Remove all the widgets present in the DockPanel.
157156
*/
158157
removeAllWidgets () {
159-
toArray(this.$refs.lumino.dock.widgets())
158+
Array.from(this.$refs.lumino.dock.widgets())
160159
.forEach(widget => widget.close())
161160
},
162161
/**

tests/unit/components/cylc/workflow/workflow.vue.spec.js

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)