Merge branch 'master' into team_mention_tribute

Author: 6543

options/locale/locale_cs-CZ.ini

@@ -1130,7 +1130,6 @@ issues.start_tracking_short=Start
 issues.start_tracking=Spustit sledování času
 issues.start_tracking_history=`započal(a) práci %s`
 issues.tracker_auto_close=Časovač se automaticky zastaví po zavření tohoto úkolu
-issues.tracking_already_started=`Již jste spustili sledování času na tomto <a href="%s">úkolu</a>!`
 issues.stop_tracking=Stop
 issues.stop_tracking_history=`ukončil(a) práci %s`
 issues.add_time=Přidat čas ručně

options/locale/locale_de-DE.ini

@@ -1114,7 +1114,6 @@ issues.start_tracking_short=Start
 issues.start_tracking=Zeiterfassung starten
 issues.start_tracking_history=hat die Zeiterfassung %s gestartet
 issues.tracker_auto_close=Der Timer wird automatisch gestoppt, wenn dieser Issue geschlossen wird
-issues.tracking_already_started=`Du hast die Zeiterfassung bereits in <a href="%s">diesem Issue</a> gestartet!`
 issues.stop_tracking=Stopp
 issues.stop_tracking_history=hat die Zeiterfassung %s angehalten
 issues.add_time=Zeit manuell hinzufügen

options/locale/locale_en-US.ini

@@ -1131,7 +1131,7 @@ issues.start_tracking_short = Start
 issues.start_tracking = Start Time Tracking
 issues.start_tracking_history = `started working %s`
 issues.tracker_auto_close = Timer will be stopped automatically when this issue gets closed
-issues.tracking_already_started = `You have already started time tracking on this <a href="%s">issue</a>!`
+issues.tracking_already_started = `You have already started time tracking on <a href="%s">another issue</a>!`
 issues.stop_tracking = Stop
 issues.stop_tracking_history = `stopped working %s`
 issues.add_time = Manually Add Time

options/locale/locale_es-ES.ini

@@ -1128,7 +1128,6 @@ issues.start_tracking_short=Iniciar
 issues.start_tracking=Inicio de seguimiento de tiempo
 issues.start_tracking_history=`ha empezado a trabajar %s`
 issues.tracker_auto_close=El temporizador se detendrá automáticamente cuando se cierre este problema
-issues.tracking_already_started='Ya has comenzado el tiempo de seguimiento en este <a href="%s">tema</a>!'
 issues.stop_tracking=Detener
 issues.stop_tracking_history=`dejó de trabajar %s`
 issues.add_time=Añadir tiempo gastado manualmente

options/locale/locale_fa-IR.ini

@@ -1027,7 +1027,6 @@ issues.start_tracking_short=آغاز
 issues.start_tracking=شروع به پیگیری زمان
 issues.start_tracking_history=`شروع به کار %s`
 issues.tracker_auto_close=زمان‌سنج به صورت خودکار متوقف میشود زمانی که مسئله بسته شود
-issues.tracking_already_started=`شما میتوانید پیگیری زمان را روی این <a href="%s"> مسئله </a> آغاز کنید!`
 issues.stop_tracking=توقف
 issues.stop_tracking_history=`توقف کار در %s`
 issues.add_time=زمان را به صورت دستی وارد کنید

options/locale/locale_fr-FR.ini

@@ -989,7 +989,6 @@ issues.start_tracking_short=Démarrer
 issues.start_tracking=Démarrer le suivi du temps
 issues.start_tracking_history=`a démarré il y a %s`
 issues.tracker_auto_close=Le suivi de temps sera automatiquement arrêté quand le ticket sera fermé
-issues.tracking_already_started=`Vous avez déjà démarré le suivi de temps pour cette <a href="%s">tâche</a>!`
 issues.stop_tracking=Arrêter
 issues.stop_tracking_history=`a fini de travaillé pour %s`
 issues.add_time=Ajouter un minuteur manuellement

