Skip to content

fix: layout alignment #1779

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

Merged
merged 1 commit into from
Jul 19, 2024
Merged

fix: layout alignment #1779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion gui/src/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@ const FOOTER_HEIGHT = "1.8em";
const LayoutTopDiv = styled(CustomScrollbarDiv)`
height: 100%;
border-radius: ${defaultBorderRadius};
position: relative;

&::after {
position: absolute;
content: "";
width: 100%;
height: 1px;
background-color: rgba(136, 136, 136, 0.3);
top: 0;
left: 0;
}
`;

const BottomMessageDiv = styled.div<{ displayOnBottom: boolean }>`
Expand Down Expand Up @@ -66,7 +77,8 @@ const Footer = styled.footer`
height: ${FOOTER_HEIGHT};
background-color: transparent;
backdrop-filter: blur(12px);

border-top: 1px solid rgba(136, 136, 136, 0.3);
border-bottom: 1px solid rgba(136, 136, 136, 0.3);
overflow: hidden;
`;

Expand Down
34 changes: 0 additions & 34 deletions gui/src/components/loaders/BlinkingDot.tsx
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gui/src/components/loaders/StatusDot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const StatusDot = styled.div<{
height: ${(props) => props.diameter ?? DEFAULT_DIAMETER}px;
border-radius: 50%;
border: 1px solid rgba(255, 255, 255, 0.75);
margin: 0 2px;
margin: 0 4px 0 8px;
${(props) => (props.shouldBlink ?? false) && blinkAnimation};
`;

Expand Down
4 changes: 2 additions & 2 deletions gui/src/components/mainInput/InputToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function InputToolbar(props: InputToolbarProps) {
⏎ Enter
</EnterButton>
</span>
<span className="flex flex-wrap-reverse items-center whitespace-nowrap">
<span className="flex flex-wrap-reverse gap-1 items-center whitespace-nowrap">
<ModelSelect />
<span
style={{
Expand All @@ -171,7 +171,7 @@ function InputToolbar(props: InputToolbarProps) {
defaultModel.title,
) && (
<span
className="ml-1.5 mt-0.5"
className="ml-1 mt-0.5"
onMouseLeave={() => setFileSelectHovered(false)}
onMouseEnter={() => setFileSelectHovered(true)}
>
Expand Down
11 changes: 7 additions & 4 deletions gui/src/components/modelSelection/ModelSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import ConfirmationDialog from "../dialogs/ConfirmationDialog";
const StyledListboxButton = styled(Listbox.Button)`
display: flex;
align-items: center;
gap: 4px;
gap: 2px;
border: none;
cursor: pointer;
font-size: ${() => `${getFontSize() - 4}px`};
font-size: ${() => `${getFontSize() - 3}px`};
background: transparent;
color: ${() => lightGray};
&:focus {
Expand Down Expand Up @@ -212,11 +212,14 @@ function ModelSelect() {
}}
>
<div className="relative">
<StyledListboxButton className="h-[18px] overflow-hidden">
<StyledListboxButton
className="h-[18px] overflow-hidden"
style={{ padding: 0 }}
>
<div>{modelSelectTitle(defaultModel) || "Select model"}</div>
<div className="pointer-events-none flex items-center">
<ChevronDownIcon
className="h-2.5 w-2.5 text-gray-400"
className="h-2.5 w-2.5"
aria-hidden="true"
/>
</div>
Expand Down
6 changes: 3 additions & 3 deletions gui/src/pages/gui.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ const StepsDiv = styled.div`
const NewSessionButton = styled.div`
width: fit-content;
margin-right: auto;
margin-left: 8px;
margin-top: 4px;

margin-left: 6px;
margin-top: 2px;
margin-bottom: 8px;
font-size: ${getFontSize() - 2}px;

border-radius: ${defaultBorderRadius};
Expand Down
Loading