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

fix(scss): Use consistent spacing instead of tabs #1281

Merged
merged 3 commits into from
Aug 28, 2023
Merged

fix(scss): Use consistent spacing instead of tabs #1281

merged 3 commits into from
Aug 28, 2023

Conversation

CuriousLearner
Copy link
Member

No description provided.

@CuriousLearner CuriousLearner requested a review from a team December 1, 2022 15:29
@sabderemane
Copy link
Member

sabderemane commented Dec 2, 2022 •
edited
Loading

Hi @CuriousLearner, I would like to suggest a change related to that, because I'm using EditorConfig to be sure I have the good configuration where there is one defined in a project and the current configuration sounds not adapted to the need according the changes :

# .editorconfig

[*.{scss,js}]
indent_style = tab
indent_size = tab

It should be space instead I think :)

@CuriousLearner
Copy link
Member Author

Hey @sabderemane

Yes, that sounds correct. However, now I saw other SCSS files in the repo and they all are mixed of spaces and tabs. I'll get them fixed to have consistent spaces if @django/djangoproject-com-maintainters are okay with that. If you have any other preference, I'm all ears!

@pauloxnet
Copy link
Member

Hey @sabderemane

Yes, that sounds correct. However, now I saw other SCSS files in the repo and they all are mixed of spaces and tabs. I'll get them fixed to have consistent spaces if @django/djangoproject-com-maintainters are okay with that. If you have any other preference, I'm all ears!

I'm ok with that

emarhin
emarhin approved these changes Jan 19, 2023
View reviewed changes
Copy link

@emarhin emarhin left a comment

Choose a reason for hiding this comment

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

Not bad

@CuriousLearner CuriousLearner force-pushed the fix-spacing-indentation-style-scss branch from e62af7b to e1b7dcc Compare February 11, 2023 10:34
@CuriousLearner CuriousLearner changed the title fix(scss/_style.scss): Use consistent spacing instead of tabs fix(scss): Use consistent spacing instead of tabs Feb 13, 2023
@CuriousLearner CuriousLearner requested review from camilonova and a team February 13, 2023 08:06
@CuriousLearner CuriousLearner force-pushed the fix-spacing-indentation-style-scss branch from aa22799 to 2f4420e Compare February 20, 2023 20:19
@CuriousLearner CuriousLearner requested review from pauloxnet and a team February 20, 2023 20:23
@CuriousLearner
Copy link
Member Author

This is ready for a review :)

@CuriousLearner
Merge branch 'main' of github.com:CuriousLearner/djangoproject.com in…
6b68b18 
…to fix-spacing-indentation-style-scss

* 'main' of github.com:CuriousLearner/djangoproject.com:
  Bump django from 3.2.17 to 3.2.18 in /requirements
  Fix logic for selecting search key string
@CuriousLearner
Update from main and resolve conflicts
cc5ee97
sabderemane
sabderemane approved these changes Aug 17, 2023
View reviewed changes
Copy link
Member

@sabderemane sabderemane left a comment

Choose a reason for hiding this comment

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

LGTM !

@sabderemane
Copy link
Member

@CuriousLearner do you think a rebase is needed ? I don't know if other files have changed since your last changes

@sabderemane sabderemane merged commit 66a6e87 into django:main Aug 28, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emarhin emarhin emarhin approved these changes

@sabderemane sabderemane sabderemane approved these changes

@camilonova camilonova Awaiting requested review from camilonova

@pauloxnet pauloxnet Awaiting requested review from pauloxnet

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@CuriousLearner @sabderemane @pauloxnet @camilonova @emarhin