Skip to content

Merge and tweak markup editor expander CSS #34409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 9, 2025
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 0 additions & 64 deletions web_src/css/editor/combomarkdowneditor.css
Original file line number Diff line number Diff line change
Expand Up @@ -100,67 +100,3 @@
border-bottom: 1px solid var(--color-secondary);
padding-bottom: 1rem;
}

text-expander {
display: block;
position: relative;
}

text-expander .suggestions {
position: absolute;
min-width: 180px;
padding: 0;
margin-top: 24px;
list-style: none;
background: var(--color-box-body);
border-radius: var(--border-radius);
border: 1px solid var(--color-secondary);
box-shadow: 0 .5rem 1rem var(--color-shadow);
z-index: 100; /* needs to be > 20 to be on top of dropzone's .dz-details */
}

text-expander .suggestions li {
display: flex;
align-items: center;
cursor: pointer;
padding: 4px 8px;
font-weight: var(--font-weight-medium);
}

text-expander .suggestions li + li {
border-top: 1px solid var(--color-secondary-alpha-40);
}

text-expander .suggestions li:first-child {
border-radius: var(--border-radius) var(--border-radius) 0 0;
}

text-expander .suggestions li:last-child {
border-radius: 0 0 var(--border-radius) var(--border-radius);
}

text-expander .suggestions li:only-child {
border-radius: var(--border-radius);
}

text-expander .suggestions li:hover {
background: var(--color-hover);
}

text-expander .suggestions .fullname {
font-weight: var(--font-weight-normal);
margin-left: 4px;
color: var(--color-text-light-1);
}

text-expander .suggestions li[aria-selected="true"],
text-expander .suggestions li[aria-selected="true"] span {
background: var(--color-primary);
color: var(--color-primary-contrast);
}

text-expander .suggestions img {
width: 24px;
height: 24px;
margin-right: 8px;
}
99 changes: 99 additions & 0 deletions web_src/css/features/expander.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
text-expander .suggestions,
.tribute-container {
position: absolute;
max-height: min(300px, 95vh);
max-width: min(500px, 95vw);
overflow-x: hidden;
overflow-y: auto;
overflow-wrap: anywhere;
background: var(--color-menu);
box-shadow: 0 6px 18px var(--color-shadow);
border-radius: var(--border-radius);
border: 1px solid var(--color-secondary);
z-index: 100; /* needs to be > 20 to be on top of dropzone's .dz-details */
}

text-expander {
display: block;
position: relative;
}

text-expander .suggestions {
padding: 0;
margin-top: 24px;
list-style: none;
}

text-expander .suggestions li,
.tribute-item {
display: flex;
align-items: center;
cursor: pointer;
gap: 6px;
font-weight: var(--font-weight-medium);
}

text-expander .suggestions li,
.tribute-container li {
padding: 3px 6px;
}

text-expander .suggestions li + li,
.tribute-container li + li {
border-top: 1px solid var(--color-secondary);
}

text-expander .suggestions li:first-child {
border-radius: var(--border-radius) var(--border-radius) 0 0;
}

text-expander .suggestions li:last-child {
border-radius: 0 0 var(--border-radius) var(--border-radius);
}

text-expander .suggestions li:only-child {
border-radius: var(--border-radius);
}

text-expander .suggestions .name,
.tribute-container li .name {
white-space: nowrap;
}

text-expander .suggestions .fullname,
.tribute-container li .fullname {
font-weight: var(--font-weight-normal);
color: var(--color-text-light-1);
}

text-expander .suggestions li:hover,
text-expander .suggestions li:hover *,
text-expander .suggestions li[aria-selected="true"],
text-expander .suggestions li[aria-selected="true"] *,
.tribute-container li.highlight,
.tribute-container li.highlight * {
background: var(--color-primary);
color: var(--color-primary-contrast);
}

text-expander .suggestions img,
.tribute-item img {
width: 21px;
height: 21px;
object-fit: contain;
aspect-ratio: 1;
}

.tribute-container {
display: block;
}

.tribute-container ul {
margin: 0;
padding: 0;
list-style: none;
}

.tribute-container li.no-match {
cursor: default;
}
32 changes: 0 additions & 32 deletions web_src/css/features/tribute.css

This file was deleted.

2 changes: 1 addition & 1 deletion web_src/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
@import "./features/imagediff.css";
@import "./features/codeeditor.css";
@import "./features/projects.css";
@import "./features/tribute.css";
@import "./features/expander.css";
@import "./features/cropper.css";
@import "./features/console.css";

Expand Down
1 change: 1 addition & 0 deletions web_src/js/features/comp/TextExpander.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ export function initTextExpander(expander: TextExpanderElement) {
li.append(img);

const nameSpan = document.createElement('span');
nameSpan.classList.add('name');
nameSpan.textContent = name;
li.append(nameSpan);

Expand Down