options/locale/locale_hu-HU.ini

@@ -882,7 +882,6 @@ issues.tracker=Időzítő
 issues.start_tracking_short=Indítás
 issues.start_tracking=Időmérés elkezdése
 issues.start_tracking_history=`elkezdett dolgozni %s`
-issues.tracking_already_started=`Már elindította az időzítőt a <a href="%s">hibajegyhez</a>!`
 issues.stop_tracking=Leállítás
 issues.stop_tracking_history=`abbahagyta a %s`
 issues.add_time=Idő kézi hozzáadása

options/locale/locale_id-ID.ini

@@ -832,7 +832,6 @@ issues.subscribe=Berlangganan
 issues.unsubscribe=Berhenti berlangganan
 issues.start_tracking_short=Mulai
 issues.start_tracking_history=`mulai bekerja %s`
-issues.tracking_already_started=`Anda telah memulai pelacakan waktu pada <a href="%s">masalah</a> ini!`
 issues.stop_tracking=Berhenti
 issues.stop_tracking_history=`berhenti bekerja %s`
 issues.add_time_cancel=Batalkan

options/locale/locale_it-IT.ini

@@ -1094,7 +1094,6 @@ issues.start_tracking_short=Inizio
 issues.start_tracking=Avvia cronografo
 issues.start_tracking_history='ha iniziato a lavorare %s`
 issues.tracker_auto_close=Il timer verrà interrotto automaticamente una volta che il problema verrá chiuso
-issues.tracking_already_started=`Hai già avviato il cronografo su questa <a href="%s">issue</a>!`
 issues.stop_tracking=Interrompi
 issues.stop_tracking_history=`ha smesso di funzionare %s`
 issues.add_time=Aggiungi Tempo manualmente

options/locale/locale_ja-JP.ini

@@ -1130,7 +1130,6 @@ issues.start_tracking_short=開始
 issues.start_tracking=タイムトラッキングを開始
 issues.start_tracking_history=`が作業を開始 %s`
 issues.tracker_auto_close=タイマーは、この課題がクローズされると自動的に終了します
-issues.tracking_already_started=`この<a href="%s">課題</a>で既にタイムトラッキングを開始しています！`
 issues.stop_tracking=停止
 issues.stop_tracking_history=`が作業を終了 %s`
 issues.add_time=手で時間を入力

options/locale/locale_ko-KR.ini

@@ -801,7 +801,6 @@ issues.tracker=타임 트래커
 issues.start_tracking_short=시작
 issues.start_tracking=타임 트래킹 시작
 issues.start_tracking_history=`%s가 작업 시작`
-issues.tracking_already_started=`<a href="%s">이슈</a>에서 이미 타임 트래킹을 사용하고 있습니다!`
 issues.stop_tracking=중단
 issues.stop_tracking_history=`작업 중단 %s`
 issues.add_time=수동으로 시간 입력

options/locale/locale_lv-LV.ini

@@ -1107,7 +1107,6 @@ issues.start_tracking_short=Sākt
 issues.start_tracking=Uzsākt laika uzskaiti
 issues.start_tracking_history=` uzsāka darbu %s`
 issues.tracker_auto_close=Taimeris tiks automātiski apturēts, kad šī problēma tiks aizvērta
-issues.tracking_already_started=`Jums jau ir iesākta laika uzskaite pie citas <a href="%s">problēmas</a>!`
 issues.stop_tracking=Beigt
 issues.stop_tracking_history=` beidza strādāt %s`
 issues.add_time=Manuāli pievienot laiku

options/locale/locale_nl-NL.ini

@@ -1110,7 +1110,6 @@ issues.start_tracking_short=Start
 issues.start_tracking=Start tijdregistratie
 issues.start_tracking_history=`%s is begonnen`
 issues.tracker_auto_close=Timer wordt automatisch gestopt wanneer dit probleem wordt gesloten
