Skip to content

Commit e8f1f09

Browse files
KN4CK3Rlunny
KN4CK3R
and
lunny
authored
Fixed org styles. (#17807)
Co-authored-by: Lunny Xiao <[email protected]>
1 parent edd37e9 commit e8f1f09

File tree

3 files changed

+97
-97
lines changed

3 files changed

+97
-97
lines changed

‎templates/org/settings/navbar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="four wide column">
2-
<div class="ui vertical menu">
2+
<div class="ui fluid vertical menu">
33
<div class="header item">{{.i18n.Tr "org.settings"}}</div>
44
<a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.OrgLink}}/settings">
55
{{.i18n.Tr "org.settings.options"}}

‎templates/org/team/new.tmpl

Lines changed: 96 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,117 @@
11
{{template "base/head" .}}
22
<div class="page-content organization new team">
33
{{template "org/header" .}}
4-
<div class="ui middle very relaxed page grid">
5-
<div class="column">
6-
<form class="ui form" action="{{if .PageIsOrgTeamsNew}}{{.OrgLink}}/teams/new{{else}}{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}/edit{{end}}" data-delete-url="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}/delete" method="post">
7-
{{.CsrfTokenHtml}}
8-
<h3 class="ui top attached header">
9-
{{if .PageIsOrgTeamsNew}}{{.i18n.Tr "org.create_new_team"}}{{else}}{{.i18n.Tr "org.teams.settings"}}{{end}}
10-
</h3>
11-
<div class="ui attached segment">
12-
{{template "base/alert" .}}
13-
<div class="required field {{if .Err_TeamName}}error{{end}}">
14-
<label for="team_name">{{.i18n.Tr "org.team_name"}}</label>
15-
{{if eq .Team.LowerName "owners"}}
16-
<input type="hidden" name="team_name" value="{{.Team.Name}}">
17-
{{end}}
18-
<input id="team_name" name="team_name" value="{{.Team.Name}}" required {{if eq .Team.LowerName "owners"}}disabled{{end}} autofocus>
19-
<span class="help">{{.i18n.Tr "org.team_name_helper"}}</span>
20-
</div>
21-
<div class="field {{if .Err_Description}}error{{end}}">
22-
<label for="description">{{.i18n.Tr "org.team_desc"}}</label>
23-
<input id="description" name="description" value="{{.Team.Description}}">
24-
<span class="help">{{.i18n.Tr "org.team_desc_helper"}}</span>
25-
</div>
26-
{{if not (eq .Team.LowerName "owners")}}
27-
<div class="grouped field">
28-
<label>{{.i18n.Tr "org.team_access_desc"}}</label>
29-
<br>
30-
<div class="field">
31-
<div class="ui radio checkbox">
32-
<input type="radio" name="repo_access" value="specific" {{if not .Team.IncludesAllRepositories}}checked{{end}}>
33-
<label>{{.i18n.Tr "org.teams.specific_repositories"}}</label>
34-
<span class="help">{{.i18n.Tr "org.teams.specific_repositories_helper" | Str2html}}</span>
4+
<div class="ui container">
5+
<div class="ui grid">
6+
<div class="column">
7+
<form class="ui form" action="{{if .PageIsOrgTeamsNew}}{{.OrgLink}}/teams/new{{else}}{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}/edit{{end}}" data-delete-url="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}/delete" method="post">
8+
{{.CsrfTokenHtml}}
9+
<h3 class="ui top attached header">
10+
{{if .PageIsOrgTeamsNew}}{{.i18n.Tr "org.create_new_team"}}{{else}}{{.i18n.Tr "org.teams.settings"}}{{end}}
11+
</h3>
12+
<div class="ui attached segment">
13+
{{template "base/alert" .}}
14+
<div class="required field {{if .Err_TeamName}}error{{end}}">
15+
<label for="team_name">{{.i18n.Tr "org.team_name"}}</label>
16+
{{if eq .Team.LowerName "owners"}}
17+
<input type="hidden" name="team_name" value="{{.Team.Name}}">
18+
{{end}}
19+
<input id="team_name" name="team_name" value="{{.Team.Name}}" required {{if eq .Team.LowerName "owners"}}disabled{{end}} autofocus>
20+
<span class="help">{{.i18n.Tr "org.team_name_helper"}}</span>
21+
</div>
22+
<div class="field {{if .Err_Description}}error{{end}}">
23+
<label for="description">{{.i18n.Tr "org.team_desc"}}</label>
24+
<input id="description" name="description" value="{{.Team.Description}}">
25+
<span class="help">{{.i18n.Tr "org.team_desc_helper"}}</span>
26+
</div>
27+
{{if not (eq .Team.LowerName "owners")}}
28+
<div class="grouped field">
29+
<label>{{.i18n.Tr "org.team_access_desc"}}</label>
30+
<br>
31+
<div class="field">
32+
<div class="ui radio checkbox">
33+
<input type="radio" name="repo_access" value="specific" {{if not .Team.IncludesAllRepositories}}checked{{end}}>
34+
<label>{{.i18n.Tr "org.teams.specific_repositories"}}</label>
35+
<span class="help">{{.i18n.Tr "org.teams.specific_repositories_helper" | Str2html}}</span>
36+
</div>
3537
</div>
36-
</div>
37-
<div class="field">
38-
<div class="ui radio checkbox">
39-
<input type="radio" name="repo_access" value="all" {{if .Team.IncludesAllRepositories}}checked{{end}}>
40-
<label>{{.i18n.Tr "org.teams.all_repositories"}}</label>
41-
<span class="help">{{.i18n.Tr "org.teams.all_repositories_helper" | Str2html}}</span>
38+
<div class="field">
39+
<div class="ui radio checkbox">
40+
<input type="radio" name="repo_access" value="all" {{if .Team.IncludesAllRepositories}}checked{{end}}>
41+
<label>{{.i18n.Tr "org.teams.all_repositories"}}</label>
42+
<span class="help">{{.i18n.Tr "org.teams.all_repositories_helper" | Str2html}}</span>
43+
</div>
4244
</div>
43-
</div>
4445

