Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch no-nobr Excluding Merge-Ins
This is equivalent to a diff from ee33b951a4 to 46fba0f1c6
|
2012-11-17
| ||
| 19:07 | Avoid the <nobr> tag in generated HTML. check-in: 8ea929ca55 user: drh tags: trunk | |
|
2012-11-16
| ||
| 07:50 | remove unused variable check-in: 6fb750d77c user: jan.nijtmans tags: trunk | |
| 07:33 | The <nobr> tag is not valid xhtml. All div.logo, div.status, div.section and div.divider parts of the html pages are not supposed to be line-wrapped. Some skins do that though the <nobr> tag, other do it by putting "white-space: nowrap;" in css. This commit changes the skins to do the same using css in all skins. With this chan... Closed-Leaf check-in: 46fba0f1c6 user: jan.nijtmans tags: no-nobr | |
|
2012-11-15
| ||
| 20:43 | The annotator follows name changes. check-in: ee33b951a4 user: drh tags: trunk | |
| 20:25 | Enhance the finfo page to show renames and/or where the file was added. check-in: dac6424e66 user: drh tags: trunk | |
Changes to src/skins.c.
42 42 @ text-align: center; 43 43 @ /* vertical-align: bottom;*/ 44 44 @ font-size: 2em; 45 45 @ font-weight: bold; 46 46 @ background-color: #707070; 47 47 @ color: #ffffff; 48 48 @ min-width: 200px; 49 +@ white-space: nowrap; 49 50 @ } 50 51 @ 51 52 @ /* The page title centered at the top of each page */ 52 53 @ div.title { 53 54 @ display: table-cell; 54 55 @ font-size: 1.5em; 55 56 @ font-weight: bold; ................................................................................ 65 66 @ display: table-cell; 66 67 @ text-align: right; 67 68 @ vertical-align: bottom; 68 69 @ color: #404040; 69 70 @ font-size: 0.8em; 70 71 @ font-weight: bold; 71 72 @ min-width: 200px; 73 +@ white-space: nowrap; 72 74 @ } 73 75 @ 74 76 @ /* The header across the top of the page */ 75 77 @ div.header { 76 78 @ display: table; 77 79 @ width: 100%; 78 80 @ } ................................................................................ 123 125 @ margin-bottom: 0px; 124 126 @ margin-top: 1em; 125 127 @ padding: 1px 1px 1px 1px; 126 128 @ font-size: 1.2em; 127 129 @ font-weight: bold; 128 130 @ background-color: #404040; 129 131 @ color: white; 132 +@ white-space: nowrap; 130 133 @ } 131 134 @ 132 135 @ /* The "Date" that occurs on the left hand side of timelines */ 133 136 @ div.divider { 134 137 @ background: #a0a0a0; 135 138 @ border: 2px #505050 solid; 136 139 @ font-size: 1em; font-weight: normal; 137 140 @ padding: .25em; 138 141 @ margin: .2em 0 .2em 0; 139 142 @ float: left; 140 143 @ clear: left; 144 +@ white-space: nowrap; 141 145 @ } 142 146 @ 143 147 @ /* The footer at the very bottom of the page */ 144 148 @ div.footer { 145 149 @ font-size: 0.8em; 146 150 @ margin-top: 12px; 147 151 @ padding: 5px 10px 5px 10px; ................................................................................ 164 168 @ href="$home/timeline.rss"> 165 169 @ <link rel="stylesheet" href="$home/style.css?blackwhite" type="text/css" 166 170 @ media="screen"> 167 171 @ </head> 168 172 @ <body> 169 173 @ <div class="header"> 170 174 @ <div class="title"><small>$<project_name></small><br />$<title></div> 171 -@ <div class="status"><nobr><th1> 175 +@ <div class="status"><th1> 172 176 @ if {[info exists login]} { 173 177 @ puts "Logged in as $login" 174 178 @ } else { 175 179 @ puts "Not logged in" 176 180 @ } 177 -@ </th1></nobr></div> 181 +@ </th1></div> 178 182 @ </div> 179 183 @ <div class="mainmenu"> 180 184 @ <th1> 181 185 @ html "<a href=''$home$index_page''>Home</a>\n" 182 186 @ if {[anycap jor]} { 183 187 @ html "<a href=''$home/timeline''>Timeline</a>\n" 184 188 @ } ................................................................................ 233 237 @ div.logo { 234 238 @ display: inline; 235 239 @ text-align: center; 236 240 @ vertical-align: bottom; 237 241 @ font-weight: bold; 238 242 @ font-size: 2.5em; 239 243 @ color: #a09048; 244 +@ white-space: nowrap; 240 245 @ } 241 246 @ 242 247 @ /* The page title centered at the top of each page */ 243 248 @ div.title { 244 249 @ display: table-cell; 245 250 @ font-size: 2em; 246 251 @ font-weight: bold; ................................................................................ 256 261 @ display: table-cell; 257 262 @ text-align: right; 258 263 @ vertical-align: bottom; 259 264 @ color: #a09048; 260 265 @ padding: 5px 5px 0 0; 261 266 @ font-size: 0.8em; 262 267 @ font-weight: bold; 268 +@ white-space: nowrap; 263 269 @ } 264 270 @ 265 271 @ /* The header across the top of the page */ 266 272 @ div.header { 267 273 @ display: table; 268 274 @ width: 100%; 269 275 @ } ................................................................................ 314 320 @ margin-bottom: 0px; 315 321 @ margin-top: 1em; 316 322 @ padding: 3px 3px 0 3px; 317 323 @ font-size: 1.2em; 318 324 @ font-weight: bold; 319 325 @ background-color: #a09048; 320 326 @ color: white; 327 +@ white-space: nowrap; 321 328 @ } 322 329 @ 323 330 @ /* The "Date" that occurs on the left hand side of timelines */ 324 331 @ div.divider { 325 332 @ background: #e1d498; 326 333 @ border: 2px #a09048 solid; 327 334 @ font-size: 1em; font-weight: normal; 328 335 @ padding: .25em; 329 336 @ margin: .2em 0 .2em 0; 330 337 @ float: left; 331 338 @ clear: left; 339 +@ white-space: nowrap; 332 340 @ } 333 341 @ 334 342 @ /* The footer at the very bottom of the page */ 335 343 @ div.footer { 336 344 @ font-size: 0.8em; 337 345 @ margin-top: 12px; 338 346 @ padding: 5px 10px 5px 10px; ................................................................................ 368 376 @ <link rel="stylesheet" href="$home/style.css?tan" type="text/css" 369 377 @ media="screen"> 370 378 @ </head> 371 379 @ <body> 372 380 @ <div class="header"> 373 381 @ <div class="title">$<title></div> 374 382 @ <div class="status"> 375 -@ <div class="logo"><nobr>$<project_name></nobr></div><br/> 376 -@ <nobr><th1> 383 +@ <div class="logo">$<project_name></div><br/> 384 +@ <th1> 377 385 @ if {[info exists login]} { 378 386 @ puts "Logged in as $login" 379 387 @ } else { 380 388 @ puts "Not logged in" 381 389 @ } 382 -@ </th1></nobr></div> 390 +@ </th1></div> 383 391 @ </div> 384 392 @ <div class="mainmenu"> 385 393 @ <th1> 386 394 @ html "<a href=''$home$index_page''>Home</a>\n" 387 395 @ if {[anycap jor]} { 388 396 @ html "<a href=''$home/timeline''>Timeline</a>\n" 389 397 @ } ................................................................................ 446 454 @ /* The project logo in the upper left-hand corner of each page */ 447 455 @ div.logo { 448 456 @ display: table-cell; 449 457 @ text-align: left; 450 458 @ vertical-align: bottom; 451 459 @ font-weight: bold; 452 460 @ color: #333; 461 +@ white-space: nowrap; 453 462 @ } 454 463 @ 455 464 @ /* The page title centered at the top of each page */ 456 465 @ div.title { 457 466 @ display: table-cell; 458 467 @ font-size: 2em; 459 468 @ font-weight: bold; ................................................................................ 469 478 @ padding-right: 10px; 470 479 @ text-align: right; 471 480 @ vertical-align: bottom; 472 481 @ padding-bottom: 5px; 473 482 @ color: #333; 474 483 @ font-size: 0.8em; 475 484 @ font-weight: bold; 485 +@ white-space: nowrap; 476 486 @ } 477 487 @ 478 488 @ /* The header across the top of the page */ 479 489 @ div.header { 480 490 @ margin:10px 0px 10px 0px; 481 491 @ padding:1px 0px 0px 20px; 482 492 @ border-style:solid; ................................................................................ 555 565 @ font-size: 1.2em; 556 566 @ font-weight: bold; 557 567 @ border-style:solid; 558 568 @ border-color:#999; 559 569 @ border-width:1px 0px; 560 570 @ background-color: #eee; 561 571 @ color: #333; 572 +@ white-space: nowrap; 562 573 @ } 563 574 @ 564 575 @ /* The "Date" that occurs on the left hand side of timelines */ 565 576 @ div.divider { 566 577 @ background: #eee; 567 578 @ border: 2px #999 solid; 568 579 @ font-size: 1em; font-weight: normal; 569 580 @ padding: .25em; 570 581 @ margin: .2em 0 .2em 0; 571 582 @ float: left; 572 583 @ clear: left; 573 -@ color: #333 584 +@ color: #333; 585 +@ white-space: nowrap; 574 586 @ } 575 587 @ 576 588 @ /* The footer at the very bottom of the page */ 577 589 @ div.footer { 578 590 @ font-size: 0.8em; 579 591 @ margin-top: 12px; 580 592 @ padding: 5px 10px 5px 10px; ................................................................................ 604 616 @ <link rel="stylesheet" href="$home/style.css?black2" type="text/css" 605 617 @ media="screen"> 606 618 @ </head> 607 619 @ <body> 608 620 @ <div class="header"> 609 621 @ <div class="logo"> 610 622 @ <img src="$home/logo" alt="logo"> 611 -@ <br /><nobr>$<project_name></nobr> 623 +@ <br />$<project_name> 612 624 @ </div> 613 625 @ <div class="title">$<title></div> 614 -@ <div class="status"><nobr><th1> 626 +@ <div class="status"><th1> 615 627 @ if {[info exists login]} { 616 628 @ puts "Logged in as $login" 617 629 @ } else { 618 630 @ puts "Not logged in" 619 631 @ } 620 -@ </th1></nobr></div> 632 +@ </th1></div> 621 633 @ </div> 622 634 @ <div class="mainmenu"> 623 635 @ <th1> 624 636 @ html "<a href=''$home$index_page''>Home</a>\n" 625 637 @ if {[anycap jor]} { 626 638 @ html "<a href=''$home/timeline''>Timeline</a>\n" 627 639 @ } ................................................................................ 680 692 @ 681 693 @ /* The project logo in the upper left-hand corner of each page */ 682 694 @ div.logo { 683 695 @ display: table-cell; 684 696 @ text-align: right; 685 697 @ vertical-align: bottom; 686 698 @ font-weight: normal; 699 +@ white-space: nowrap; 687 700 @ } 688 701 @ 689 702 @ /* Widths */ 690 703 @ div.header, div.mainmenu, div.submenu, div.content, div.footer { 691 704 @ max-width: 900px; 692 705 @ margin: auto; 693 706 @ padding: 3px 20px 3px 20px; ................................................................................ 712 725 @ /* The login status message in the top right-hand corner */ 713 726 @ div.status { 714 727 @ display: table-cell; 715 728 @ text-align: right; 716 729 @ vertical-align: bottom; 717 730 @ color: #333; 718 731 @ margin-right: -20px; 732 +@ white-space: nowrap; 719 733 @ } 720 734 @ 721 735 @ /* The main menu bar that appears at the top of the page beneath 722 736 @ ** the header */ 723 737 @ div.mainmenu { 724 738 @ text-align: center; 725 739 @ color: white; ................................................................................ 791 805 @ font-size: 1.2em; 792 806 @ font-weight: bold; 793 807 @ text-align: center; 794 808 @ color: white; 795 809 @ border-radius: 5px; 796 810 @ background-color: #446979; 797 811 @ box-shadow: 0px 3px 4px #333333; 812 +@ white-space: nowrap; 798 813 @ } 799 814 @ 800 815 @ /* The "Date" that occurs on the left hand side of timelines */ 801 816 @ div.divider { 802 817 @ font-size: 1.2em; 803 818 @ font-family: Georgia, serif; 804 819 @ font-weight: bold; ................................................................................ 867 882 @ <link rel="stylesheet" href="$home/style.css?black2" type="text/css" 868 883 @ media="screen"> 869 884 @ </head> 870 885 @ <body> 871 886 @ <div class="header"> 872 887 @ <div class="logo"> 873 888 @ <img src="$home/logo" alt="logo"> 874 -@ <br /><nobr>$<project_name></nobr> 889 +@ <br />$<project_name> 875 890 @ </div> 876 891 @ <div class="title">$<title></div> 877 -@ <div class="status"><nobr><th1> 892 +@ <div class="status"><th1> 878 893 @ if {[info exists login]} { 879 894 @ puts "Logged in as $login" 880 895 @ } else { 881 896 @ puts "Not logged in" 882 897 @ } 883 -@ </th1></nobr></div> 898 +@ </th1></div> 884 899 @ </div> 885 900 @ <div class="mainmenu"> 886 901 @ <th1> 887 902 @ html "<a href=''$home$index_page''>Home</a>\n" 888 903 @ if {[anycap jor]} { 889 904 @ html "<a href=''$home/timeline''>Timeline</a>\n" 890 905 @ } ................................................................................ 953 968 @ div.logo { 954 969 @ display: table-cell; 955 970 @ text-align: center; 956 971 @ vertical-align: bottom; 957 972 @ font-weight: bold; 958 973 @ color: #558195; 959 974 @ min-width: 200px; 975 +@ white-space: nowrap; 960 976 @ } 961 977 @ 962 978 @ /* The page title centered at the top of each page */ 963 979 @ div.title { 964 980 @ display: table-cell; 965 981 @ font-size: 2em; 966 982 @ font-weight: bold; ................................................................................ 1157 1173 @ set logourl [getLogoUrl $baseurl] 1158 1174 @ </th1> 1159 1175 @ <a href="$logourl"> 1160 1176 @ <img src="$baseurl/logo" border="0" alt="$project_name"> 1161 1177 @ </a> 1162 1178 @ </div> 1163 1179 @ <div class="title"><small>$<project_name></small><br />$<title></div> 1164 -@ <div class="status"><nobr><th1> 1180 +@ <div class="status"><th1> 1165 1181 @ if {[info exists login]} { 1166 1182 @ puts "Logged in as $login" 1167 1183 @ } else { 1168 1184 @ puts "Not logged in" 1169 1185 @ } 1170 -@ </th1></nobr></div> 1186 +@ </th1></div> 1171 1187 @ </div> 1172 1188 @ <div class="mainmenu"> 1173 1189 @ <th1> 1174 1190 @ html "<a href=''$home$index_page''>Home</a>\n" 1175 1191 @ if {[anycap jor]} { 1176 1192 @ html "<a href=''$home/timeline''>Timeline</a>\n" 1177 1193 @ }
Changes to src/style.c.
426 426 @ div.logo { 427 427 @ display: table-cell; 428 428 @ text-align: center; 429 429 @ vertical-align: bottom; 430 430 @ font-weight: bold; 431 431 @ color: #558195; 432 432 @ min-width: 200px; 433 +@ white-space: nowrap; 433 434 @ } 434 435 @ 435 436 @ /* The page title centered at the top of each page */ 436 437 @ div.title { 437 438 @ display: table-cell; 438 439 @ font-size: 2em; 439 440 @ font-weight: bold;