diff options
| -rw-r--r-- | templates/admin/auth/edit.tmpl | 4 | ||||
| -rw-r--r-- | templates/admin/auth/source/ldap.tmpl | 2 | ||||
| -rw-r--r-- | templates/admin/auth/source/oauth.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/settings/security/accountlinks.tmpl | 18 | ||||
| -rw-r--r-- | web_src/css/base.css | 12 |
5 files changed, 13 insertions, 25 deletions
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index b81e7b5ff3..af9d4c4bc5 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -133,7 +133,7 @@ </div> <div class="field"> <label>{{.locale.Tr "admin.auths.map_group_to_team"}}</label> - <input name="group_team_map" value="{{$cfg.GroupTeamMap}}" placeholder='e.g. {"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'> + <textarea name="group_team_map" rows="5" placeholder='e.g. {"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>{{$cfg.GroupTeamMap}}</textarea> </div> <div class="ui checkbox"> <label>{{.locale.Tr "admin.auths.map_group_to_team_removal"}}</label> @@ -360,7 +360,7 @@ </div> <div class="field"> <label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team"}}</label> - <input name="oauth2_group_team_map" value="{{$cfg.GroupTeamMap}}" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'> + <textarea name="oauth2_group_team_map" rows="5" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>{{$cfg.GroupTeamMap}}</textarea> </div> <div class="ui checkbox"> <label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team_removal"}}</label> diff --git a/templates/admin/auth/source/ldap.tmpl b/templates/admin/auth/source/ldap.tmpl index 909cf77047..26eef890b2 100644 --- a/templates/admin/auth/source/ldap.tmpl +++ b/templates/admin/auth/source/ldap.tmpl @@ -106,7 +106,7 @@ </div> <div class="field"> <label>{{.locale.Tr "admin.auths.map_group_to_team"}}</label> - <input name="group_team_map" value="{{.group_team_map}}" placeholder='e.g. {"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'> + <textarea name="group_team_map" rows="5" placeholder='e.g. {"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>{{.group_team_map}}</textarea> </div> <div class="ui checkbox"> <label>{{.locale.Tr "admin.auths.map_group_to_team_removal"}}</label> diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl index 277ebdb011..a0c5a87d0f 100644 --- a/templates/admin/auth/source/oauth.tmpl +++ b/templates/admin/auth/source/oauth.tmpl @@ -100,7 +100,7 @@ </div> <div class="field"> <label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team"}}</label> - <input name="oauth2_group_team_map" value="{{.oauth2_group_team_map}}" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'> + <textarea name="oauth2_group_team_map" rows="5" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>{{.oauth2_group_team_map}}</textarea> </div> <div class="ui checkbox"> <label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team_removal"}}</label> diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl index 29fbe6832c..b9f8af34c7 100644 --- a/templates/user/settings/security/accountlinks.tmpl +++ b/templates/user/settings/security/accountlinks.tmpl @@ -25,16 +25,16 @@ </div> {{if .AccountLinks}} {{range $loginSource, $provider := .AccountLinks}} - <div class="item"> - <div class="right floated content"> - <button class="ui red tiny button delete-button" data-modal-id="delete-account-link" data-url="{{AppSubUrl}}/user/settings/security/account_link" data-id="{{$loginSource.ID}}"> - {{$.locale.Tr "settings.delete_key"}} - </button> - </div> - <div class="content"> - <strong>{{$provider}}</strong> - {{if $loginSource.IsActive}}<span class="text red">{{$.locale.Tr "repo.settings.active"}}</span>{{end}} + <div class="item gt-df gt-ac"> + <div class="gt-f1"> + <span data-tooltip-content="{{$provider}}"> + {{$loginSource.Name}} + {{if $loginSource.IsActive}}<span class="text primary">{{$.locale.Tr "repo.settings.active"}}</span>{{end}} + </span> </div> + <button class="ui red tiny button delete-button" data-modal-id="delete-account-link" data-url="{{AppSubUrl}}/user/settings/security/account_link" data-id="{{$loginSource.ID}}"> + {{$.locale.Tr "settings.delete_key"}} + </button> </div> {{end}} {{end}} diff --git a/web_src/css/base.css b/web_src/css/base.css index d143b20f81..49bdfed1b7 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -952,18 +952,6 @@ img.ui.avatar, .following.bar #navbar { width: 100vw; min-height: 52px; - padding: 0 16px; -} - -@media (max-width: 767px) { - .following.bar #navbar { - padding-left: 4px; - padding-right: 0; - } -} - -.following.bar #navbar .brand { - margin: 0; } .following.bar #navbar .dropdown .avatar { |