Fossil SCM
Make sure copy buttons stay on the same line as the linked text.
Commit
678018d3abb4ec7daee95bb95aa475ad28e97cad1ea1f47fd951bed4eacc182e
Parent
eb960935fc8c957…
2 files changed
+3
+4
+3
| --- src/default_css.txt | ||
| +++ src/default_css.txt | ||
| @@ -787,5 +787,8 @@ | ||
| 787 | 787 | .copy-button-flipped { |
| 788 | 788 | //Note: .16em is suitable for element grouping. |
| 789 | 789 | margin-left: .16em; |
| 790 | 790 | margin-right: 0; |
| 791 | 791 | } |
| 792 | +.nobr { | |
| 793 | + white-space: nowrap; | |
| 794 | +} | |
| 792 | 795 |
| --- src/default_css.txt | |
| +++ src/default_css.txt | |
| @@ -787,5 +787,8 @@ | |
| 787 | .copy-button-flipped { |
| 788 | //Note: .16em is suitable for element grouping. |
| 789 | margin-left: .16em; |
| 790 | margin-right: 0; |
| 791 | } |
| 792 |
| --- src/default_css.txt | |
| +++ src/default_css.txt | |
| @@ -787,5 +787,8 @@ | |
| 787 | .copy-button-flipped { |
| 788 | //Note: .16em is suitable for element grouping. |
| 789 | margin-left: .16em; |
| 790 | margin-right: 0; |
| 791 | } |
| 792 | .nobr { |
| 793 | white-space: nowrap; |
| 794 | } |
| 795 |
+4
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -403,18 +403,20 @@ | ||
| 403 | 403 | va_end(ap); |
| 404 | 404 | if( cchLength==1 ) cchLength = hash_digits(0); |
| 405 | 405 | else if( cchLength==2 ) cchLength = hash_digits(1); |
| 406 | 406 | if( !bFlipped ){ |
| 407 | 407 | const char *zBtnFmt = |
| 408 | + "<span class=\"nobr\">" | |
| 408 | 409 | "<span " |
| 409 | 410 | "class=\"copy-button\" " |
| 410 | 411 | "id=\"copy-%h\" " |
| 411 | 412 | "data-copytarget=\"%h\" " |
| 412 | 413 | "data-copylength=\"%d\">" |
| 413 | 414 | "</span>" |
| 414 | 415 | "<span id=\"%h\">" |
| 415 | 416 | "%s" |
| 417 | + "</span>" | |
| 416 | 418 | "</span>"; |
| 417 | 419 | if( bOutputCGI ){ |
| 418 | 420 | cgi_printf( |
| 419 | 421 | zBtnFmt/*works-like:"%h%h%d%h%s"*/, |
| 420 | 422 | zTargetId,zTargetId,cchLength,zTargetId,zText); |
| @@ -423,18 +425,20 @@ | ||
| 423 | 425 | zBtnFmt/*works-like:"%h%h%d%h%s"*/, |
| 424 | 426 | zTargetId,zTargetId,cchLength,zTargetId,zText); |
| 425 | 427 | } |
| 426 | 428 | }else{ |
| 427 | 429 | const char *zBtnFmt = |
| 430 | + "<span class=\"nobr\">" | |
| 428 | 431 | "<span id=\"%h\">" |
| 429 | 432 | "%s" |
| 430 | 433 | "</span>" |
| 431 | 434 | "<span " |
| 432 | 435 | "class=\"copy-button copy-button-flipped\" " |
| 433 | 436 | "id=\"copy-%h\" " |
| 434 | 437 | "data-copytarget=\"%h\" " |
| 435 | 438 | "data-copylength=\"%d\">" |
| 439 | + "</span>" | |
| 436 | 440 | "</span>"; |
| 437 | 441 | if( bOutputCGI ){ |
| 438 | 442 | cgi_printf( |
| 439 | 443 | zBtnFmt/*works-like:"%h%s%h%h%d"*/, |
| 440 | 444 | zTargetId,zText,zTargetId,zTargetId,cchLength); |
| 441 | 445 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -403,18 +403,20 @@ | |
| 403 | va_end(ap); |
| 404 | if( cchLength==1 ) cchLength = hash_digits(0); |
| 405 | else if( cchLength==2 ) cchLength = hash_digits(1); |
| 406 | if( !bFlipped ){ |
| 407 | const char *zBtnFmt = |
| 408 | "<span " |
| 409 | "class=\"copy-button\" " |
| 410 | "id=\"copy-%h\" " |
| 411 | "data-copytarget=\"%h\" " |
| 412 | "data-copylength=\"%d\">" |
| 413 | "</span>" |
| 414 | "<span id=\"%h\">" |
| 415 | "%s" |
| 416 | "</span>"; |
| 417 | if( bOutputCGI ){ |
| 418 | cgi_printf( |
| 419 | zBtnFmt/*works-like:"%h%h%d%h%s"*/, |
| 420 | zTargetId,zTargetId,cchLength,zTargetId,zText); |
| @@ -423,18 +425,20 @@ | |
| 423 | zBtnFmt/*works-like:"%h%h%d%h%s"*/, |
| 424 | zTargetId,zTargetId,cchLength,zTargetId,zText); |
| 425 | } |
| 426 | }else{ |
| 427 | const char *zBtnFmt = |
| 428 | "<span id=\"%h\">" |
| 429 | "%s" |
| 430 | "</span>" |
| 431 | "<span " |
| 432 | "class=\"copy-button copy-button-flipped\" " |
| 433 | "id=\"copy-%h\" " |
| 434 | "data-copytarget=\"%h\" " |
| 435 | "data-copylength=\"%d\">" |
| 436 | "</span>"; |
| 437 | if( bOutputCGI ){ |
| 438 | cgi_printf( |
| 439 | zBtnFmt/*works-like:"%h%s%h%h%d"*/, |
| 440 | zTargetId,zText,zTargetId,zTargetId,cchLength); |
| 441 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -403,18 +403,20 @@ | |
| 403 | va_end(ap); |
| 404 | if( cchLength==1 ) cchLength = hash_digits(0); |
| 405 | else if( cchLength==2 ) cchLength = hash_digits(1); |
| 406 | if( !bFlipped ){ |
| 407 | const char *zBtnFmt = |
| 408 | "<span class=\"nobr\">" |
| 409 | "<span " |
| 410 | "class=\"copy-button\" " |
| 411 | "id=\"copy-%h\" " |
| 412 | "data-copytarget=\"%h\" " |
| 413 | "data-copylength=\"%d\">" |
| 414 | "</span>" |
| 415 | "<span id=\"%h\">" |
| 416 | "%s" |
| 417 | "</span>" |
| 418 | "</span>"; |
| 419 | if( bOutputCGI ){ |
| 420 | cgi_printf( |
| 421 | zBtnFmt/*works-like:"%h%h%d%h%s"*/, |
| 422 | zTargetId,zTargetId,cchLength,zTargetId,zText); |
| @@ -423,18 +425,20 @@ | |
| 425 | zBtnFmt/*works-like:"%h%h%d%h%s"*/, |
| 426 | zTargetId,zTargetId,cchLength,zTargetId,zText); |
| 427 | } |
| 428 | }else{ |
| 429 | const char *zBtnFmt = |
| 430 | "<span class=\"nobr\">" |
| 431 | "<span id=\"%h\">" |
| 432 | "%s" |
| 433 | "</span>" |
| 434 | "<span " |
| 435 | "class=\"copy-button copy-button-flipped\" " |
| 436 | "id=\"copy-%h\" " |
| 437 | "data-copytarget=\"%h\" " |
| 438 | "data-copylength=\"%d\">" |
| 439 | "</span>" |
| 440 | "</span>"; |
| 441 | if( bOutputCGI ){ |
| 442 | cgi_printf( |
| 443 | zBtnFmt/*works-like:"%h%s%h%h%d"*/, |
| 444 | zTargetId,zText,zTargetId,zTargetId,cchLength); |
| 445 |