Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Desktop: Resolves #9998: Fixed text wrapping in Spellcheck button #10005

Merged
merged 5 commits into from
Mar 4, 2024
Merged

Desktop: Resolves #9998: Fixed text wrapping in Spellcheck button #10005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7d02d5
Fix text wrapping in Specllcheck button
RadCod3 Feb 26, 2024
c263e2f
Merge branch 'dev' of https://github.com/RadCod3/joplin into dev
RadCod3 Feb 26, 2024
f4b6b46
Merge branch 'laurent22:dev' into dev
RadCod3 Feb 27, 2024
4210b54
Add an ellipsis when overflow
RadCod3 Feb 27, 2024
9f1a17a
Use correct type for stylesheet
RadCod3 Mar 2, 2024
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
1 change: 1 addition & 0 deletions packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ function styles_(props: Props) {
},
toolbarStyle: {
marginBottom: 0,
minWidth: 0,
},
};
});
Expand Down
1 change: 1 addition & 0 deletions packages/app-desktop/gui/ToolbarBase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class ToolbarBaseComponent extends React.Component<Props, any> {
display: 'flex',
flexDirection: 'row',
boxSizing: 'border-box',
minWidth: 0,
};

const leftItemComps: any[] = [];
Expand Down
7 changes: 5 additions & 2 deletions packages/app-desktop/gui/ToolbarButton/ToolbarButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ export default function ToolbarButton(props: Props) {
if (!isEnabled) classes.push('disabled');

const onClick = getProp(props, 'onClick');

const style: React.CSSProperties = {
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis' };
return (
<StyledRoot
className={classes.join(' ')}
Expand All @@ -56,7 +59,7 @@ export default function ToolbarButton(props: Props) {
}}
>
{icon}
{title}
<span style={style}>{title}</span>
</StyledRoot>
);
}
Expand Down
3 changes: 3 additions & 0 deletions packages/app-desktop/gui/ToolbarButton/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ export const StyledRoot = styled.a<RootProps>`
font-size: ${(props: RootProps) => props.theme.toolbarIconSize * 0.8}px;
padding-left: 5px;
padding-right: 5px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

&:hover {
background-color: ${(props: RootProps) => props.disabled ? 'none' : props.theme.backgroundColorHover3};
Expand Down
Loading