finish transforming to v2

5 files changed, 40 insertions, 45 deletions

diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl
index 1ed7408e6a..dd84ce416c 100644
--- a/templates/repo/issue/labels.tmpl
+++ b/templates/repo/issue/labels.tmpl
@@ -54,7 +54,7 @@
 {{if .IsRepositoryAdmin}}
 <div class="ui small basic delete modal">
   <div class="ui icon header">
-     <i class="trash icon"></i>
+    <i class="trash icon"></i>
     {{.i18n.Tr "repo.issues.label_deletion"}}
   </div>
   <div class="content">
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl
index 8fd4d1bb2c..383e54dd8f 100644
--- a/templates/repo/issue/milestone_new.tmpl
+++ b/templates/repo/issue/milestone_new.tmpl
@@ -1,7 +1,7 @@
 {{template "base/head" .}}
 <div class="repository new milestone">
 	{{template "repo/header" .}}
-	<div class="ui middle page grid body">
+	<div class="ui container">
 		<div class="navbar">
 			{{template "repo/issue/navbar" .}}
 			{{if and .IsRepositoryAdmin .PageIsEditMilestone}}
@@ -11,7 +11,6 @@
 			{{end}}
 		</div>
 		<div class="ui divider"></div>
-		<div class="sixteen wide column page grid">
 			<h2 class="ui dividing header">
 				{{if .PageIsEditMilestone}}
 			  {{.i18n.Tr "repo.milestones.edit"}}
@@ -21,13 +20,9 @@
 			  <div class="sub header">{{.i18n.Tr "repo.milestones.new_subheader"}}</div>
 			  {{end}}
 			</h2>
+      {{template "base/alert" .}}
 			<form class="ui form grid" action="{{.Link}}" method="post">
         {{.CsrfTokenHtml}}
-        {{if .Flash}}
-				<div class="sixteen wide column">
-        	{{template "base/alert" .}}
-        </div>
-        {{end}}
 				<div class="eleven wide column">
 					<div class="field {{if .Err_Title}}error{{end}}">
 						<label>{{.i18n.Tr "repo.milestones.title"}}</label>
@@ -38,7 +33,7 @@
 						<textarea name="content">{{.content}}</textarea>
 					</div>
 				</div>
-				<div class="three wide column">
+				<div class="four wide column">
 					<div class="field {{if .Err_Deadline}}error{{end}}">
 						<label>
 							{{.i18n.Tr "repo.milestones.due_date"}}
@@ -50,21 +45,24 @@
 						<input class="milestone datepicker" data-lang="{{.DateLang}}" data-start-date="{{.deadline}}">
 					</div>
 				</div>
-				<div class="ui divider"></div>
-				{{if .PageIsEditMilestone}}
-				<button class="ui right green button">
-					{{.i18n.Tr "repo.milestones.modify"}}
-				</button>
-				<a class="ui right blue basic button" href="{{.RepoLink}}/milestones">
-					{{.i18n.Tr "repo.milestones.cancel"}}
-				</a>
-				{{else}}
-				<button class="ui right green button">
-					{{.i18n.Tr "repo.milestones.create"}}
-				</button>
-				{{end}}
+				<div class="ui container">
+					<div class="ui divider"></div>
+					<div class="ui right">
+						{{if .PageIsEditMilestone}}
+						<a class="ui blue basic button" href="{{.RepoLink}}/milestones">
+							{{.i18n.Tr "repo.milestones.cancel"}}
+						</a>
+						<button class="ui green button">
+							{{.i18n.Tr "repo.milestones.modify"}}
+						</button>
+						{{else}}
+						<button class="ui green button">
+							{{.i18n.Tr "repo.milestones.create"}}
+						</button>
+						{{end}}
+					</div>
+				</div>
 			</form>
-		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 8bbc2c3666..fe1210c181 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -96,7 +96,7 @@
 {{if .IsRepositoryAdmin}}
 <div class="ui small basic delete modal">
   <div class="ui icon header">
-     <i class="trash icon"></i>
+    <i class="trash icon"></i>
     {{.i18n.Tr "repo.milestones.deletion"}}
   </div>
   <div class="content">
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index bed39a73cc..5d66fa2fad 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -1,16 +1,17 @@
 {{template "base/head" .}}
 <div class="repository settings">
 	{{template "repo/header" .}}
-	<div class="ui page grid">
+	<div class="ui container">
+	<div class="ui grid">
 		{{template "repo/settings/navbar" .}}
 		<div class="twelve wide column content">
 			{{template "base/alert" .}}
-			<h4 class="ui top attached header">
+			<h3 class="ui top attached header">
 			  {{.i18n.Tr "repo.settings.deploy_keys"}}
 			  <div class="ui right">
 			  	<div id="add-deploy-key" class="ui blue tiny button">{{.i18n.Tr "repo.settings.add_deploy_key"}}</div>
 			  </div>
-			</h4>
+			</h3>
 			<div class="ui attached segment">
 				{{if .Deploykeys}}
 				<div class="ui key list">
@@ -31,7 +32,7 @@
 								<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="three wide column">
+						<div class="two wide column">
 							<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
 								{{$.i18n.Tr "settings.delete_key"}}
 							</button>
@@ -67,30 +68,25 @@
 			</div>
 		</div>
 	</div>
+	</div>
 </div>
 
-<div class="ui basic delete modal">
-  <div class="header">
+<div class="ui small basic delete modal">
+  <div class="ui icon header">
+    <i class="trash icon"></i>
     {{.i18n.Tr "repo.settings.deploy_key_deletion"}}
   </div>
   <div class="content">
-    <div class="image">
-      <i class="trash icon"></i>
-    </div>
-    <div class="description">
-      <p>{{.i18n.Tr "repo.settings.deploy_key_deletion_desc"}}</p>
-    </div>
+    <p>{{.i18n.Tr "repo.settings.deploy_key_deletion_desc"}}</p>
   </div>
   <div class="actions">
-    <div class="two fluid ui inverted buttons">
-      <div class="ui red basic inverted button">
-        <i class="remove icon"></i>
-        {{.i18n.Tr "modal.no"}}
-      </div>
-      <div class="ui green basic inverted positive button">
-        <i class="checkmark icon"></i>
-        {{.i18n.Tr "modal.yes"}}
-      </div>
+    <div class="ui red basic inverted cancel button">
+      <i class="remove icon"></i>
+      {{.i18n.Tr "modal.no"}}
+    </div>
+    <div class="ui green basic inverted ok button">
+      <i class="checkmark icon"></i>
+      {{.i18n.Tr "modal.yes"}}
     </div>
   </div>
 </div>
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
index cf27980fb8..1001c3a250 100644
--- a/templates/repo/settings/navbar.tmpl
+++ b/templates/repo/settings/navbar.tmpl
@@ -1,5 +1,6 @@
 <div class="four wide column">
 	<div class="ui vertical menu">
+		<div class="header item">{{.i18n.Tr "repo.settings"}}</div>
 	  <a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.RepoLink}}/settings">
 	    {{.i18n.Tr "repo.settings.options"}}
 	  </a>