Skip to content

Commit 13fbab5

Browse files
wxiaoguangwxiaoguang
authored
Remove all "floated" CSS styles (go-gitea#32691)
flex but don't float diff with ignoring spaces : https://github.com/go-gitea/gitea/pull/32691/files?diff=split&w=1 related pages: ### admin users ![image](https://github.com/user-attachments/assets/40dd4c46-3f5b-4a68-89b0-d0a9a806f1fc) ### milestone ![image](https://github.com/user-attachments/assets/e3efb630-f07c-4c9d-b877-71e28cddcdce) ### user account setting ![image](https://github.com/user-attachments/assets/d15609ee-016d-4aee-999a-b5455fe6185c)
1 parent 9a494af commit 13fbab5

File tree

5 files changed

+28
-50
lines changed

5 files changed

+28
-50
lines changed

‎templates/admin/user/list.tmpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
</div>
88
</h4>
99
<div class="ui attached segment">
10-
<form class="ui form ignore-dirty" id="user-list-search-form">
11-
10+
<form class="ui form ignore-dirty flex-text-block" id="user-list-search-form">
11+
<div class="tw-flex-1">
12+
{{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}}
13+
</div>
1214
<!-- Right Menu -->
13-
<div class="ui right floated secondary filter menu">
15+
<div class="ui secondary menu tw-m-0">
1416
<!-- Status Filter Menu Item -->
1517
<div class="ui dropdown type jump item">
1618
<span class="text">{{ctx.Locale.Tr "admin.users.list_status_filter.menu_text"}}</span>
@@ -51,8 +53,6 @@
5153
</div>
5254
</div>
5355
</div>
54-
55-
{{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}}
5656
</form>
5757
</div>
5858
<div class="ui attached table segment">

‎templates/repo/issue/milestone_new.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="issue-navbar">
66
{{template "repo/issue/navbar" .}}
77
{{if and (or .CanWriteIssues .CanWritePulls) .PageIsEditMilestone}}
8-
<div class="ui right floated secondary menu">
8+
<div class="ui right">
99
<a class="ui primary button" href="{{$.RepoLink}}/milestones/new">{{ctx.Locale.Tr "repo.milestones.new"}}</a>
1010
</div>
1111
{{end}}

‎templates/user/settings/account.tmpl‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
{{ctx.Locale.Tr "settings.manage_emails"}}
4141
</h4>
4242
<div class="ui attached segment">
43-
<div class="ui list">
43+
<div class="ui list flex-items-block">
4444
{{if $.EnableNotifyMail}}
4545
<div class="item">
4646
<div class="tw-mb-2">{{ctx.Locale.Tr "settings.email_desc"}}</div>
@@ -65,27 +65,34 @@
6565
</div>
6666
{{end}}
6767
{{if not ($.UserDisabledFeatures.Contains "manage_credentials")}}
68-
{{range .Emails}}
69-
<div class="item">
70-
{{if not .IsPrimary}}
71-
<div class="right floated content">
68+
{{range .Emails}}
69+
<div class="item tw-flex-wrap">
70+
<div class="content tw-flex-1">
71+
<strong>{{.Email}}</strong>
72+
{{if .IsPrimary}}
73+
<div class="ui primary label">{{ctx.Locale.Tr "settings.primary"}}</div>
74+
{{end}}
75+
{{if .IsActivated}}
76+
<div class="ui green label">{{ctx.Locale.Tr "settings.activated"}}</div>
77+
{{else}}
78+
<div class="ui label">{{ctx.Locale.Tr "settings.requires_activation"}}</div>
79+
{{end}}
80+
</div>
81+
<div class="flex-text-block">
82+
{{if not .IsPrimary}}
7283
<button class="ui red tiny button delete-button" data-modal-id="delete-email" data-url="{{AppSubUrl}}/user/settings/account/email/delete" data-id="{{.ID}}">
7384
{{ctx.Locale.Tr "settings.delete_email"}}
7485
</button>
75-
</div>
76-
{{if .CanBePrimary}}
77-
<div class="right floated content">
86+
{{if .CanBePrimary}}
7887
<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
7988
{{$.CsrfTokenHtml}}
8089
<input name="_method" type="hidden" value="PRIMARY">
8190
<input name="id" type="hidden" value="{{.ID}}">
8291
<button class="ui primary tiny button">{{ctx.Locale.Tr "settings.primary_email"}}</button>
8392
</form>
84-
</div>
93+
{{end}}
8594
{{end}}
86-
{{end}}
87-
{{if not .IsActivated}}
88-
<div class="right floated content">
95+
{{if not .IsActivated}}
8996
<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
9097
{{$.CsrfTokenHtml}}
9198
<input name="_method" type="hidden" value="SENDACTIVATION">
@@ -96,22 +103,11 @@
96103
<button class="ui primary tiny button">{{ctx.Locale.Tr "settings.activate_email"}}</button>
97104
{{end}}
98105
</form>
99-
</div>
100-
{{end}}
101-
<div class="content tw-py-2">
102-
<strong>{{.Email}}</strong>
103-
{{if .IsPrimary}}
104-
<div class="ui primary label">{{ctx.Locale.Tr "settings.primary"}}</div>
105-
{{end}}
106-
{{if .IsActivated}}
107-
<div class="ui green label">{{ctx.Locale.Tr "settings.activated"}}</div>
108-
{{else}}
109-
<div class="ui label">{{ctx.Locale.Tr "settings.requires_activation"}}</div>
110106
{{end}}
107+
</div>
111108
</div>
112-
</div>
113-
{{end}}
114-
{{end}}
109+
{{end}}{{/* range Emails */}}
110+
{{end}}{{/* if manage_credentials */}}
115111
</div>
116112
</div>
117113
{{end}}

‎web_src/css/modules/list.css‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,6 @@
126126
cursor: pointer;
127127
}
128128

129-
.ui.list .list > .item [class*="right floated"],
130-
.ui.list > .item [class*="right floated"] {
131-
float: right;
132-
margin: 0 0 0 1em;
133-
}
134-
135129
.ui.menu .ui.list > .item,
136130
.ui.menu .ui.list .list > .item {
137131
display: list-item;

‎web_src/css/modules/menu.css‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -633,18 +633,6 @@
633633
}
634634
}
635635

636-
.ui.floated.menu {
637-
float: left;
638-
margin: 0 0.5rem 0 0;
639-
}
640-
.ui.floated.menu .item:last-child::before {
641-
display: none;
642-
}
643-
.ui.right.floated.menu {
644-
float: right;
645-
margin: 0 0 0 0.5rem;
646-
}
647-
648636
.ui.borderless.menu .item::before,
649637
.ui.borderless.menu .item .menu .item::before,
650638
.ui.menu .borderless.item::before {

0 commit comments

Comments
 (0)