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 Italic issue #4241

Merged
merged 2 commits into from Oct 26, 2023
Merged

Fix Italic issue #4241

merged 2 commits into from Oct 26, 2023

Conversation

ShaileshS1702
Copy link
Contributor

Description

Fixed the italic issue on landingpage. fixed issue were "Datateknologi was written normally, but "Cybersikkerhet og datakommunikasjon" were written in italics.
bug-fix

Result

before
image

after
image

Testing

  • I have thoroughly tested my changes.
    I've tested for different sizes: Issue
image

It may be difficult to differentiate which to words do correspond to one thing. It may also look like it's one study programme or three

Resolves ... (either GitHub issue or Linear task)
ABA-631

@github-actions github-actions bot added the review-needed Pull requests that need review label Oct 26, 2023
@ShaileshS1702 ShaileshS1702 changed the title Italic shailesh Fix Italic issue Oct 26, 2023
@ShaileshS1702 ShaileshS1702 reopened this Oct 26, 2023
Copy link
Member

@ivarnakken ivarnakken left a comment

Choose a reason for hiding this comment

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

Thanks!

@ivarnakken ivarnakken added bug-fix Pull requests that fix a bug approved Pull requests that have been approved small-fix Pull requests that fix something small labels Oct 26, 2023
Copy link
Member

@danielyanghansen danielyanghansen left a comment

Choose a reason for hiding this comment

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

Nice! Just remember to run yarn prettier

@ivarnakken
Copy link
Member

ivarnakken commented Oct 26, 2023

Our linter, prettier, is saying your code needs to be reformatted. No worries!

You can fix this with the command yarn prettier. This is one of many "scripts" we have configured for this project, which you can view in the package.json file under "scripts". I recommend adding prettier as an extension to your code editor though - makes life a whole lot easier.

After the fix, you can stage it (git add .) and add it to your previous commit by typing git commit --amend. You may also add a --no-edit flag since you don't need to edit the commit message: git commit --amend --no-edit.
After this you'll have to force push your changes: git push --force or git push -f (same thing). A safer alternative to this is git push --force-with-lease, since this allows you to push changes only if the remote branch is at the same commit as the one you have locally, which just makes sure you do not override someone else's commit.

@ivarnakken ivarnakken removed the review-needed Pull requests that need review label Oct 26, 2023
@github-actions github-actions bot added the review-needed Pull requests that need review label Oct 26, 2023
Copy link
Contributor

@falbru falbru left a comment

Choose a reason for hiding this comment

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

Great job!

@ivarnakken
Copy link
Member

ivarnakken commented Oct 26, 2023

@ShaileshS1702
Seems you added a revert commit. It doesn't seem to do anything here, and we can just squash this PR and be done for the day, but if you want to remove it you can do;

  1. git rebase -i HEAD~1
  2. Change pick to drop on the revert commit
  3. Force push to this remote branch like described above

The -i in git rebase means the rebase is "interactive", which let's you do a bunch of cool stuff such as edit and reword (which I use all the time). The "1" in the command refers to how many commits back we want to look at.

@ivarnakken ivarnakken merged commit 4e143f0 into master Oct 26, 2023
4 checks passed
@ivarnakken ivarnakken deleted the italic_shailesh branch October 26, 2023 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Pull requests that have been approved bug-fix Pull requests that fix a bug review-needed Pull requests that need review small-fix Pull requests that fix something small
Projects
None yet
4 participants