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

Allow expansion of sidenav on small screens #6218

Merged

Conversation

Waseem826
Copy link
Contributor

@Waseem826 Waseem826 commented Sep 14, 2023

What this PR does / why we need it:

  • Allow expanding the sidenav on small screen sizes.
  • Fix width issues of sidenav in collapsed state when scrollbar is visible.
screencast-github.com-2023.09.14-14_05_39.webm

Which issue(s) this PR fixes:

Fixes #6217

What type of PR is this?

/kind bug

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

Allow expansion of sidenav on small screen sizes.

Documentation:

NONE

@Waseem826 Waseem826 self-assigned this Sep 14, 2023
@kubermatic-bot kubermatic-bot added kind/bug Categorizes issue or PR as related to a bug. release-note Denotes a PR that will be considered when it comes time to generate release notes. docs/none Denotes a PR that doesn't need documentation (changes). dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 14, 2023
@Waseem826
Copy link
Contributor Author

/cherrypick release/v2.23

@kubermatic-bot
Copy link
Contributor

@Waseem826: once the present PR merges, I will cherry-pick it on top of release/v2.23 in a new PR and assign it to you.

In response to this:

/cherrypick release/v2.23

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@Waseem826
Copy link
Contributor Author

/cherrypick release/v2.22

@kubermatic-bot
Copy link
Contributor

@Waseem826: once the present PR merges, I will cherry-pick it on top of release/v2.22 in a new PR and assign it to you.

In response to this:

/cherrypick release/v2.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 14, 2023
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: b12a73ed11fb2903ecefd7124b968ac45848774c

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik, Waseem826

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot kubermatic-bot merged commit fda7c11 into kubermatic:main Sep 14, 2023
8 of 10 checks passed
@kubermatic-bot kubermatic-bot added this to the KKP 2.24 milestone Sep 14, 2023
@kubermatic-bot
Copy link
Contributor

@Waseem826: #6218 failed to apply on top of branch "release/v2.22":

Applying: Allow expansion of sidenav on small screens. Fix collapsed sidenav scroll issue.
Using index info to reconstruct a base tree...
M	modules/web/src/app/core/components/sidenav/component.ts
M	modules/web/src/app/core/components/sidenav/style.scss
M	modules/web/src/app/settings/admin/nav/component.ts
M	modules/web/src/assets/css/_variables.scss
M	modules/web/src/assets/css/global/_main.scss
Falling back to patching base and 3-way merge...
Auto-merging modules/web/src/assets/css/global/_main.scss
Auto-merging modules/web/src/assets/css/_variables.scss
Auto-merging modules/web/src/app/settings/admin/nav/component.ts
CONFLICT (content): Merge conflict in modules/web/src/app/settings/admin/nav/component.ts
Auto-merging modules/web/src/app/core/components/sidenav/style.scss
Auto-merging modules/web/src/app/core/components/sidenav/component.ts
CONFLICT (content): Merge conflict in modules/web/src/app/core/components/sidenav/component.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Allow expansion of sidenav on small screens. Fix collapsed sidenav scroll issue.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/v2.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kubermatic-bot
Copy link
Contributor

@Waseem826: new pull request created: #6219

In response to this:

/cherrypick release/v2.23

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@Waseem826 Waseem826 deleted the 6217-fix-collapsed-sidenav-issues branch September 15, 2023 07:14
Waseem826 added a commit to Waseem826/dashboard that referenced this pull request Sep 15, 2023
kubermatic-bot pushed a commit that referenced this pull request Sep 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sidebar not expandable on small screens
3 participants