Skip to content
This repository has been archived by the owner on Jan 26, 2021. It is now read-only.

Text alignment in email verification page #561

Closed
wants to merge 2 commits into from
Closed

Text alignment in email verification page #561

wants to merge 2 commits into from

Conversation

LaibaBasit008
Copy link

@LaibaBasit008 LaibaBasit008 commented Jun 9, 2020 •
edited
Loading

Description

Aligned the overlapping text in email verification

Fixes #529

Type of Change:

Delete irrelevant options.

  • Code
  • User Interface

Code/Quality Assurance Only

  • Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

Aligned Text

Checklist:

  • I have performed a self-review of my own code or materials
  • I have commented my code or provided relevant documentation, particularly in hard-to-understand areas

@LaibaBasit008 LaibaBasit008 added the Status: Needs Review PR needs an additional review or a maintainer's review. label Jun 9, 2020
@sammy1997
Copy link
Contributor

Hey @LaibaBasit008 can you please squash the commits and also can you make the PR title a bit more descriptive

@LaibaBasit008 LaibaBasit008 changed the title 529 Fixed Overlapping Text Alignment in Email Verification Jun 10, 2020
@LaibaBasit008 LaibaBasit008 changed the title Fixed Overlapping Text Alignment in Email Verification Overlapping Text Aliged in Email Verification Jun 10, 2020
@LaibaBasit008 LaibaBasit008 changed the title Overlapping Text Aliged in Email Verification Overlapping Text Aligned in Email Verification Jun 10, 2020
@theyashshahs
Copy link
Contributor

@LaibaBasit008 can you fill the checkboxes for the tasks in the description :)

@theyashshahs theyashshahs self-requested a review June 11, 2020 15:46
theyashshahs
theyashshahs previously approved these changes Jun 11, 2020
View reviewed changes
sammy1997
sammy1997 reviewed Jun 12, 2020
View reviewed changes
systers_portal/templates/account/verification_sent.html Outdated
@@ -2,6 +2,7 @@
{% block title %} - Verify Your E-mail Address{% endblock %}

{% block content %}
<div class="clear"></div>
Copy link
Contributor

Choose a reason for hiding this comment

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

@LaibaBasit008 Can't we simply change the style properties of the container div instead of adding a new div?

Copy link
Author

Choose a reason for hiding this comment

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

We can but then then the styling of div container can be affected somewhere else

Copy link
Contributor

Choose a reason for hiding this comment

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

@LaibaBasit008 not necessarily! We can target a div specifically using an id cant we?

Copy link
Author

Choose a reason for hiding this comment

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

Yes you right, Ok I will try that!

@saurabhkanswal
Copy link

@LaibaBasit008 sorry i didn't mention in the issue that, whenever we are loading verification page again then the overlapped text get aligned automatically.
i hope you have already consider this unexpected behavior.
thanks 😺

@LaibaBasit008
Copy link
Author

@LaibaBasit008 sorry i didn't mention in the issue that, whenever we are loading verification page again then the overlapped text get aligned automatically.
i hope you have already consider this unexpected behavior.
thanks smiley_cat
I did consider it!

@LaibaBasit008 LaibaBasit008 reopened this Jun 16, 2020
@LaibaBasit008 LaibaBasit008 reopened this Jun 16, 2020
@sammy1997
Copy link
Contributor

@LaibaBasit008 why was this closed?

@LaibaBasit008
Copy link
Author

LaibaBasit008 commented Jun 16, 2020 •
edited
Loading

@LaibaBasit008 why was this closed?

I was having issues with some commits I squashed some new commits and commits from other PR are appearing

@LaibaBasit008 LaibaBasit008 reopened this Jun 16, 2020
@sammy1997
Copy link
Contributor

There are some merge conflicts and multiple commits. Can you rebase and resolve the commits?

@LaibaBasit008
Copy link
Author

rebase

There are some merge conflicts and multiple commits. Can you rebase and resolve the commits?

I will look into it!

@sammy1997
Copy link
Contributor

@LaibaBasit008 any updates?

@LaibaBasit008
Copy link
Author

LaibaBasit008 commented Jun 22, 2020 •
edited
Loading

@LaibaBasit008 any updates?

resolved the conflict, working on commits

@theyashshahs
Copy link
Contributor

@LaibaBasit008 change the PR title to follow the commit styles

@LaibaBasit008 LaibaBasit008 changed the title Overlapping Text Aligned in Email Verification Fix:Text alignment in email verification page Jul 15, 2020
@LaibaBasit008 LaibaBasit008 changed the title Fix:Text alignment in email verification page Text alignment in email verification page Jul 15, 2020
@sakshi1499
Copy link

Resolve the conflicts, squash the commits and follow commit guidelines please.

@LaibaBasit008
Aligned Overlapping Text in Email Verification
7f49b0f 
Type:
- Code
- User Interface
Subject:
 TEXT ALIGNED
Body:
 After signing in email verfication text
@sakshi1499
Copy link

@LaibaBasit008 Commit message checks are failing can you push the changes?

@sakshi1499
Copy link

Closing this as there is no activity.

@sakshi1499 sakshi1499 closed this Aug 13, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@sammy1997 sammy1997 sammy1997 left review comments

@theyashshahs theyashshahs theyashshahs left review comments

Assignees
No one assigned
Labels
Status: Needs Review PR needs an additional review or a maintainer's review.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Text alignment in email verification page
5 participants
@LaibaBasit008 @sammy1997 @theyashshahs @saurabhkanswal @sakshi1499