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

Fix protected branch icon location #26576

Merged
merged 3 commits into from
Sep 27, 2023
Merged

Fix protected branch icon location #26576

merged 3 commits into from
Sep 27, 2023

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Aug 18, 2023

Before:
image
After:
image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 18, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 18, 2023
wxiaoguang
wxiaoguang reviewed Aug 18, 2023
View reviewed changes
templates/repo/commit_status.tmpl Outdated
@@ -1,4 +1,5 @@
<!-- make sure this matches the color logic in web_src/js/components/DashboardRepoList.vue -->
<span class="gt-df gt-ac">
Copy link
Contributor

Choose a reason for hiding this comment

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

It's not right to put gt-df gt-ac everywhere. Only the parent container needs the "align-items: center"

Copy link
Member

@silverwind silverwind Aug 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, also this gt-df gt-ac is essentially a noop because it wraps the child exactly so display: flex will not alter the rendering over default display: block.

wxiaoguang
wxiaoguang reviewed Aug 18, 2023
View reviewed changes
templates/repo/branch/list.tmpl Outdated
<div class="gt-df gt-ac">
{{if .DefaultBranchBranch.IsProtected}}
<span class="flex-text-inline gt-pr-2">{{svg "octicon-shield-lock"}}</span>
Copy link
Contributor

Choose a reason for hiding this comment

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

The parent already has "align-items: center", this flex-text-inline is a no op for a single SVG element.

@yp05327 yp05327 force-pushed the fix-protected-branch-icon-in-branch-list branch from 6b05144 to e2a7adb Compare August 21, 2023 04:28
@lunny lunny added the topic/ui Change the appearance of the Gitea UI label Aug 21, 2023
@lunny lunny added this to the 1.21.0 milestone Aug 21, 2023
@lunny lunny modified the milestones: 1.21.0, 1.22.0 Sep 21, 2023
@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 Sep 27, 2023
@delvh delvh added backport/v1.21 This PR should be backported to Gitea 1.21 type/bug labels Sep 27, 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 Sep 27, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) September 27, 2023 21:48
@techknowlogick techknowlogick added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. and removed lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels Sep 27, 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 Sep 27, 2023
@techknowlogick techknowlogick merged commit e5e1d84 into go-gitea:main Sep 27, 2023
25 checks passed
@GiteaBot GiteaBot mentioned this pull request Sep 27, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 27, 2023
@yp05327 @GiteaBot
Fix protected branch icon location (go-gitea#26576)
ac5e7cc
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Sep 27, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 27, 2023
jolheiser pushed a commit that referenced this pull request Sep 27, 2023
@GiteaBot @yp05327
Fix protected branch icon location (#26576) (#27317)
a6a79ad 
Backport #26576 by @yp05327

Before:

![image](https://github.com/go-gitea/gitea/assets/18380374/717c726d-d3ae-4ea3-86bf-36fd8430f1ba)
After:

![image](https://github.com/go-gitea/gitea/assets/18380374/f4508428-380a-4b44-9cc2-fa9483971808)

Co-authored-by: yp05327 <576951401@qq.com>
@wxiaoguang
Copy link
Contributor

Many gt-df usages are still not ideal.

@wxiaoguang
Copy link
Contributor

-> Improve branch list UI #27319

zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 28, 2023
@zjjhot
Merge remote-tracking branch 'giteaoffical/main'
7bf3179 
* giteaoffical/main: (22 commits)
  Fix review UI (go-gitea#27322)
  Improve issue history dialog and make poster can delete their own history (go-gitea#27323)
  Improve branch list UI (go-gitea#27319)
  doctor: delete action entries without existing user (go-gitea#27292)
  fix orphan check for deleted branch (go-gitea#27310)
  make writing main test easier (go-gitea#27270)
  [skip ci] Updated translations via Crowdin
  Fix protected branch icon location (go-gitea#26576)
  move the `gitea admin` subcommands into separate files (go-gitea#27307)
  Fix chinese translation (go-gitea#27296)
  bump bleve (go-gitea#27300)
  Redefine the meaning of column is_active to make Actions Registration Token generation easier (go-gitea#27143)
  Use vitest globals (go-gitea#27102)
  Fix divider in subscription page (go-gitea#27298)
  Fix yaml test (go-gitea#27297)
  Enable production source maps for index.js, fix CSS sourcemaps (go-gitea#27291)
  Fix some animation bugs (go-gitea#27287)
  Add missed return to actions view fetch (go-gitea#27289)
  Fix more yaml lint errors (go-gitea#27284)
  Fix incorrect change from go-gitea#27231 (go-gitea#27275)
  ...
@yp05327 yp05327 deleted the fix-protected-branch-icon-in-branch-list branch October 23, 2023 01:41
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 27, 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

@silverwind silverwind silverwind left review comments

@delvh delvh delvh approved these changes

@techknowlogick techknowlogick techknowlogick approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
7 participants
@yp05327 @wxiaoguang @silverwind @techknowlogick @delvh @lunny @GiteaBot