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!: deleted styles without associated classes from css.ts, issue #8285 #8465

Merged
merged 1 commit into from
Aug 7, 2024

Conversation

aishwaryavenkatesan
Copy link

The basics

The details

Resolves

Fixes issue #8285
Link: #8285

Proposed Changes

I have deleted the styles blocklyHidden, blocklyResizeLine, blocklyResizeSW, blocklyResizeSE and blocklyDropDownButton
from css.ts

Reason for Changes

These styles are deleted as they are not used by any other classes

Test Coverage

executed commands
npm run build
npm run format and npm test commands.
All 10 tests passed

Documentation

No documentation required

Additional Information

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome! It looks like this is your first pull request in Blockly, so here are a couple of tips:

  • You can find tips about contributing to Blockly and how to validate your changes on our developer site.
  • All contributors must sign the Google Contributor License Agreement (CLA). If the google-cla bot leaves a comment on this PR, make sure you follow the instructions.
  • We use conventional commits to make versioning the package easier. Make sure your commit message is in the proper format or learn how to fix it.
  • If any of the other checks on this PR fail, you can click on them to learn why. It might be that your change caused a test failure, or that you need to double-check the style guide.
    Thank you for opening this PR! A member of the Blockly team will review it soon.

Copy link
Collaborator

@BeksOmega BeksOmega left a comment

Choose a reason for hiding this comment

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

This looks great thank you for the fixes! Once this passes CI I'll get this merged =)

@aishwaryavenkatesan
Copy link
Author

In the issue, it is mentioned as "This should be merged into the rc/v12.0.0 branch. It should be marked as a breaking change.". Wanted to check if there is anything to be done from my end

@BeksOmega
Copy link
Collaborator

Ah yes I missed that, you need to rebase onto the rc/v12.0.0 branch.

To rebase onto the rc/v12.0.0 branch, you can follow these steps.

  1. Fetch the latest changes from rc/v12.0.0:

    git fetch upstream rc/v12.0.0
  2. Checkout your branch:

    git checkout [your-branch-name]
  3. Start an interactive rebase:

    git rebase -i upstream/rc/v12.0.0
  4. In the editor that opens, identify the commits that aren't yours. These are likely the ones at the top of the list.

  5. Change the word pick to drop for each commit you want to remove.

  6. Save and close the editor.

  7. Force push your changes to your branch: Note that force pushing is a dangerous operation because it overwrites commit history, so if you dropped the wrong commits you could lose work.

    git push -f origin [your-branch-name]

Once you've done this, the PR should be on the correct branch.

Let me know if you have any questions or run into any issues!

@aishwaryavenkatesan
Copy link
Author

hi @BeksOmega did the required changes. Let me know if anything to be done from my side!

@BeksOmega BeksOmega changed the base branch from develop to rc/v12.0.0 August 7, 2024 15:59
@github-actions github-actions bot added PR: fix Fixes a bug and removed PR: fix Fixes a bug labels Aug 7, 2024
@BeksOmega BeksOmega changed the title fix: deleted styles without associated classes from css.ts, issue #8285 fix!: deleted styles without associated classes from css.ts, issue #8285 Aug 7, 2024
@github-actions github-actions bot added breaking change Used to mark a PR or issue that changes our public APIs. PR: fix Fixes a bug and removed PR: fix Fixes a bug labels Aug 7, 2024
@BeksOmega
Copy link
Collaborator

Thank you for your work on this @aishwaryavenkatesan :D

@BeksOmega BeksOmega merged commit 68dda11 into google:rc/v12.0.0 Aug 7, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking change Used to mark a PR or issue that changes our public APIs. PR: fix Fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants