Skip to content

Remove all "floated" CSS styles #32691

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

Merged
merged 2 commits into from
Dec 2, 2024
Merged

Remove all "floated" CSS styles #32691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
148b3ad
fix
wxiaoguang Dec 2, 2024
0d44d6d
Merge branch 'main' into fix-floated
GiteaBot Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions templates/admin/user/list.tmpl
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
</div> </div>
</h4> </h4>
<div class="ui attached segment"> <div class="ui attached segment">
<form class="ui form ignore-dirty" id="user-list-search-form"> <form class="ui form ignore-dirty flex-text-block" id="user-list-search-form">

<div class="tw-flex-1">
{{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}}
</div>
<!-- Right Menu --> <!-- Right Menu -->
<div class="ui right floated secondary filter menu"> <div class="ui secondary menu tw-m-0">
<!-- Status Filter Menu Item --> <!-- Status Filter Menu Item -->
<div class="ui dropdown type jump item"> <div class="ui dropdown type jump item">
<span class="text">{{ctx.Locale.Tr "admin.users.list_status_filter.menu_text"}}</span> <span class="text">{{ctx.Locale.Tr "admin.users.list_status_filter.menu_text"}}</span>
Expand Down Expand Up @@ -51,8 +53,6 @@
</div> </div>
</div> </div>
</div> </div>