45-
<div class="field">
46-
<div class="ui checkbox">
47-
<label for="can_create_org_repo">{{.i18n.Tr "org.teams.can_create_org_repo"}}</label>
48-
<input id="can_create_org_repo" name="can_create_org_repo" type="checkbox" {{if .Team.CanCreateOrgRepo}}checked{{end}}>
49-
<span class="help">{{.i18n.Tr "org.teams.can_create_org_repo_helper"}}</span>
46+
<div class="field">
47+
<div class="ui checkbox">
48+
<label for="can_create_org_repo">{{.i18n.Tr "org.teams.can_create_org_repo"}}</label>
49+
<input id="can_create_org_repo" name="can_create_org_repo" type="checkbox" {{if .Team.CanCreateOrgRepo}}checked{{end}}>
50+
<span class="help">{{.i18n.Tr "org.teams.can_create_org_repo_helper"}}</span>
51+
</div>
5052
</div>
5153
</div>
52-
</div>
53-
<div class="grouped field">
54-
<label>{{.i18n.Tr "org.team_permission_desc"}}</label>
55-
<br>
56-
<div class="field">
57-
<div class="ui radio checkbox">
58-
<input type="radio" name="permission" value="read" {{if or .PageIsOrgTeamsNew (eq .Team.Authorize 1)}}checked{{end}}>
59-
<label>{{.i18n.Tr "org.teams.read_access"}}</label>
60-
<span class="help">{{.i18n.Tr "org.teams.read_access_helper"}}</span>
54+
<div class="grouped field">
55+
<label>{{.i18n.Tr "org.team_permission_desc"}}</label>
56+
<br>
57+
<div class="field">
58+
<div class="ui radio checkbox">
59+
<input type="radio" name="permission" value="read" {{if or .PageIsOrgTeamsNew (eq .Team.Authorize 1)}}checked{{end}}>
60+
<label>{{.i18n.Tr "org.teams.read_access"}}</label>
61+
<span class="help">{{.i18n.Tr "org.teams.read_access_helper"}}</span>
62+
</div>
6163
</div>
62-
</div>
63-
<div class="field">
64-
<div class="ui radio checkbox">
65-
<input type="radio" name="permission" value="write" {{if eq .Team.Authorize 2}}checked{{end}}>
66-
<label>{{.i18n.Tr "org.teams.write_access"}}</label>
67-
<span class="help">{{.i18n.Tr "org.teams.write_access_helper"}}</span>
64+
<div class="field">
65+
<div class="ui radio checkbox">
66+
<input type="radio" name="permission" value="write" {{if eq .Team.Authorize 2}}checked{{end}}>
67+
<label>{{.i18n.Tr "org.teams.write_access"}}</label>
68+
<span class="help">{{.i18n.Tr "org.teams.write_access_helper"}}</span>
69+
</div>
6870
</div>
69-
</div>
70-
<div class="field">
71-
<div class="ui radio checkbox">
72-
<input type="radio" name="permission" value="admin" {{if eq .Team.Authorize 3}}checked{{end}}>
73-
<label>{{.i18n.Tr "org.teams.admin_access"}}</label>
74-
<span class="help">{{.i18n.Tr "org.teams.admin_access_helper"}}</span>
71+
<div class="field">
72+
<div class="ui radio checkbox">
73+
<input type="radio" name="permission" value="admin" {{if eq .Team.Authorize 3}}checked{{end}}>
74+
<label>{{.i18n.Tr "org.teams.admin_access"}}</label>
75+
<span class="help">{{.i18n.Tr "org.teams.admin_access_helper"}}</span>
76+
</div>
7577
</div>
7678
</div>
77-
</div>
78-
<div class="ui divider"></div>
79+
<div class="ui divider"></div>
7980

