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.

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

fix(ui): Fix bugs in the UI #7001

Merged
merged 1 commit into from
Feb 7, 2025
Merged

fix(ui): Fix bugs in the UI #7001

merged 1 commit into from
Feb 7, 2025

Conversation

julialeex
Copy link
Contributor

@julialeex julialeex commented Feb 7, 2025

Before

  1. Things on the chat page are not aligned (see image)
  2. The search bar text font is too big (see gif)
  3. The search bar moves while typing (see gif)
Screenshot 2025-02-07 at 9 52 51 AM

searchboxmoves_360

After

  1. Everything is aligned
  2. Smaller font
  3. Make the search bar not move while typing
Screenshot 2025-02-07 at 10 56 13 AM Screenshot 2025-02-07 at 10 56 22 AM Screenshot 2025-02-07 at 10 56 07 AM

Test plan

CI & local tests

@julialeex julialeex requested review from abeatrix and a team February 7, 2025 18:59
Copy link
Contributor

@abeatrix abeatrix left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@julialeex julialeex enabled auto-merge (squash) February 7, 2025 21:26
@julialeex julialeex merged commit d17c277 into main Feb 7, 2025
23 of 27 checks passed
@julialeex julialeex deleted the jlxu/removeOpenInEditor branch February 7, 2025 21:27
@sourcegraph-release-bot
Copy link
Collaborator

The backport to M68 failed at https://github.com/sourcegraph/cody/actions/runs/13209043570:

The process '/usr/bin/git' failed with exit code 1

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r M68 -p 7001
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-M68 M68
# Navigate to the new working tree
cd .worktrees/backport-M68
# Create a new branch
git switch --create backport-7001-to-M68
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d17c277efe2415d07f533801d29d9fb3274f1b5f
# Push it to GitHub
git push --set-upstream origin backport-7001-to-M68
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-M68

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-7001-to-M68
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-M68
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is M68 and the compare/head branch is backport-7001-to-M68., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

@sourcegraph-release-bot
Copy link
Collaborator

The backport to M68 failed at https://github.com/sourcegraph/cody/actions/runs/13209377869:

The process '/usr/bin/git' failed with exit code 1

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r M68 -p 7001
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-M68 M68
# Navigate to the new working tree
cd .worktrees/backport-M68
# Create a new branch
git switch --create backport-7001-to-M68
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d17c277efe2415d07f533801d29d9fb3274f1b5f
# Push it to GitHub
git push --set-upstream origin backport-7001-to-M68
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-M68

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-7001-to-M68
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-M68
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is M68 and the compare/head branch is backport-7001-to-M68., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

julialeex added a commit that referenced this pull request Feb 7, 2025
**Before**
1. Things on the chat page are not aligned (see image)
2. The search bar text font is too big (see gif)
3. The search bar moves while typing (see gif)

<img width="357" alt="Screenshot 2025-02-07 at 9 52 51 AM"
src="https://github.com/user-attachments/assets/a350ef16-37f4-4ffe-a640-24dc9d04752b"
/>

![searchboxmoves_360](https://github.com/user-attachments/assets/05628e91-c6a5-455a-875b-564837b643d1)

**After**
1. Everything is aligned
2. Smaller font
3. Make the search bar not move while typing

<img width="634" alt="Screenshot 2025-02-07 at 10 56 13 AM"
src="https://github.com/user-attachments/assets/e8308b74-5d8b-42ea-be3a-b8ecc2857e83"
/>
<img width="637" alt="Screenshot 2025-02-07 at 10 56 22 AM"
src="https://github.com/user-attachments/assets/c10532f2-4e6e-4477-bc80-1a871c9160b7"
/>
<img width="636" alt="Screenshot 2025-02-07 at 10 56 07 AM"
src="https://github.com/user-attachments/assets/885355ba-48e1-4545-abbc-2886faae4c7c"
/>

CI & local tests
<!-- Required. See
https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles.
-->

(cherry picked from commit d17c277)
julialeex added a commit that referenced this pull request Feb 8, 2025
**Before**
1. Things on the chat page are not aligned (see image)
2. The search bar text font is too big (see gif)
3. The search bar moves while typing (see gif)

<img width="357" alt="Screenshot 2025-02-07 at 9 52 51 AM"
src="https://github.com/user-attachments/assets/a350ef16-37f4-4ffe-a640-24dc9d04752b"
/>


![searchboxmoves_360](https://github.com/user-attachments/assets/05628e91-c6a5-455a-875b-564837b643d1)

**After**
1. Everything is aligned
2. Smaller font
3. Make the search bar not move while typing

<img width="634" alt="Screenshot 2025-02-07 at 10 56 13 AM"
src="https://github.com/user-attachments/assets/e8308b74-5d8b-42ea-be3a-b8ecc2857e83"
/>
<img width="637" alt="Screenshot 2025-02-07 at 10 56 22 AM"
src="https://github.com/user-attachments/assets/c10532f2-4e6e-4477-bc80-1a871c9160b7"
/>
<img width="636" alt="Screenshot 2025-02-07 at 10 56 07 AM"
src="https://github.com/user-attachments/assets/885355ba-48e1-4545-abbc-2886faae4c7c"
/>

CI & local tests
<!-- Required. See

https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles.
-->

(cherry picked from commit d17c277)


## Test plan

<!-- Required. See
https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles.
-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants