back round 0 view raw
appview/pages: simplify styles in all pulls page #379

merged
opened by
oppi.li 4 months ago targeting master from push-pvpnsqvvzuky
Signed-off-by: oppiliappan me@oppi.li
options
unified split
Changed files
+33 -49
appview
pages
templates
repo
pulls
pulls.html
+33 -49
appview/pages/templates/repo/pulls/pulls.html
···

       83
       83
        
                               {{ template "repo/fragments/time" .Created }}

     

       84
       84
        
                           </span>

     

       85
       85
        
       

     

       86
       86
       +
       

     

       87
       87
       +
                           {{ $latestRound := .LastRoundNumber }}

     

       88
       88
       +
                           {{ $lastSubmission := index .Submissions $latestRound }}

     

       89
       89
       +
       

     

       86
       90
        
                           <span class="before:content-['·']">

     

       87
       87
       -
                               targeting

     

       88
       88
       -
                               <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       89
       89
       -
                                 {{ .TargetBranch }}

     

       90
       90
       -
                               </span>

     

       91
       91
       -
                           </span>

     

       92
       92
       -
                           {{ if not .IsPatchBased }}

     

       93
       93
       -
                           from

     

       94
       94
       -
                           <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       95
       95
       -
                               {{ if .IsForkBased }}

     

       96
       96
       -
                                 {{ if .PullSource.Repo }}

     

       97
       97
       -
                                 <a href="/{{ $owner }}/{{ .PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .PullSource.Repo.Name }}</a>:

     

       98
       98
       -
                                 {{- else -}}

     

       99
       99
       -
                                 <span class="italic">[deleted fork]</span>

     

       100
       100
       -
                                 {{- end -}}

     

       101
       101
       -
                               {{- end -}}

     

       102
       102
       -
                               {{- .PullSource.Branch -}}

     

       91
       91
       +
                             {{ $commentCount := len $lastSubmission.Comments }}

     

       92
       92
       +
                             {{ $s := "s" }}

     

       93
       93
       +
                             {{ if eq $commentCount 1 }}

     

       94
       94
       +
                               {{ $s = "" }}

     

       95
       95
       +
                             {{ end }}

     

       96
       96
       +
       

     

       97
       97
       +
                             {{ len $lastSubmission.Comments}} comment{{$s}}

     

       103
       98
        
                           </span>

     

       104
       104
       -
                           {{ end }}

     

       105
       105
       -
                           <span class="before:content-['·']">

     

       106
       106
       -
                               {{ $latestRound := .LastRoundNumber }}

     

       107
       107
       -
                               {{ $lastSubmission := index .Submissions $latestRound }}

     

       108
       108
       -
                               round

     

       109
       109
       -
                               <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       110
       110
       -
                                 #{{ .LastRoundNumber }}

     

       111
       111
       -
                               </span>

     

       112
       112
       -
                               {{ $commentCount := len $lastSubmission.Comments }}

     

       113
       113
       -
                               {{ $s := "s" }}

     

       114
       114
       -
                               {{ if eq $commentCount 1 }}

     

       115
       115
       -
                                 {{ $s = "" }}

     

       116
       116
       -
                               {{ end }}

     

       117
       99
        
       

     

       118
       118
       -
                               {{ if eq $commentCount 0 }}

     

       119
       119
       -
                                 awaiting comments

     

       120
       120
       -
                               {{ else }}

     

       121
       121
       -
                                 recieved {{ len $lastSubmission.Comments}} comment{{$s}}

     

       122
       122
       -
                               {{ end }}

     

       100
       100
       +
                           <span class="before:content-['·']">

     

       101
       101
       +
                             round

     

       102
       102
       +
                             <span class="font-mono">

     

       103
       103
       +
                               #{{ .LastRoundNumber }}

     

       104
       104
       +
                             </span>

     

       123
       105
        
                           </span>

     

       124
       106
        
                       </p>

     

       125
       107
        
                     </div>

     

       126
       108
        
                     {{ if .StackId }}

     

       127
       109
        
                       {{ $otherPulls := index $.Stacks .StackId }}

     

       128
       128
       -
                       <details class="bg-white dark:bg-gray-800 group">

     

       129
       129
       -
                         <summary class="pb-4 px-6 text-xs list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">

     

       130
       130
       -
                           {{ $s := "s" }}

     

       131
       131
       -
                           {{ if eq (len $otherPulls) 1 }}

     

       132
       132
       -
                             {{ $s = "" }}

     

       133
       133
       -
                           {{ end }}

     

       134
       134
       -
                           <div class="group-open:hidden flex items-center gap-2">

     

       135
       135
       -
                             {{ i "chevrons-up-down" "w-4 h-4" }} expand {{ len $otherPulls }} pull{{$s}} in this stack

     

       136
       136
       -
                           </div>

     

       137
       137
       -
                           <div class="hidden group-open:flex items-center gap-2">

     

       138
       138
       -
                             {{ i "chevrons-down-up" "w-4 h-4" }} hide {{ len $otherPulls }} pull{{$s}} in this stack

     

       139
       139
       -
                           </div>

     

       140
       140
       -
                         </summary>

     

       141
       141
       -
                         {{ block "pullList" (list $otherPulls $) }} {{ end }}

     

       142
       142
       -
                       </details>

     

       110
       110
       +
                       {{ if gt (len $otherPulls) 0 }}

     

       111
       111
       +
                         <details class="bg-white dark:bg-gray-800 group">

     

       112
       112
       +
                           <summary class="pb-4 px-6 text-xs list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">

     

       113
       113
       +
                             {{ $s := "s" }}

     

       114
       114
       +
                             {{ if eq (len $otherPulls) 1 }}

     

       115
       115
       +
                               {{ $s = "" }}

     

       116
       116
       +
                             {{ end }}

     

       117
       117
       +
                             <div class="group-open:hidden flex items-center gap-2">

     

       118
       118
       +
                               {{ i "chevrons-up-down" "w-4 h-4" }} expand {{ len $otherPulls }} pull{{$s}} in this stack

     

       119
       119
       +
                             </div>

     

       120
       120
       +
                             <div class="hidden group-open:flex items-center gap-2">

     

       121
       121
       +
                               {{ i "chevrons-down-up" "w-4 h-4" }} hide {{ len $otherPulls }} pull{{$s}} in this stack

     

       122
       122
       +
                             </div>

     

       123
       123
       +
                           </summary>

     

       124
       124
       +
                           {{ block "pullList" (list $otherPulls $) }} {{ end }}

     

       125
       125
       +
                         </details>

     

       126
       126
       +
                       {{ end }}

     

       143
       127
        
                     {{ end }}

     

       144
       128
        
                   </div>

     

       145
       129
        
               {{ end }}