80-
<div class="team-units required grouped field"{{if eq .Team.Authorize 3}} style="display: none"{{end}}>
81-
<label>{{.i18n.Tr "org.team_unit_desc"}}</label>
82-
<br>
83-
{{range $t, $unit := $.Units}}
84-
{{if $unit.Type.UnitGlobalDisabled}}
85-
<div class="field tooltip" data-content="{{$.i18n.Tr "repo.unit_disabled"}}">
86-
{{else}}
87-
<div class="field">
88-
{{end}}
89-
<div class="ui toggle checkbox">
90-
<input type="checkbox" class="hidden" name="units" value="{{$unit.Type.Value}}"{{if or (eq $.Team.ID 0) ($.Team.UnitEnabled $unit.Type)}} checked{{end}}>
91-
<label>{{$.i18n.Tr $unit.NameKey}}{{if $unit.Type.UnitGlobalDisabled}} {{$.i18n.Tr "org.team_unit_disabled"}}{{end}}</label>
92-
<span class="help">{{$.i18n.Tr $unit.DescKey}}</span>
81+
<div class="team-units required grouped field"{{if eq .Team.Authorize 3}} style="display: none"{{end}}>
82+
<label>{{.i18n.Tr "org.team_unit_desc"}}</label>
83+
<br>
84+
{{range $t, $unit := $.Units}}
85+
{{if $unit.Type.UnitGlobalDisabled}}
86+
<div class="field tooltip" data-content="{{$.i18n.Tr "repo.unit_disabled"}}">
87+
{{else}}
88+
<div class="field">
89+
{{end}}
90+
<div class="ui toggle checkbox">
91+
<input type="checkbox" class="hidden" name="units" value="{{$unit.Type.Value}}"{{if or (eq $.Team.ID 0) ($.Team.UnitEnabled $unit.Type)}} checked{{end}}>
92+
<label>{{$.i18n.Tr $unit.NameKey}}{{if $unit.Type.UnitGlobalDisabled}} {{$.i18n.Tr "org.team_unit_disabled"}}{{end}}</label>
93+
<span class="help">{{$.i18n.Tr $unit.DescKey}}</span>
94+
</div>
9395
</div>
96+
{{end}}
9497
</div>
95-
{{end}}
96-
</div>
97-
<div class="ui divider"></div>
98-
{{end}}
98+
<div class="ui divider"></div>
99+
{{end}}
99100

100-
<div class="field">
101-
{{if .PageIsOrgTeamsNew}}
102-
<button class="ui green button">{{.i18n.Tr "org.create_team"}}</button>
103-
<a class="ui button" href="{{.OrgLink}}/teams">{{.i18n.Tr "cancel"}}</a>
104-
{{else}}
105-
<button class="ui green button">{{.i18n.Tr "org.teams.update_settings"}}</button>
106-
{{if not (eq .Team.LowerName "owners")}}
107-
<button class="ui red button delete-button" data-url="{{.OrgLink}}/teams/{{.team_name | PathEscape}}/delete">{{.i18n.Tr "org.teams.delete_team"}}</button>
101+
<div class="field">
102+
{{if .PageIsOrgTeamsNew}}
103+
<button class="ui green button">{{.i18n.Tr "org.create_team"}}</button>
104+
<a class="ui button" href="{{.OrgLink}}/teams">{{.i18n.Tr "cancel"}}</a>
105+
{{else}}
106+
<button class="ui green button">{{.i18n.Tr "org.teams.update_settings"}}</button>
107+
{{if not (eq .Team.LowerName "owners")}}
108+
<button class="ui red button delete-button" data-url="{{.OrgLink}}/teams/{{.team_name | PathEscape}}/delete">{{.i18n.Tr "org.teams.delete_team"}}</button>
109+
{{end}}
108110
{{end}}
109-
{{end}}
111+
</div>
110112
</div>
111-
</div>
112-
</form>
113+
</form>
114+
</div>
113115
</div>
114116
</div>
115117
</div>

‎web_src/less/_repository.less

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2575,8 +2575,6 @@
25752575

25762576
.settings {
25772577
.content {
2578-
margin-top: 2px;
2579-
25802578
> .header,
25812579
.segment {
25822580
box-shadow: 0 1px 2px 0 var(--color-box-header);

0 commit comments

Comments
 (0)