{{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}}
</form> </form>
</div> </div>
<div class="ui attached table segment"> <div class="ui attached table segment">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/issue/milestone_new.tmpl
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="issue-navbar"> <div class="issue-navbar">
{{template "repo/issue/navbar" .}} {{template "repo/issue/navbar" .}}
{{if and (or .CanWriteIssues .CanWritePulls) .PageIsEditMilestone}} {{if and (or .CanWriteIssues .CanWritePulls) .PageIsEditMilestone}}
<div class="ui right floated secondary menu"> <div class="ui right">
<a class="ui primary button" href="{{$.RepoLink}}/milestones/new">{{ctx.Locale.Tr "repo.milestones.new"}}</a> <a class="ui primary button" href="{{$.RepoLink}}/milestones/new">{{ctx.Locale.Tr "repo.milestones.new"}}</a>
</div> </div>
{{end}} {{end}}
Expand Down
36 changes: 16 additions & 20 deletions templates/user/settings/account.tmpl
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
{{ctx.Locale.Tr "settings.manage_emails"}} {{ctx.Locale.Tr "settings.manage_emails"}}
</h4> </h4>
<div class="ui attached segment"> <div class="ui attached segment">
<div class="ui list"> <div class="ui list flex-items-block">
{{if $.EnableNotifyMail}} {{if $.EnableNotifyMail}}
<div class="item"> <div class="item">
<div class="tw-mb-2">{{ctx.Locale.Tr "settings.email_desc"}}</div> <div class="tw-mb-2">{{ctx.Locale.Tr "settings.email_desc"}}</div>
Expand All @@ -66,26 +66,33 @@
{{end}} {{end}}
{{if not ($.UserDisabledFeatures.Contains "manage_credentials")}} {{if not ($.UserDisabledFeatures.Contains "manage_credentials")}}
{{range .Emails}} {{range .Emails}}
<div class="item"> <div class="item tw-flex-wrap">
<div class="content tw-flex-1">
<strong>{{.Email}}</strong>
{{if .IsPrimary}}
<div class="ui primary label">{{ctx.Locale.Tr "settings.primary"}}</div>
{{end}}
{{if .IsActivated}}
<div class="ui green label">{{ctx.Locale.Tr "settings.activated"}}</div>
{{else}}
<div class="ui label">{{ctx.Locale.Tr "settings.requires_activation"}}</div>
{{end}}
</div>
<div class="flex-text-block">
{{if not .IsPrimary}} {{if not .IsPrimary}}
<div class="right floated content">
<button class="ui red tiny button delete-button" data-modal-id="delete-email" data-url="{{AppSubUrl}}/user/settings/account/email/delete" data-id="{{.ID}}"> <button class="ui red tiny button delete-button" data-modal-id="delete-email" data-url="{{AppSubUrl}}/user/settings/account/email/delete" data-id="{{.ID}}">
{{ctx.Locale.Tr "settings.delete_email"}} {{ctx.Locale.Tr "settings.delete_email"}}
</button> </button>
</div>
{{if .CanBePrimary}} {{if .CanBePrimary}}
<div class="right floated content">
<form action="{{AppSubUrl}}/user/settings/account/email" method="post"> <form action="{{AppSubUrl}}/user/settings/account/email" method="post">
{{$.CsrfTokenHtml}} {{$.CsrfTokenHtml}}
<input name="_method" type="hidden" value="PRIMARY"> <input name="_method" type="hidden" value="PRIMARY">
<input name="id" type="hidden" value="{{.ID}}"> <input name="id" type="hidden" value="{{.ID}}">
<button class="ui primary tiny button">{{ctx.Locale.Tr "settings.primary_email"}}</button> <button class="ui primary tiny button">{{ctx.Locale.Tr "settings.primary_email"}}</button>
</form> </form>
</div>
{{end}} {{end}}
{{end}} {{end}}
{{if not .IsActivated}} {{if not .IsActivated}}
<div class="right floated content">
<form action="{{AppSubUrl}}/user/settings/account/email" method="post"> <form action="{{AppSubUrl}}/user/settings/account/email" method="post">
{{$.CsrfTokenHtml}} {{$.CsrfTokenHtml}}
<input name="_method" type="hidden" value="SENDACTIVATION"> <input name="_method" type="hidden" value="SENDACTIVATION">
Expand All @@ -96,22 +103,11 @@
<button class="ui primary tiny button">{{ctx.Locale.Tr "settings.activate_email"}}</button> <button class="ui primary tiny button">{{ctx.Locale.Tr "settings.activate_email"}}</button>
{{end}} {{end}}
</form> </form>
</div>
{{end}}
<div class="content tw-py-2">
<strong>{{.Email}}</strong>
{{if .IsPrimary}}
<div class="ui primary label">{{ctx.Locale.Tr "settings.primary"}}</div>
{{end}}
{{if .IsActivated}}
<div class="ui green label">{{ctx.Locale.Tr "settings.activated"}}</div>
{{else}}
<div class="ui label">{{ctx.Locale.Tr "settings.requires_activation"}}</div>
{{end}} {{end}}
</div> </div>
</div> </div>
{{end}} {{end}}{{/* range Emails */}}
{{end}} {{end}}{{/* if manage_credentials */}}
</div> </div>
</div> </div>
{{end}} {{end}}
Expand Down
6 changes: 0 additions & 6 deletions web_src/css/modules/list.css
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -126,12 +126,6 @@
cursor: pointer; cursor: pointer;
} }


.ui.list .list > .item [class*="right floated"],
.ui.list > .item [class*="right floated"] {
float: right;
margin: 0 0 0 1em;
}

.ui.menu .ui.list > .item, .ui.menu .ui.list > .item,
.ui.menu .ui.list .list > .item { .ui.menu .ui.list .list > .item {
display: list-item; display: list-item;
Expand Down
12 changes: 0 additions & 12 deletions web_src/css/modules/menu.css
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -633,18 +633,6 @@
} }
} }


.ui.floated.menu {
float: left;
margin: 0 0.5rem 0 0;
}
.ui.floated.menu .item:last-child::before {
display: none;
}
.ui.right.floated.menu {
float: right;
margin: 0 0 0 0.5rem;
}

.ui.borderless.menu .item::before, .ui.borderless.menu .item::before,
.ui.borderless.menu .item .menu .item::before, .ui.borderless.menu .item .menu .item::before,
.ui.menu .borderless.item::before { .ui.menu .borderless.item::before {
Expand Down
Loading