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

Add alert blocks in markdown #29121

Merged
merged 16 commits into from
Feb 10, 2024
Merged

Add alert blocks in markdown #29121

merged 16 commits into from
Feb 10, 2024

Conversation

yardenshoham
Copy link
Member

@yardenshoham yardenshoham commented Feb 9, 2024 •
edited
Loading

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 9, 2024
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 9, 2024
@GiteaBot GiteaBot added the pr/breaking Merging this PR means builds will break. Needs a description what exactly breaks, and how to fix it! label Feb 9, 2024
@yardenshoham yardenshoham added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Feb 9, 2024
@yardenshoham yardenshoham marked this pull request as ready for review February 9, 2024 22:03
@yardenshoham
Add alert blocks in markdown
cc8444d 
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@lafriks
Copy link
Member

lafriks commented Feb 9, 2024

Would be nice to also fix the title style as the icon looks really out of order

@yardenshoham
Copy link
Member Author

Yeah I don't know CSS it's black magic

@denyskon
Copy link
Member

denyskon commented Feb 9, 2024

I will take look at the css tomorrow 😉

@silverwind
Copy link
Member

silverwind commented Feb 9, 2024 •
edited
Loading

"Tip" icon not colored correctly in the screenshot. Also, icon needs vertical centering with text. Check GH CSS.

@lunny lunny added this to the 1.22.0 milestone Feb 10, 2024
@yardenshoham
Vertical align the icons
def2bae 
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@yardenshoham
Merge remote-tracking branch 'upstream/main' into issues/28316
561bf73
@yardenshoham
Fix ref
56d7f4f 
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@yardenshoham
Copy link
Member Author

Updated the icon vertical-align

Before

image

After

image

@yardenshoham yardenshoham added the topic/content-rendering Changes how certain filetypes are displayed label Feb 10, 2024
@yardenshoham
Copy link
Member Author

Fixed tip color

Before

image

After

image

@yardenshoham
Fail fast
03882cf 
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@yardenshoham
Copy link
Member Author

Oof these look bad in light theme, I need better colors
image

@yardenshoham
Fix colors
6832265 
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@yardenshoham
Copy link
Member Author

Fixed
image

@yardenshoham
Copy link
Member Author

Added some margin-right to the icon and dropped the boldness one level

Before

image

After

image

@silverwind
Copy link
Member

Contrast on dark theme seems a bit low for Note, Caution and Tip. Do we have better suitable variables (1 level lighter?).

@yardenshoham
Lighter note and caution
a15cf40 
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@yardenshoham
Copy link
Member Author

I changed Note and Caution. I think Tip will look bad on light theme if I change it

Before

image

After

image

@silverwind
Copy link
Member

Pushed a tweak to purple, looks good enough for me on both themes:

Screenshot 2024-02-10 at 18 10 33 Screenshot 2024-02-10 at 18 10 53

@silverwind
Copy link
Member

The problem with the tip icon is strange, I will investigate.

@silverwind
Copy link
Member

silverwind commented Feb 10, 2024 •
edited
Loading

@yardenshoham the problem is the tip icon is missing the class attribute and only svg class gets correct colors. I reverted the CSS hacks, can you check where the class goes missing in backend? It is present on other icons, for example svg octicon-alert.

@yardenshoham
Fix sanitizer
97668d7 
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@yardenshoham
Copy link
Member Author

Fixed

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 10, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 10, 2024
@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 10, 2024
@lafriks lafriks enabled auto-merge (squash) February 10, 2024 18:24
@lafriks lafriks merged commit 12865ae into go-gitea:main Feb 10, 2024
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 10, 2024
@yardenshoham yardenshoham deleted the issues/28316 branch February 10, 2024 18:45
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 14, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
82aedae 
* giteaofficial/main: (38 commits)
  Document how the TOC election process works (go-gitea#29135)
  Runner tokens are multi use (go-gitea#29153)
  Fix Gitpod logic of setting ROOT_URL (go-gitea#29162)
  Remove jQuery from the user search form in admin page (go-gitea#29151)
  Dont load Review if Comment is CommentTypeReviewRequest (go-gitea#28551)
  Show `View at this point in history` for every commit (go-gitea#29122)
  [skip ci] Updated translations via Crowdin
  Add merge style `fast-forward-only` (go-gitea#28954)
  Use Markdown alert syntax for notes in README (go-gitea#29150)
  Refactor issue template parsing and fix API endpoint (go-gitea#29069)
  [skip ci] Updated translations via Crowdin
  Update some translations and fix markdown formatting (go-gitea#29099)
  Show more settings for empty repositories (go-gitea#29130)
  Update JS and PY dependencies (go-gitea#29127)
  Add alert blocks in markdown (go-gitea#29121)
  Remove obsolete border-radius on comment content (go-gitea#29128)
  Make blockquote border size less aggressive (go-gitea#29124)
  Drop "@" from email sender to avoid spam filters (go-gitea#29109)
  [skip ci] Updated translations via Crowdin
  Disallow duplicate storage paths (go-gitea#26484)
  ...
silverwind added a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
@yardenshoham @silverwind @GiteaBot
Add alert blocks in markdown (go-gitea#29121)
04085f0 
- Follows go-gitea#21711
- Closes go-gitea#28316

Implement GitHub's alert blocks markdown feature

Docs:
-
https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#alerts
- https://github.com/orgs/community/discussions/16925

### Before

![image](https://github.com/go-gitea/gitea/assets/20454870/14f7b02a-5de5-4fd0-8437-a055dadb31f2)

### After

![image](https://github.com/go-gitea/gitea/assets/20454870/ed06a869-e545-42f1-bf25-4ba20b1be196)

## ⚠️ BREAKING ⚠️

The old syntax no longer works

How to migrate:

If you used
```md
> **Note** My note
```

Switch to
```md
> [!NOTE]
> My note
```

---------

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
6543 pushed a commit to 6543-forks/gitea that referenced this pull request Feb 26, 2024
@yardenshoham @silverwind
@GiteaBot @algernon
Add alert blocks in markdown (go-gitea#29121)
0b3193b 
- Follows go-gitea#21711
- Closes go-gitea#28316

Implement GitHub's alert blocks markdown feature

Docs:
-
https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#alerts
- https://github.com/orgs/community/discussions/16925

### Before

![image](https://github.com/go-gitea/gitea/assets/20454870/14f7b02a-5de5-4fd0-8437-a055dadb31f2)

### After

![image](https://github.com/go-gitea/gitea/assets/20454870/ed06a869-e545-42f1-bf25-4ba20b1be196)

## ⚠️ BREAKING ⚠️

The old syntax no longer works

How to migrate:

If you used
```md
> **Note** My note
```

Switch to
```md
> [!NOTE]
> My note
```

---------

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. pr/breaking Merging this PR means builds will break. Needs a description what exactly breaks, and how to fix it! size/L Denotes a PR that changes 100-499 lines, ignoring generated files. topic/content-rendering Changes how certain filetypes are displayed type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Update Note and Warning markdown highlighting with GitHub's changes
6 participants
@yardenshoham @lafriks @denyskon @silverwind @lunny @GiteaBot