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

Show protected branch rule names again #23907

Merged
merged 9 commits into from
Apr 9, 2023
Merged

Show protected branch rule names again #23907

merged 9 commits into from
Apr 9, 2023

Conversation

HesterG
Copy link
Contributor

@HesterG HesterG commented Apr 4, 2023 •
edited
Loading

!importants for one of the primary label selectors are removed by #23774, so the repository branch protection settings ui will not have the demanding css. This PR modifies .ui.primary.label to fix it.

Before:
飞书20230404-115410

After:
截屏2023-04-04 11 56 32

@HesterG HesterG added the topic/ui Change the appearance of the Gitea UI label Apr 4, 2023
wxiaoguang
wxiaoguang reviewed Apr 4, 2023
View reviewed changes
web_src/css/base.css Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 4, 2023
@codecov-commenter

This comment was marked as off-topic.

Sign in to view
@silverwind
Copy link
Member

silverwind commented Apr 4, 2023 •
edited
Loading

We could remove the !important on .ui.primary.label which also fixes it, but I' not sure if anything else would break. I think it's worth a try.

@HesterG
Copy link
Contributor Author

HesterG commented Apr 4, 2023 •
edited
Loading

We could remove the !important on .ui.primary.label which also fixes it, but I' not sure if anything else would break. I think it's worth a try.

I do find one specific place that will be overwtitten by semantic.css if removed the !important in .ui.primary.label, this is in account setting of user settings. But they look similar.
截屏2023-04-04 18 09 31

@silverwind
Copy link
Member

silverwind commented Apr 4, 2023 •
edited
Loading

I do find one specific place that will be overwtitten by semantic.css if removed the !important in .ui.primary.label, this is in account setting of site administration settings. But they look similar.

That's an easy fix, alter the selector in base.css to match the original Fomantic one, e.g. .ui.primary.labels .label, .ui.ui.ui.primary.label.

@HesterG
Copy link
Contributor Author

HesterG commented Apr 4, 2023

I do find one specific place that will be overwtitten by semantic.css if removed the !important in .ui.primary.label, this is in account setting of site administration settings. But they look similar.

That's an easy fix, alter the selector in base.css to match the original Fomantic one, e.g. .ui.primary.labels .label, .ui.ui.ui.primary.label.

Added a commit 3d97a42 to apply the changes.

@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 Apr 4, 2023
@HesterG HesterG changed the title Add back !important to primary label selector Remove !important on primary label selector and modify rule to match semantic.css Apr 4, 2023
@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 Apr 9, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 9, 2023
@lunny lunny modified the milestones: 1.19.1, 1.20.0 Apr 9, 2023
@delvh delvh changed the title Remove !important on primary label selector and modify rule to match semantic.css Show protected branch rule names again Apr 9, 2023
@silverwind silverwind enabled auto-merge (squash) April 9, 2023 09:48
@silverwind silverwind added the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Apr 9, 2023
@silverwind silverwind merged commit a519aac into go-gitea:main Apr 9, 2023
@GiteaBot GiteaBot mentioned this pull request Apr 9, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 9, 2023
@HesterG @delvh @lunny
Show protected branch rule names again (go-gitea#23907)
9430527 
`!important`s for one of the primary label selectors are removed by
go-gitea#23774, so the repository branch protection settings ui will not have
the demanding css. This PR modifies `.ui.primary.label` to fix it.

Before:
<img width="1408" alt="飞书20230404-115410"
src="https://user-images.githubusercontent.com/17645053/229683221-ef9c7d5c-68a8-42b0-ba19-ef2d5dfce5f9.png">

After:
<img width="1419" alt="截屏2023-04-04 11 56 32"
src="https://user-images.githubusercontent.com/17645053/229683469-70cfc92d-d7ef-4323-a7f5-2247810fabce.png">

---------

Co-authored-by: delvh <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Apr 9, 2023
@silverwind silverwind removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 9, 2023
silverwind pushed a commit that referenced this pull request Apr 9, 2023
@GiteaBot @HesterG
@delvh @lunny
Show protected branch rule names again (#23907) (#24018)
695738f 
Backport #23907 by @HesterG

`!important`s for one of the primary label selectors are removed by
#23774, so the repository branch protection settings ui will not have
the demanding css. This PR modifies `.ui.primary.label` to fix it.

Before:
<img width="1408" alt="飞书20230404-115410"
src="https://user-images.githubusercontent.com/17645053/229683221-ef9c7d5c-68a8-42b0-ba19-ef2d5dfce5f9.png">

After:
<img width="1419" alt="截屏2023-04-04 11 56 32"
src="https://user-images.githubusercontent.com/17645053/229683469-70cfc92d-d7ef-4323-a7f5-2247810fabce.png">

Co-authored-by: Hester Gong <[email protected]>
Co-authored-by: delvh <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 10, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
ac0dee9 
* upstream/main: (39 commits)
  Fix protected branch for API (go-gitea#24013)
  [skip ci] Updated translations via Crowdin
  Fix markdownlint (go-gitea#24024)
  Introduce lint-md and compliance-docs pipeline (go-gitea#24021)
  Fix https setup doc zh-cn (go-gitea#24015)
  Replace tribute with text-expander-element for textarea (go-gitea#23985)
  Improve GetBoards and getDefaultBoard (go-gitea#22981)
  Expand/Collapse all changed files (go-gitea#23639)
  Show errors for KaTeX and mermaid on the preview tab (go-gitea#24009)
  Show protected branch rule names again (go-gitea#23907)
  Reference the `zh-CN` version of `reverse-proxies` in `https-support` (go-gitea#24016)
  Fix lint problem in `https-support.zh-cn.md` (go-gitea#24014)
  docs: HTTPS configuration for zh-cn (go-gitea#23039)
  Re-add initial wiki page text when editing the page (go-gitea#23984)
  [skip ci] Updated translations via Crowdin
  fix: do not escape space between PyPI repository url and package name… (go-gitea#23981)
  Make bindata static build parse builtin templates correctly (go-gitea#24003)
  Group template helper functions, remove `Printf`, improve template error messages (go-gitea#23982)
  Adjust sticky pr header to cover background (go-gitea#23956)
  Update github.com/google/go-github to v51 (go-gitea#23946)
  ...
@HesterG HesterG deleted the fix-branch-protection-ui branch April 12, 2023 04:04
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang left review comments

@delvh delvh delvh approved these changes

@silverwind silverwind silverwind approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 topic/ui Change the appearance of the Gitea UI
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.
7 participants
@HesterG @codecov-commenter @silverwind @lunny @wxiaoguang @delvh @GiteaBot