user/setting: improve UI

6 files changed, 18 insertions, 19 deletions

diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 954b4e78..7ce1f6f7 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings">
+<div class="user settings applications">
 	<div class="ui container">
 		<div class="ui grid">
 			{{template "user/settings/navbar" .}}
@@ -24,14 +24,14 @@
 								<div class="one wide column">
 									<i class="fa fa-send fa-2x left"></i>
 								</div>
-								<div class="eleven wide column">
+								<div class="ten wide column">
 									<strong>{{.Name}}</strong>
 									<div class="activity meta">
 										<i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> —  <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
 									</div>
 								</div>
-								<div class="two wide column">
-									<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
+								<div class="right floated button">
+									<button class="ui red tiny basic button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
 										{{$.i18n.Tr "settings.delete_token"}}
 									</button>
 								</div>
diff --git a/templates/user/settings/avatar.tmpl b/templates/user/settings/avatar.tmpl
index ee1300c8..1d7a0e4d 100644
--- a/templates/user/settings/avatar.tmpl
+++ b/templates/user/settings/avatar.tmpl
@@ -9,7 +9,6 @@
 					{{.i18n.Tr "settings.avatar"}}
 				</h4>
 				<div class="ui attached segment">
-
 					<form class="ui form" action="{{.Link}}" method="post" enctype="multipart/form-data">
 						{{.CSRFTokenHTML}}
 						{{if not DisableGravatar}}
@@ -19,7 +18,7 @@
 								<label>{{.i18n.Tr "settings.lookup_avatar_by_mail"}}</label>
 							</div>
 						</div>
-						<div class="field {{if .Err_Gravatar}}error{{end}}">
+						<div class="inline box field {{if .Err_Gravatar}}error{{end}}">
 							<label for="gravatar">Avatar {{.i18n.Tr "email"}}</label>
 							<input id="gravatar" name="gravatar" value="{{.LoggedUser.AvatarEmail}}" />
 						</div>
@@ -32,7 +31,7 @@
 							</div>
 						</div>
 
-						<div class="inline field">
+						<div class="inline box field">
 							<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
 							<input name="avatar" type="file" >
 						</div>
diff --git a/templates/user/settings/email.tmpl b/templates/user/settings/email.tmpl
index 7d840bc5..72cdc4f8 100644
--- a/templates/user/settings/email.tmpl
+++ b/templates/user/settings/email.tmpl
@@ -17,20 +17,20 @@
 							<div class="item ui grid">
 								<div class="column">
 									<strong>{{.Email}}</strong>
-									{{if .IsPrimary}}<span class="text red">{{$.i18n.Tr "settings.primary"}}</span>{{end}}
+									{{if .IsPrimary}}<span class="ui green tiny primary label">{{$.i18n.Tr "settings.primary"}}</span>{{end}}
 									{{if not .IsPrimary}}
 										<div class="ui right">
-											<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
+											<button class="ui red tiny basic button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
 												{{$.i18n.Tr "settings.delete_key"}}
 											</button>
 										</div>
 										{{if .IsActivated}}
-											<div class="ui right">
+											<div class="right floated">
 												<form action="{{$.Link}}" method="post">
 													{{$.CSRFTokenHTML}}
 													<input name="_method" type="hidden" value="PRIMARY">
 													<input name="id" type="hidden" value="{{.ID}}">
-													<button class="ui green tiny button">{{$.i18n.Tr "settings.primary_email"}}</button>
+													<button class="ui green tiny basic button">{{$.i18n.Tr "settings.primary_email"}}</button>
 												</form>
 											</div>
 										{{end}}
diff --git a/templates/user/settings/organizations.tmpl b/templates/user/settings/organizations.tmpl
index 53ae6bb3..fc4551cc 100644
--- a/templates/user/settings/organizations.tmpl
+++ b/templates/user/settings/organizations.tmpl
@@ -16,14 +16,14 @@
 						<div class="ui middle aligned divided list">
 							{{range .Orgs}}
 							<div class="item">
-								<div class="right floated content">
-									<button class="ui red tiny button inline text-thin delete-button" data-url="{{$.Link}}/leave" data-id="{{.ID}}">
+								<div class="right floated">
+									<button class="ui red tiny basic button inline delete-button" data-url="{{$.Link}}/leave" data-id="{{.ID}}">
 										{{$.i18n.Tr "org.members.leave"}}
 									</button>
 								</div>
 								<img class="ui mini image" src="{{.RelAvatarLink}}">
 								<div class="content">
-										<a href="{{.HomeLink}}">{{.Name}}</a>
+									<a href="{{.HomeLink}}">{{.Name}}</a>
 								</div>
 							</div>
 							{{end}}
diff --git a/templates/user/settings/repositories.tmpl b/templates/user/settings/repositories.tmpl
index 1537f449..6500d149 100644
--- a/templates/user/settings/repositories.tmpl
+++ b/templates/user/settings/repositories.tmpl
@@ -29,8 +29,8 @@
 								</a> 
 								<span class="ui text light grey">{{.Size | FileSize}}</span>
 								{{if not (eq .OwnerID $.LoggedUserID)}}
-								<div class="right floated content">
-									<a class="ui red tiny button inline text-thin delete-button" href="" data-url="{{$.Link}}/leave" data-id="{{.ID}}">{{$.i18n.Tr "settings.repos.leave"}}</a>
+								<div class="right floated">
+									<a class="ui red tiny basic button inline delete-button" href="" data-url="{{$.Link}}/leave" data-id="{{.ID}}">{{$.i18n.Tr "settings.repos.leave"}}</a>
 								</div>
 								{{end}}
 							</div>
diff --git a/templates/user/settings/sshkeys.tmpl b/templates/user/settings/sshkeys.tmpl
index 52748750..32a3eece 100644
--- a/templates/user/settings/sshkeys.tmpl
+++ b/templates/user/settings/sshkeys.tmpl
@@ -24,7 +24,7 @@
 								<div class="one wide column">
 									<i class="mega-octicon octicon-key left"></i>
 								</div>
-								<div class="eleven wide column">
+								<div class="ten wide column">
 									<strong>{{.Name}}</strong>
 									<div class="print meta">
 										{{.Fingerprint}}
@@ -33,8 +33,8 @@
 										<i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> —  <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
 									</div>
 								</div>
-								<div class="two wide column">
-									<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
+								<div class="right floated button">
+									<button class="ui red tiny basic button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
 										{{$.i18n.Tr "settings.delete_key"}}
 									</button>
 								</div>