Signed by hanna SSH key fingerprint: SHA256:4g9cWhkAAw8gwqhJUcVbSnGEvdGwklW+1Aa/fMUu59k
assets/base.css +3 −0 crates/web/src/issues.rs +6 −6 crates/web/src/pulls.rs +3 −3 assets/base.css +3 −0 Expand 370 hidden lines 371 371 . label-list . entry-row { 372 372 padding : 0.85rem 0 ; 373 373 } 374 + . label-list . entry-row : first-child { 375 + padding-top : 0 ; 376 + } 374 377 . label-list . entry-row-body { 375 378 display : flex ; 376 379 flex-direction : row ;
crates/web/src/issues.rs +6 −6 Expand 267 hidden lines 268 268 } 269 269 @if issue. locked ( ) { ( locked_note ( can_write) ) } 270 270 @if can_write || ( is_author && !issue. locked ( ) ) { 271 - ( comment_box ( & issue, & csrf, kind, can_write) ) 271 + ( comment_box ( & issue, & csrf, can_write) ) 272 272 } 273 273 } 274 274 aside class="issue-side" { Expand 91 hidden lines 366 366 } 367 367 368 368 369 - pub ( crate ) fn state_button ( issue : & Issue , csrf : & str , kind : Kind ) -> Markup { 369 + pub ( crate ) fn state_button ( issue : & Issue , csrf : & str ) -> Markup { 370 370 let ( target, label) = match issue. state { 371 - IssueState :: Open => ( "closed" , format ! ( "Close {}" , kind. noun) ) , 372 - IssueState :: Closed => ( "open" , format ! ( "Reopen {}" , kind. noun) ) , 371 + IssueState :: Open => ( "closed" , "Close" ) , 372 + IssueState :: Closed => ( "open" , "Reopen" ) , 373 373 } ; 374 374 html ! { 375 375 form method="post" action=( format ! ( "/issue/{}/state" , issue. id) ) class="inline-form" { Expand 16 hidden lines 392 392 393 393 394 394 395 - pub ( crate ) fn comment_box ( issue : & Issue , csrf : & str , kind : Kind , can_write : bool ) -> Markup { 395 + pub ( crate ) fn comment_box ( issue : & Issue , csrf : & str , can_write : bool ) -> Markup { 396 396 let comment_form = format ! ( "comment-{}" , issue. id) ; 397 397 html ! { 398 398 div class="card comment-form" { Expand 2 hidden lines 401 401 textarea name="body" rows="4" placeholder="Leave a comment (markdown)" required { } 402 402 } 403 403 div class="comment-actions" { 404 - ( state_button ( issue, csrf, kind) ) 404 + ( state_button ( issue, csrf) ) 405 405 @if can_write { ( lock_button ( issue, csrf) ) } 406 406 button class="btn btn-primary inline-btn" type ="submit" form=( comment_form) { "Comment" } 407 407 }
crates/web/src/pulls.rs +3 −3 Expand 24 hidden lines 25 25 use crate :: diff; 26 26 use crate :: error:: { AppError , AppResult } ; 27 27 use crate :: issues:: { 28 - Kind , access_for, assignee_form, comment_box, comment_card, deps_section, edit_issue_form, 29 - issue_url, label_form, locked_note, repo_of_issue, respond_redirect, state_badge, username, 28 + access_for, assignee_form, comment_box, comment_card, deps_section, edit_issue_form, issue_url, 29 + label_form, locked_note, repo_of_issue, respond_redirect, state_badge, username, 30 30 } ; 31 31 use crate :: layout:: page; 32 32 use crate :: pages:: build_chrome; Expand 134 hidden lines 167 167 ( merge_panel ( & issue, & pr, mergeable, blocked, & csrf) ) 168 168 @if issue. locked ( ) { ( locked_note ( can_write) ) } 169 169 @if can_write || ( is_author && !issue. locked ( ) ) { 170 - ( comment_box ( & issue, & csrf, Kind :: pulls ( ) , can_write) ) 170 + ( comment_box ( & issue, & csrf, can_write) ) 171 171 } 172 172 } 173 173 aside class="issue-side" {