-issues.tracking_already_started=Je houd al tijd bij voor dit <a href="%s">issue</a>!`
 issues.stop_tracking=Stop
 issues.stop_tracking_history=`gestopt met werken aan %s`
 issues.add_time=Tijd handmatig toevoegen

options/locale/locale_pl-PL.ini

@@ -1051,7 +1051,6 @@ issues.start_tracking_short=Rozpocznij
 issues.start_tracking=Rozpocznij śledzenie czasu
 issues.start_tracking_history=`rozpoczął(-ęła) pracę nad %s`
 issues.tracker_auto_close=Licznik czasu zostanie automatycznie zatrzymany w momencie zamknięcia tego zgłoszenia
-issues.tracking_already_started=`Już śledzisz czas pracy nad tym <a href="%s">zgłoszeniem</a>!`
 issues.stop_tracking=Zatrzymaj
 issues.stop_tracking_history=`zakończył(-a) pracę nad %s`
 issues.add_time=Dodaj czas ręcznie

options/locale/locale_pt-BR.ini

@@ -976,7 +976,6 @@ issues.start_tracking_short=Iniciar
 issues.start_tracking=Iniciar contador de tempo
 issues.start_tracking_history=`começou a trabalhar %s`
 issues.tracker_auto_close=Contador de tempo será parado automaticamente quando esta issue for fechada
-issues.tracking_already_started='Você já iniciou o contador de tempo para esta <a href="%s"> issue</a>!'
 issues.stop_tracking=Parar
 issues.stop_tracking_history=`parou de trabalhar %s`
 issues.add_time=Adicionar tempo manualmente

options/locale/locale_pt-PT.ini

@@ -1128,7 +1128,6 @@ issues.start_tracking_short=Iniciar
 issues.start_tracking=Iniciar contagem de tempo
 issues.start_tracking_history=`começou a trabalhar %s`
 issues.tracker_auto_close=O temporizador será parado automaticamente quando esta questão for fechada
-issues.tracking_already_started=`Já tinha iniciado a contagem de tempo para esta <a href="%s">questão</a>!`
 issues.stop_tracking=Parar
 issues.stop_tracking_history=`parou de trabalhar %s`
 issues.add_time=Adicionar tempo manualmente

options/locale/locale_ru-RU.ini

@@ -1094,7 +1094,6 @@ issues.start_tracking_short=Начать
 issues.start_tracking=Начать отслеживание времени
 issues.start_tracking_history=`начал(а) работать %s`
 issues.tracker_auto_close=Таймер будет остановлен автоматически, когда эта проблема будет закрыта
-issues.tracking_already_started=`Вы уже начали отслеживать время для этой <a href="%s">задачи</a>!`
 issues.stop_tracking=Остановить
 issues.stop_tracking_history=`перестал работать %s`
 issues.add_time=Вручную добавить время

options/locale/locale_sv-SE.ini

@@ -1071,7 +1071,6 @@ issues.start_tracking_short=Starta
 issues.start_tracking=Starta tidsredovisning
 issues.start_tracking_history=`började arbeta %s`
 issues.tracker_auto_close=Timern stoppas automatiskt när ärendet stängs
-issues.tracking_already_started=`Du har redan påbörjat tidredovisning på detta <a href="%s"> ärende</a>!`
 issues.stop_tracking=Stoppa
 issues.stop_tracking_history=`slutade arbeta %s`
 issues.add_time=Lägg till tid manuellt

options/locale/locale_tr-TR.ini

@@ -1130,7 +1130,6 @@ issues.start_tracking_short=Başlat
 issues.start_tracking=Zaman İzlemeyi Başlat
 issues.start_tracking_history=`%s çalışma başlattı`
 issues.tracker_auto_close=Bu konu kapatıldığında zamanlayıcı otomatik olarak durur
-issues.tracking_already_started=`Bu <a href="%s">konuda</a> zaten zaman takibini başlattınız!`
 issues.stop_tracking=Durdur
 issues.stop_tracking_history=`%s çalışmayı durdurdu`
 issues.add_time=El ile Zaman Ekle

options/locale/locale_uk-UA.ini

@@ -1057,7 +1057,6 @@ issues.start_tracking_short=Запустити
 issues.start_tracking=Почати відстеження часу
 issues.start_tracking_history=`почав працювати %s`
 issues.tracker_auto_close=Таймер буде автоматично зупинено, коли ця проблема буде закрита
-issues.tracking_already_started=`Ви вже почали відстежувати час для цієї <a href="%s"> проблеми</a>!`
 issues.stop_tracking=Стоп
 issues.stop_tracking_history=`перестав(-ла) працювати %s`
 issues.add_time=Вручну додати час

options/locale/locale_zh-CN.ini

@@ -1130,7 +1130,6 @@ issues.start_tracking_short=开始
 issues.start_tracking=开始时间跟踪
 issues.start_tracking_history=`开始工作 %s`
 issues.tracker_auto_close=当此工单关闭时，自动停止计时器
-issues.tracking_already_started=`你已经开始时间跟踪这个 <a href="%s">工单</a>!`
 issues.stop_tracking=停止
 issues.stop_tracking_history=`停止工作 %s`
 issues.add_time=手动添加时间

options/locale/locale_zh-TW.ini

@@ -1129,7 +1129,6 @@ issues.start_tracking_short=開始
 issues.start_tracking=開始時間追蹤
 issues.start_tracking_history=`開始工作 %s`
 issues.tracker_auto_close=當這個問題被關閉時，自動停止計時器
-issues.tracking_already_started=`您已經開始時間追蹤這個 <a href="%s">問題</a>!`
 issues.stop_tracking=停止
 issues.stop_tracking_history=`結束工作 %s`
 issues.add_time=手動新增時間

templates/explore/code.tmpl

@@ -16,10 +16,10 @@
                 <h3>
                     {{.i18n.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html }}
                 </h3>
-				<div>
+				<div class="df ac fw">
 					{{range $term := .SearchResultLanguages}}
-					<a class="ui text-label {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{AppSubUrl}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
-						<i class="color-icon" style="background-color: {{$term.Color}}"></i>
+					<a class="ui text-label df ac mr-1 my-1 {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{AppSubUrl}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
+						<i class="color-icon mr-3" style="background-color: {{$term.Color}}"></i>
 						{{$term.Language}}
 						<div class="detail">{{$term.Count}}</div>
 					</a>
@@ -31,7 +31,7 @@
                         <div class="diff-file-box diff-box file-content non-diff-file-content repo-search-result">
                             <h4 class="ui top attached normal header">
                                 <span class="file"><a rel="nofollow" href="{{EscapePound $repo.HTMLURL}}">{{$repo.FullName}}</a> - {{.Filename}}</span>
-                                <a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $repo.HTMLURL}}/src/commit/{{$result.CommitID}}/{{EscapePound .Filename}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
+                                <a class="ui basic tiny button" rel="nofollow" href="{{EscapePound $repo.HTMLURL}}/src/commit/{{$result.CommitID}}/{{EscapePound .Filename}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
                             </h4>
                             <div class="ui attached table segment">
                                 <div class="file-body file-code code-view">

templates/explore/repo_list.tmpl

@@ -38,12 +38,12 @@
 						{{end}}
 					</div>
 				</div>
-				<div class="metas">
+				<div class="metas df ac">
 					{{if .PrimaryLanguage }}
-					<span class="text grey"><i class="color-icon" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{ .PrimaryLanguage.Language }}</span>
+					<span class="text grey df ac mr-3"><i class="color-icon mr-3" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{ .PrimaryLanguage.Language }}</span>
 					{{end}}
-					<span class="text grey">{{svg "octicon-star"}} {{.NumStars}}</span>
-					<span class="text grey">{{svg "octicon-git-branch"}} {{.NumForks}}</span>
+					<span class="text grey df ac mr-3">{{svg "octicon-star" 16 "mr-3"}}{{.NumStars}}</span>
+					<span class="text grey df ac mr-3">{{svg "octicon-git-branch" 16 "mr-3"}}{{.NumForks}}</span>
 				</div>
 			</div>
 			<div class="description">

templates/repo/diff/box.tmpl

@@ -33,10 +33,10 @@
 				{{end}}
 			</div>
 		</div>
-		<ol class="diff-detail-box diff-stats detail-files hide" id="diff-files">
+		<ol class="diff-detail-box diff-stats m-0 hide" id="diff-files">
 			{{range .Diff.Files}}
 				<li>
-					<div class="diff-counter pull-right">
+					<div class="bold df ac pull-right">
 						{{if not .IsBin}}
 							{{template "repo/diff/stats" dict "file" . "root" $}}
 						{{else}}
@@ -45,31 +45,36 @@
 					</div>
 					<!-- todo finish all file status, now modify, add, delete and rename -->
 					<span class="status {{DiffTypeToStr .GetType}} poping up" data-content="{{DiffTypeToStr .GetType}}" data-variation="inverted tiny" data-position="right center">&nbsp;</span>
-					<a class="file" href="#diff-{{.Index}}">{{.Name}}</a>
+					<a class="file mono" href="#diff-{{.Index}}">{{.Name}}</a>
 				</li>
 			{{end}}
 		</ol>
 		{{range $i, $file := .Diff.Files}}
 			{{if $file.IsIncomplete}}
 				<div class="diff-file-box diff-box file-content">
 					<h4 class="ui top attached normal header rounded">
-						<div class="diff-counter ui left">
+						<a role="button" class="fold-file muted mr-2">
+							{{svg "octicon-chevron-down" 18}}
+						</a>
+						<div class="bold ui left df ac">
 							{{if not $file.IsRenamed}}
 								{{template "repo/diff/stats" dict "file" . "root" $}}
 							{{end}}
 						</div>
-						<span class="file">{{$file.Name}}</span>
-						<div>{{$.i18n.Tr "repo.diff.file_suppressed"}}</div>
-						{{if $file.IsProtected}}
-							<span class="ui right basic label">{{$.i18n.Tr "repo.diff.protected"}}</span>
-						{{end}}
-						{{if and (not $file.IsSubmodule) (not $.PageIsUncyclo)}}
-							{{if $file.IsDeleted}}
-								<a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $.BeforeSourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
-							{{else}}
-								<a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $.SourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
+						<span class="file mono">{{$file.Name}}</span>
+						<div class="diff-file-header-actions df ac">
+							<div class="text grey">{{$.i18n.Tr "repo.diff.file_suppressed"}}</div>
+							{{if $file.IsProtected}}
+								<span class="ui basic label">{{$.i18n.Tr "repo.diff.protected"}}</span>
 							{{end}}
-						{{end}}
+							{{if and (not $file.IsSubmodule) (not $.PageIsUncyclo)}}
+								{{if $file.IsDeleted}}
+									<a class="ui basic tiny button" rel="nofollow" href="{{EscapePound $.BeforeSourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
+								{{else}}
+									<a class="ui basic tiny button" rel="nofollow" href="{{EscapePound $.SourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
+								{{end}}
+							{{end}}
+						</div>
 					</h4>
 				</div>
 			{{else}}
@@ -82,21 +87,19 @@
 							{{else}}
 								{{$isImage = (call $.IsImageFileInHead $file.Name)}}
 							{{end}}
-							{{if or (not $file.IsBin) $isImage}}
-							<a role="button" class="fold-file">
+							<a role="button" class="fold-file muted mr-2">
 								{{svg "octicon-chevron-down" 18}}
 							</a>
-							{{end}}
-							<div class="diff-counter">
+							<div class="bold df ac">
 								{{if $file.IsBin}}
 									{{$.i18n.Tr "repo.diff.bin"}}
 								{{else if not $file.IsRenamed}}
 									{{template "repo/diff/stats" dict "file" . "root" $}}
 								{{end}}
 							</div>
-							<span class="file">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.i18n.Tr "repo.stored_lfs"}}){{end}}</span>
+							<span class="file mono">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.i18n.Tr "repo.stored_lfs"}}){{end}}</span>
 						</div>
-						<div class="df ac">
+						<div class="diff-file-header-actions df ac">
 							{{if $file.IsProtected}}
 								<span class="ui basic label">{{$.i18n.Tr "repo.diff.protected"}}</span>
 							{{end}}
@@ -111,8 +114,8 @@
 					</h4>
 					<div class="diff-file-body ui attached unstackable table segment">
 						{{if ne $file.Type 4}}
-							<div class="file-body file-code has-context-menu code-diff {{if $.IsSplitStyle}}code-diff-split{{else}}code-diff-unified{{end}}">
-								<table class="chroma">
+							<div class="file-body file-code has-context-menu{{if not $isImage}} code-diff{{end}}{{if $.IsSplitStyle}} code-diff-split{{else}} code-diff-unified{{end}}{{if $isImage}} py-4{{end}}">
+								<table class="chroma{{if $isImage}} w-100{{end}}">
 									<tbody>
 										{{if $isImage}}
 											{{template "repo/diff/image_diff" dict "file" . "root" $}}
@@ -130,7 +133,6 @@
 					</div>
 				</div>
 			{{end}}
-		<br>
 		{{end}}
 
 		{{if .Diff.IsIncomplete}}

templates/repo/diff/image_diff.tmpl

@@ -2,22 +2,22 @@
 {{ $imagePathNew := printf "%s/%s" .root.RawPath (EscapePound .file.Name)  }}
 
 <tr>
- 	<th class="halfwidth center">
+ 	<th class="halfwidth center pl-3 pr-2">
  		{{.root.i18n.Tr "repo.diff.file_before"}}
  	</th>
- 	<th class="halfwidth center">
+ 	<th class="halfwidth center pl-2 pr-3">
  		{{.root.i18n.Tr "repo.diff.file_after"}}
  	</th>
 </tr>
 <tr>
- 	<td class="halfwidth center">
+ 	<td class="halfwidth center pl-3 pr-2">
  	    {{if or .file.IsDeleted (not .file.IsCreated)}}
             <a href="{{$imagePathOld}}" target="_blank">
                 <img src="{{$imagePathOld}}" class="border red" />
             </a>
  	    {{end}}
  	</td>
- 	<td class="halfwidth center">
+ 	<td class="halfwidth center pl-2 pr-3">
  	    {{if or .file.IsCreated (not .file.IsDeleted)}}
 			<a href="{{$imagePathNew}}" target="_blank">
 				<img src="{{$imagePathNew}}" class="border green" />
@@ -29,7 +29,7 @@
 {{ $imageInfoHead := (call .root.ImageInfo .file.Name) }}
 {{if or $imageInfoBase $imageInfoHead }}
 <tr>
- 	<td class="halfwidth center">
+ 	<td class="halfwidth center pl-3 pr-2">
  	{{if $imageInfoBase }}
  		{{ $classWidth := "" }}
  		{{ $classHeight := "" }}
@@ -52,7 +52,7 @@
  	    {{.root.i18n.Tr "repo.diff.file_byte_size"}}: <span class="text {{$classByteSize}}">{{FileSize $imageInfoBase.ByteSize}}</span>
  	{{end}}
  	</td>
- 	<td class="halfwidth center">
+ 	<td class="halfwidth center pl-2 pr-3">
  	{{if $imageInfoHead }}
  		{{ $classWidth := "" }}
  		{{ $classHeight := "" }}