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

feat: Login page changes made #1004

Merged
merged 12 commits into from
Jul 29, 2023
Merged

feat: Login page changes made #1004

merged 12 commits into from
Jul 29, 2023

Conversation

shruuti321
Copy link
Contributor

I have changed the login page background colour in both light and dark modes and also provided for margin form top.
image
image

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.

Thank you shruuti321! for creating this pull request and contributing to Dummygram! 💗

The maintainers will review this Pull Request and provide feedback as soon as possible! 😇
We appreciate your patience and contribution, Keep up the great work! 😀

Copy link
Owner

@narayan954 narayan954 left a comment

Choose a reason for hiding this comment

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

Hi @shruuti321 can you please have a look at the alignment,some of it is getting disturbed.
changed version:
image
original version:
image

@shruuti321
Copy link
Contributor Author

@narayan954 I am encountering this error while pushing
Could you please help?
image

@narayan954
Copy link
Owner

narayan954 commented Jul 28, 2023

@narayan954 I am encountering this error while pushing
Could you please help?
image

as you read in the error hint, you need to pull first before pushing :) ... so try git pull command first then you can git push.... It's also written in the terminal as hint

@shruuti321
Copy link
Contributor Author

@narayan954 I am encountering this error while pushing
Could you please help?
image

as you read in the error hint, you need to pull first before pushing :) ... so try git pull command first then you can git push.... It's also written in the terminal as hint

image
This error while pushing was never encountered before

@narayan954
Copy link
Owner

narayan954 commented Jul 28, 2023

@narayan954 I am encountering this error while pushing
Could you please help?
image

as you read in the error hint, you need to pull first before pushing :) ... so try git pull command first then you can git push.... It's also written in the terminal as hint

image
This error while pushing was never encountered before

you're updating wrong branch perhaps, you're working on other branch... try git pull only else git pull origin *branch name*

@narayan954
Copy link
Owner

@narayan954 I am encountering this error while pushing
Could you please help?
image

as you read in the error hint, you need to pull first before pushing :) ... so try git pull command first then you can git push.... It's also written in the terminal as hint

image
This error while pushing was never encountered before

it's because, I've pushed a change in your branch and your current local is behind the remote. You need to sync with your remote first :)

@shruuti321
Copy link
Contributor Author

@narayan954 I am encountering this error while pushing
Could you please help?
image

as you read in the error hint, you need to pull first before pushing :) ... so try git pull command first then you can git push.... It's also written in the terminal as hint

image
This error while pushing was never encountered before

it's because, I've pushed a change in your branch and your current local is behind the remote. You need to sync with your remote first :)

So sorry for the inconvinience but I have even pulled and merged but still it is showing the same error
image

@narayan954
Copy link
Owner

@narayan954 I am encountering this error while pushing
Could you please help?
image

as you read in the error hint, you need to pull first before pushing :) ... so try git pull command first then you can git push.... It's also written in the terminal as hint

image
This error while pushing was never encountered before

it's because, I've pushed a change in your branch and your current local is behind the remote. You need to sync with your remote first :)

So sorry for the inconvinience but I have even pulled and merged but still it is showing the same error image

it's alright, try each of these command I am telling below:

git pull it pulls to the current branch by default, so it might work for you, if it doesn't, try
git pull origin log , this will pull from origin to your log branch, if that shows error try git pull origin/log log.

As a final resort, do git push -f this will ignore all warnings and push

@narayan954
Copy link
Owner

narayan954 commented Jul 28, 2023

If none of those work, let me know, I'll revert the commits I made, and then you'll be able to work normally :)

Ps: But no, you should know how to fix this error, contact in discord if the issue persists

@shruuti321
Copy link
Contributor Author

shruuti321 commented Jul 29, 2023

If none of those work, let me know, I'll revert the commits I made, and then you'll be able to work normally :)

Ps: But no, you should know how to fix this error, contact in discord if the issue persists

Could you check if the changes are made
image

@narayan954
Copy link
Owner

If none of those work, let me know, I'll revert the commits I made, and then you'll be able to work normally :)
Ps: But no, you should know how to fix this error, contact in discord if the issue persists

Could you check if the changes are made image

yes, your commits are reflected now!

@narayan954
Copy link
Owner

But your changes are lost, perhaps you deleted the changes?

@narayan954
Copy link
Owner

image
only one line looks changed now :/

@shruuti321
Copy link
Contributor Author

I have made my final commits. Hope this time the changes are being reflected

@narayan954
Copy link
Owner

I have made my final commits. Hope this time the changes are being reflected

awesome, they look great!

Copy link
Owner

@narayan954 narayan954 left a comment

Choose a reason for hiding this comment

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

looks good to me!

@narayan954
Copy link
Owner

thanks for your contribution! and do mention your issue, so I can add relevant labels

@narayan954 narayan954 merged commit a1e5ab6 into narayan954:master Jul 29, 2023
3 of 4 checks passed
@shruuti321
Copy link
Contributor Author

Closing #984

@shruuti321
Copy link
Contributor Author

And thankyou so much for providing the guidance and help on the spot :)

@narayan954 narayan954 linked an issue Jul 30, 2023 that may be closed by this pull request
4 tasks
@shruuti321
Copy link
Contributor Author

Label please?

@narayan954
Copy link
Owner

Label please?

right I forgot, sorry

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

Login page background color and margin
2 participants