Skip to content

Commit

Permalink
Merge changes I0edd6f8b,I59fc2f9c into main
Browse files Browse the repository at this point in the history
* changes:
  ui: Fix wrapping of track details popups
  ui: Appease eslint by converting double -> single quotes in .eslintrc.js
  • Loading branch information
stevegolton authored and Gerrit Code Review committed Jul 22, 2024
2 parents e127b95 + 38699c8 commit 112e9c3
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
16 changes: 8 additions & 8 deletions ui/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ module.exports = {
}],

// Formatting handled by prettier
"indent": "off",
'max-len': "off",
"operator-linebreak": "off",
"quotes": "off",
"brace-style": "off",
"space-before-function-paren": "off",
"generator-star-spacing": "off",
"semi-spacing": "off",
'indent': 'off',
'max-len': 'off',
'operator-linebreak': 'off',
'quotes': 'off',
'brace-style': 'off',
'space-before-function-paren': 'off',
'generator-star-spacing': 'off',
'semi-spacing': 'off',

// clang-format --js used to format EOL comments after (e.g.) an if like:
// if (foo) { // insightful comment
Expand Down
2 changes: 1 addition & 1 deletion ui/src/assets/track_panel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
}

.pf-track-details-dropdown {
width: 400px;
max-width: 400px;
}

.pf-panel-group {
Expand Down
4 changes: 4 additions & 0 deletions ui/src/assets/widgets/popup.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
.pf-popup-portal {
position: absolute;
z-index: 10; // Hack to show popups over certain other elements

// When width = 0 it can cause layout issues in popup content, so we give this
// element some width manually
width: 100%;
}

.pf-popup {
Expand Down
3 changes: 2 additions & 1 deletion ui/src/assets/widgets/tree.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ $chevron-svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'
background: inherit;
padding: 0 0 0 15px;
border-radius: 0 $pf-border-radius $pf-border-radius 0;
word-break: break-all;
overflow-wrap: break-word; // Break words if overflowing
white-space: pre-wrap;
min-width: 0; // Allow column to shrink past content if container is thin
}

.pf-tree-gutter {
Expand Down

0 comments on commit 112e9c3

Please sign in to comment.