diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl
index b4edbb077..b70e6b1d0 100644
--- a/templates/org/settings/navbar.tmpl
+++ b/templates/org/settings/navbar.tmpl
@@ -1,5 +1,5 @@
<div class="four wide column">
- <div class="ui vertical menu">
+ <div class="ui fluid vertical menu">
<div class="header item">{{.i18n.Tr "org.settings"}}</div>
<a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.OrgLink}}/settings">
{{.i18n.Tr "org.settings.options"}}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 40c3ed99c..783e025eb 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -1,115 +1,117 @@
{{template "base/head" .}}
<div class="page-content organization new team">
{{template "org/header" .}}
- <div class="ui middle very relaxed page grid">
- <div class="column">
- <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">
- {{.CsrfTokenHtml}}
- <h3 class="ui top attached header">
- {{if .PageIsOrgTeamsNew}}{{.i18n.Tr "org.create_new_team"}}{{else}}{{.i18n.Tr "org.teams.settings"}}{{end}}
- </h3>
- <div class="ui attached segment">
- {{template "base/alert" .}}
- <div class="required field {{if .Err_TeamName}}error{{end}}">
- <label for="team_name">{{.i18n.Tr "org.team_name"}}</label>
- {{if eq .Team.LowerName "owners"}}
- <input type="hidden" name="team_name" value="{{.Team.Name}}">
+ <div class="ui container">
+ <div class="ui grid">
+ <div class="column">
+ <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">
+ {{.CsrfTokenHtml}}
+ <h3 class="ui top attached header">
+ {{if .PageIsOrgTeamsNew}}{{.i18n.Tr "org.create_new_team"}}{{else}}{{.i18n.Tr "org.teams.settings"}}{{end}}
+ </h3>
+ <div class="ui attached segment">
+ {{template "base/alert" .}}
+ <div class="required field {{if .Err_TeamName}}error{{end}}">
+ <label for="team_name">{{.i18n.Tr "org.team_name"}}</label>
+ {{if eq .Team.LowerName "owners"}}
+ <input type="hidden" name="team_name" value="{{.Team.Name}}">
+ {{end}}
+ <input id="team_name" name="team_name" value="{{.Team.Name}}" required {{if eq .Team.LowerName "owners"}}disabled{{end}} autofocus>
+ <span class="help">{{.i18n.Tr "org.team_name_helper"}}</span>
+ </div>
+ <div class="field {{if .Err_Description}}error{{end}}">
+ <label for="description">{{.i18n.Tr "org.team_desc"}}</label>
+ <input id="description" name="description" value="{{.Team.Description}}">
+ <span class="help">{{.i18n.Tr "org.team_desc_helper"}}</span>
+ </div>
+ {{if not (eq .Team.LowerName "owners")}}
+ <div class="grouped field">
+ <label>{{.i18n.Tr "org.team_access_desc"}}</label>
+ <br>
+ <div class="field">
+ <div class="ui radio checkbox">
+ <input type="radio" name="repo_access" value="specific" {{if not .Team.IncludesAllRepositories}}checked{{end}}>
+ <label>{{.i18n.Tr "org.teams.specific_repositories"}}</label>
+ <span class="help">{{.i18n.Tr "org.teams.specific_repositories_helper" | Str2html}}</span>
+ </div>
+ </div>
+ <div class="field">
+ <div class="ui radio checkbox">
+ <input type="radio" name="repo_access" value="all" {{if .Team.IncludesAllRepositories}}checked{{end}}>
+ <label>{{.i18n.Tr "org.teams.all_repositories"}}</label>
+ <span class="help">{{.i18n.Tr "org.teams.all_repositories_helper" | Str2html}}</span>
+ </div>
+ </div>
+
+ <div class="field">
+ <div class="ui checkbox">
+ <label for="can_create_org_repo">{{.i18n.Tr "org.teams.can_create_org_repo"}}</label>
+ <input id="can_create_org_repo" name="can_create_org_repo" type="checkbox" {{if .Team.CanCreateOrgRepo}}checked{{end}}>
+ <span class="help">{{.i18n.Tr "org.teams.can_create_org_repo_helper"}}</span>
+ </div>
+ </div>
+ </div>
+ <div class="grouped field">
+ <label>{{.i18n.Tr "org.team_permission_desc"}}</label>
+ <br>
+ <div class="field">
+ <div class="ui radio checkbox">
+ <input type="radio" name="permission" value="read" {{if or .PageIsOrgTeamsNew (eq .Team.Authorize 1)}}checked{{end}}>
+ <label>{{.i18n.Tr "org.teams.read_access"}}</label>
+ <span class="help">{{.i18n.Tr "org.teams.read_access_helper"}}</span>
+ </div>
+ </div>
+ <div class="field">
+ <div class="ui radio checkbox">
+ <input type="radio" name="permission" value="write" {{if eq .Team.Authorize 2}}checked{{end}}>
+ <label>{{.i18n.Tr "org.teams.write_access"}}</label>
+ <span class="help">{{.i18n.Tr "org.teams.write_access_helper"}}</span>
+ </div>
+ </div>
+ <div class="field">
+ <div class="ui radio checkbox">
+ <input type="radio" name="permission" value="admin" {{if eq .Team.Authorize 3}}checked{{end}}>
+ <label>{{.i18n.Tr "org.teams.admin_access"}}</label>
+ <span class="help">{{.i18n.Tr "org.teams.admin_access_helper"}}</span>
+ </div>
+ </div>
+ </div>
+ <div class="ui divider"></div>
+
+ <div class="team-units required grouped field"{{if eq .Team.Authorize 3}} style="display: none"{{end}}>
+ <label>{{.i18n.Tr "org.team_unit_desc"}}</label>
+ <br>
+ {{range $t, $unit := $.Units}}
+ {{if $unit.Type.UnitGlobalDisabled}}
+ <div class="field tooltip" data-content="{{$.i18n.Tr "repo.unit_disabled"}}">
+ {{else}}
+ <div class="field">
+ {{end}}
+ <div class="ui toggle checkbox">
+ <input type="checkbox" class="hidden" name="units" value="{{$unit.Type.Value}}"{{if or (eq $.Team.ID 0) ($.Team.UnitEnabled $unit.Type)}} checked{{end}}>
+ <label>{{$.i18n.Tr $unit.NameKey}}{{if $unit.Type.UnitGlobalDisabled}} {{$.i18n.Tr "org.team_unit_disabled"}}{{end}}</label>
+ <span class="help">{{$.i18n.Tr $unit.DescKey}}</span>
+ </div>
+ </div>
+ {{end}}
+ </div>
+ <div class="ui divider"></div>
{{end}}
- <input id="team_name" name="team_name" value="{{.Team.Name}}" required {{if eq .Team.LowerName "owners"}}disabled{{end}} autofocus>
- <span class="help">{{.i18n.Tr "org.team_name_helper"}}</span>
- </div>
- <div class="field {{if .Err_Description}}error{{end}}">
- <label for="description">{{.i18n.Tr "org.team_desc"}}</label>
- <input id="description" name="description" value="{{.Team.Description}}">
- <span class="help">{{.i18n.Tr "org.team_desc_helper"}}</span>
- </div>
- {{if not (eq .Team.LowerName "owners")}}
- <div class="grouped field">
- <label>{{.i18n.Tr "org.team_access_desc"}}</label>
- <br>
- <div class="field">
- <div class="ui radio checkbox">
- <input type="radio" name="repo_access" value="specific" {{if not .Team.IncludesAllRepositories}}checked{{end}}>
- <label>{{.i18n.Tr "org.teams.specific_repositories"}}</label>
- <span class="help">{{.i18n.Tr "org.teams.specific_repositories_helper" | Str2html}}</span>
- </div>
- </div>
- <div class="field">
- <div class="ui radio checkbox">
- <input type="radio" name="repo_access" value="all" {{if .Team.IncludesAllRepositories}}checked{{end}}>
- <label>{{.i18n.Tr "org.teams.all_repositories"}}</label>
- <span class="help">{{.i18n.Tr "org.teams.all_repositories_helper" | Str2html}}</span>
- </div>
- </div>
- <div class="field">
- <div class="ui checkbox">
- <label for="can_create_org_repo">{{.i18n.Tr "org.teams.can_create_org_repo"}}</label>
- <input id="can_create_org_repo" name="can_create_org_repo" type="checkbox" {{if .Team.CanCreateOrgRepo}}checked{{end}}>
- <span class="help">{{.i18n.Tr "org.teams.can_create_org_repo_helper"}}</span>
- </div>
- </div>
- </div>
- <div class="grouped field">
- <label>{{.i18n.Tr "org.team_permission_desc"}}</label>
- <br>
- <div class="field">
- <div class="ui radio checkbox">
- <input type="radio" name="permission" value="read" {{if or .PageIsOrgTeamsNew (eq .Team.Authorize 1)}}checked{{end}}>
- <label>{{.i18n.Tr "org.teams.read_access"}}</label>
- <span class="help">{{.i18n.Tr "org.teams.read_access_helper"}}</span>
- </div>
- </div>
- <div class="field">
- <div class="ui radio checkbox">
- <input type="radio" name="permission" value="write" {{if eq .Team.Authorize 2}}checked{{end}}>
- <label>{{.i18n.Tr "org.teams.write_access"}}</label>
- <span class="help">{{.i18n.Tr "org.teams.write_access_helper"}}</span>
- </div>
- </div>
- <div class="field">
- <div class="ui radio checkbox">
- <input type="radio" name="permission" value="admin" {{if eq .Team.Authorize 3}}checked{{end}}>
- <label>{{.i18n.Tr "org.teams.admin_access"}}</label>
- <span class="help">{{.i18n.Tr "org.teams.admin_access_helper"}}</span>
- </div>
- </div>
- </div>
- <div class="ui divider"></div>
-
- <div class="team-units required grouped field"{{if eq .Team.Authorize 3}} style="display: none"{{end}}>
- <label>{{.i18n.Tr "org.team_unit_desc"}}</label>
- <br>
- {{range $t, $unit := $.Units}}
- {{if $unit.Type.UnitGlobalDisabled}}
- <div class="field tooltip" data-content="{{$.i18n.Tr "repo.unit_disabled"}}">
+ <div class="field">
+ {{if .PageIsOrgTeamsNew}}
+ <button class="ui green button">{{.i18n.Tr "org.create_team"}}</button>
+ <a class="ui button" href="{{.OrgLink}}/teams">{{.i18n.Tr "cancel"}}</a>
{{else}}
- <div class="field">
- {{end}}
- <div class="ui toggle checkbox">
- <input type="checkbox" class="hidden" name="units" value="{{$unit.Type.Value}}"{{if or (eq $.Team.ID 0) ($.Team.UnitEnabled $unit.Type)}} checked{{end}}>
- <label>{{$.i18n.Tr $unit.NameKey}}{{if $unit.Type.UnitGlobalDisabled}} {{$.i18n.Tr "org.team_unit_disabled"}}{{end}}</label>
- <span class="help">{{$.i18n.Tr $unit.DescKey}}</span>
- </div>
- </div>
+ <button class="ui green button">{{.i18n.Tr "org.teams.update_settings"}}</button>
+ {{if not (eq .Team.LowerName "owners")}}
+ <button class="ui red button delete-button" data-url="{{.OrgLink}}/teams/{{.team_name | PathEscape}}/delete">{{.i18n.Tr "org.teams.delete_team"}}</button>
+ {{end}}
{{end}}
</div>
- <div class="ui divider"></div>
- {{end}}
-
- <div class="field">
- {{if .PageIsOrgTeamsNew}}
- <button class="ui green button">{{.i18n.Tr "org.create_team"}}</button>
- <a class="ui button" href="{{.OrgLink}}/teams">{{.i18n.Tr "cancel"}}</a>
- {{else}}
- <button class="ui green button">{{.i18n.Tr "org.teams.update_settings"}}</button>
- {{if not (eq .Team.LowerName "owners")}}
- <button class="ui red button delete-button" data-url="{{.OrgLink}}/teams/{{.team_name | PathEscape}}/delete">{{.i18n.Tr "org.teams.delete_team"}}</button>
- {{end}}
- {{end}}
</div>
- </div>
- </form>
+ </form>
+ </div>
</div>
</div>
</div>
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index e0f8b98fa..ed1e879a7 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -2575,8 +2575,6 @@
.settings {
.content {
- margin-top: 2px;
-
> .header,
.segment {
box-shadow: 0 1px 2px 0 var(--color-box-header);