Fossil SCM

revert unrelated changes

jan.nijtmans 2012-11-12 13:16 UTC convert_before_commit
Commit 2c5844b1bebfe5d8387b1d97d43b73723912d7e8
Parent b1beeb77ee0f0d9…
4 files changed +4 -4 +13 -22 -1 +5 -5
~ src/main.c ~ src/skins.c ~ src/style.c ~ win/Makefile.mingw
M src/main.c
+4 -4
--- src/main.c
+++ src/main.c
@@ -341,11 +341,11 @@
341341
 if(g.db){
342342
 db_close(0);
343343
 }
344344
 }
345345
346
-#if defined(_WIN32)
346
+#if defined(_WIN32) && !defined(__MINGW32__)
347347
 /*
348348
 ** Parse the command-line arguments passed to windows. We do this
349349
 ** ourselves to work around bugs in the command-line parsing of MinGW.
350350
 ** It is possible (in theory) to only use this routine when compiling
351351
 ** with MinGW and to use built-in command-line parsing for MSVC and
@@ -454,11 +454,11 @@
454454
 }
455455
 argv[argc] = NULL;
456456
 *argcPtr = argc;
457457
 *((WCHAR ***)argvPtr) = argv;
458458
 }
459
-#endif /* defined(_WIN32) */
459
+#endif /* defined(_WIN32) && !defined(__MINGW32__) */
460460
461461
462462
 /*
463463
 ** Convert all arguments from mbcs (or unicode) to UTF-8. Then
464464
 ** search g.argv for arguments "--args FILENAME". If found, then
@@ -478,17 +478,17 @@
478478
 int n; /* Number of bytes in one line */
479479
 char *z; /* General use string pointer */
480480
 char **newArgv; /* New expanded g.argv under construction */
481481
 char const * zFileName; /* input file name */
482482
 FILE * zInFile; /* input FILE */
483
-#if defined(_WIN32)
483
+#if defined(_WIN32) && !defined(__MINGW32__)
484484
 WCHAR buf[MAX_PATH];
485485
 #endif
486486
487487
 g.argc = argc;
488488
 g.argv = argv;
489
-#if defined(_WIN32)
489
+#if defined(_WIN32) && !defined(__MINGW32__)
490490
 parse_windows_command_line(&g.argc, &g.argv);
491491
 GetModuleFileNameW(NULL, buf, MAX_PATH);
492492
 g.nameOfExe = fossil_unicode_to_utf8(buf);
493493
 for(i=0; i<g.argc; i++) g.argv[i] = fossil_unicode_to_utf8(g.argv[i]);
494494
 #else
495495
--- src/main.c
+++ src/main.c
@@ -341,11 +341,11 @@
341 if(g.db){
342 db_close(0);
343 }
344 }
345
346 #if defined(_WIN32)
347 /*
348 ** Parse the command-line arguments passed to windows. We do this
349 ** ourselves to work around bugs in the command-line parsing of MinGW.
350 ** It is possible (in theory) to only use this routine when compiling
351 ** with MinGW and to use built-in command-line parsing for MSVC and
@@ -454,11 +454,11 @@
454 }
455 argv[argc] = NULL;
456 *argcPtr = argc;
457 *((WCHAR ***)argvPtr) = argv;
458 }
459 #endif /* defined(_WIN32) */
460
461
462 /*
463 ** Convert all arguments from mbcs (or unicode) to UTF-8. Then
464 ** search g.argv for arguments "--args FILENAME". If found, then
@@ -478,17 +478,17 @@
478 int n; /* Number of bytes in one line */
479 char *z; /* General use string pointer */
480 char **newArgv; /* New expanded g.argv under construction */
481 char const * zFileName; /* input file name */
482 FILE * zInFile; /* input FILE */
483 #if defined(_WIN32)
484 WCHAR buf[MAX_PATH];
485 #endif
486
487 g.argc = argc;
488 g.argv = argv;
489 #if defined(_WIN32)
490 parse_windows_command_line(&g.argc, &g.argv);
491 GetModuleFileNameW(NULL, buf, MAX_PATH);
492 g.nameOfExe = fossil_unicode_to_utf8(buf);
493 for(i=0; i<g.argc; i++) g.argv[i] = fossil_unicode_to_utf8(g.argv[i]);
494 #else
495
--- src/main.c
+++ src/main.c
@@ -341,11 +341,11 @@
341 if(g.db){
342 db_close(0);
343 }
344 }
345
346 #if defined(_WIN32) && !defined(__MINGW32__)
347 /*
348 ** Parse the command-line arguments passed to windows. We do this
349 ** ourselves to work around bugs in the command-line parsing of MinGW.
350 ** It is possible (in theory) to only use this routine when compiling
351 ** with MinGW and to use built-in command-line parsing for MSVC and
@@ -454,11 +454,11 @@
454 }
455 argv[argc] = NULL;
456 *argcPtr = argc;
457 *((WCHAR ***)argvPtr) = argv;
458 }
459 #endif /* defined(_WIN32) && !defined(__MINGW32__) */
460
461
462 /*
463 ** Convert all arguments from mbcs (or unicode) to UTF-8. Then
464 ** search g.argv for arguments "--args FILENAME". If found, then
@@ -478,17 +478,17 @@
478 int n; /* Number of bytes in one line */
479 char *z; /* General use string pointer */
480 char **newArgv; /* New expanded g.argv under construction */
481 char const * zFileName; /* input file name */
482 FILE * zInFile; /* input FILE */
483 #if defined(_WIN32) && !defined(__MINGW32__)
484 WCHAR buf[MAX_PATH];
485 #endif
486
487 g.argc = argc;
488 g.argv = argv;
489 #if defined(_WIN32) && !defined(__MINGW32__)
490 parse_windows_command_line(&g.argc, &g.argv);
491 GetModuleFileNameW(NULL, buf, MAX_PATH);
492 g.nameOfExe = fossil_unicode_to_utf8(buf);
493 for(i=0; i<g.argc; i++) g.argv[i] = fossil_unicode_to_utf8(g.argv[i]);
494 #else
495
M src/skins.c
+13 -22
--- src/skins.c
+++ src/skins.c
@@ -44,11 +44,10 @@
4444
 @ font-size: 2em;
4545
 @ font-weight: bold;
4646
 @ background-color: #707070;
4747
 @ color: #ffffff;
4848
 @ min-width: 200px;
49
-@ white-space: nowrap;
5049
 @ }
5150
 @
5251
 @ /* The page title centered at the top of each page */
5352
 @ div.title {
5453
 @ display: table-cell;
@@ -68,11 +67,10 @@
6867
 @ vertical-align: bottom;
6968
 @ color: #404040;
7069
 @ font-size: 0.8em;
7170
 @ font-weight: bold;
7271
 @ min-width: 200px;
73
-@ white-space: nowrap;
7472
 @ }
7573
 @
7674
 @ /* The header across the top of the page */
7775
 @ div.header {
7876
 @ display: table;
@@ -168,17 +166,17 @@
168166
 @ media="screen">
169167
 @ </head>
170168
 @ <body>
171169
 @ <div class="header">
172170
 @ <div class="title"><small>$<project_name></small><br />$<title></div>
173
-@ <div class="status"><th1>
171
+@ <div class="status"><nobr><th1>
174172
 @ if {[info exists login]} {
175173
 @ puts "Logged in as $login"
176174
 @ } else {
177175
 @ puts "Not logged in"
178176
 @ }
179
-@ </th1></div>
177
+@ </th1></nobr></div>
180178
 @ </div>
181179
 @ <div class="mainmenu">
182180
 @ <th1>
183181
 @ html "<a href=''$home$index_page''>Home</a>\n"
184182
 @ if {[anycap jor]} {
@@ -237,11 +235,10 @@
237235
 @ text-align: center;
238236
 @ vertical-align: bottom;
239237
 @ font-weight: bold;
240238
 @ font-size: 2.5em;
241239
 @ color: #a09048;
242
-@ white-space: nowrap;
243240
 @ }
244241
 @
245242
 @ /* The page title centered at the top of each page */
246243
 @ div.title {
247244
 @ display: table-cell;
@@ -261,11 +258,10 @@
261258
 @ vertical-align: bottom;
262259
 @ color: #a09048;
263260
 @ padding: 5px 5px 0 0;
264261
 @ font-size: 0.8em;
265262
 @ font-weight: bold;
266
-@ white-space: nowrap;
267263
 @ }
268264
 @
269265
 @ /* The header across the top of the page */
270266
 @ div.header {
271267
 @ display: table;
@@ -374,18 +370,18 @@
374370
 @ </head>
375371
 @ <body>
376372
 @ <div class="header">
377373
 @ <div class="title">$<title></div>
378374
 @ <div class="status">
379
-@ <div class="logo">$<project_name></div><br/>
380
-@ <th1>
375
+@ <div class="logo"><nobr>$<project_name></nobr></div><br/>
376
+@ <nobr><th1>
381377
 @ if {[info exists login]} {
382378
 @ puts "Logged in as $login"
383379
 @ } else {
384380
 @ puts "Not logged in"
385381
 @ }
386
-@ </th1></div>
382
+@ </th1></nobr></div>
387383
 @ </div>
388384
 @ <div class="mainmenu">
389385
 @ <th1>
390386
 @ html "<a href=''$home$index_page''>Home</a>\n"
391387
 @ if {[anycap jor]} {
@@ -452,11 +448,10 @@
452448
 @ display: table-cell;
453449
 @ text-align: left;
454450
 @ vertical-align: bottom;
455451
 @ font-weight: bold;
456452
 @ color: #333;
457
-@ white-space: nowrap;
458453
 @ }
459454
 @
460455
 @ /* The page title centered at the top of each page */
461456
 @ div.title {
462457
 @ display: table-cell;
@@ -476,11 +471,10 @@
476471
 @ vertical-align: bottom;
477472
 @ padding-bottom: 5px;
478473
 @ color: #333;
479474
 @ font-size: 0.8em;
480475
 @ font-weight: bold;
481
-@ white-space: nowrap;
482476
 @ }
483477
 @
484478
 @ /* The header across the top of the page */
485479
 @ div.header {
486480
 @ margin:10px 0px 10px 0px;
@@ -612,20 +606,20 @@
612606
 @ </head>
613607
 @ <body>
614608
 @ <div class="header">
615609
 @ <div class="logo">
616610
 @ <img src="$home/logo" alt="logo">
617
-@ <br />$<project_name>
611
+@ <br /><nobr>$<project_name></nobr>
618612
 @ </div>
619613
 @ <div class="title">$<title></div>
620
-@ <div class="status"><th1>
614
+@ <div class="status"><nobr><th1>
621615
 @ if {[info exists login]} {
622616
 @ puts "Logged in as $login"
623617
 @ } else {
624618
 @ puts "Not logged in"
625619
 @ }
626
-@ </th1></div>
620
+@ </th1></nobr></div>
627621
 @ </div>
628622
 @ <div class="mainmenu">
629623
 @ <th1>
630624
 @ html "<a href=''$home$index_page''>Home</a>\n"
631625
 @ if {[anycap jor]} {
@@ -688,11 +682,10 @@
688682
 @ div.logo {
689683
 @ display: table-cell;
690684
 @ text-align: right;
691685
 @ vertical-align: bottom;
692686
 @ font-weight: normal;
693
-@ white-space: nowrap;
694687
 @ }
695688
 @
696689
 @ /* Widths */
697690
 @ div.header, div.mainmenu, div.submenu, div.content, div.footer {
698691
 @ max-width: 900px;
@@ -721,11 +714,10 @@
721714
 @ display: table-cell;
722715
 @ text-align: right;
723716
 @ vertical-align: bottom;
724717
 @ color: #333;
725718
 @ margin-right: -20px;
726
-@ white-space: nowrap;
727719
 @ }
728720
 @
729721
 @ /* The main menu bar that appears at the top of the page beneath
730722
 @ ** the header */
731723
 @ div.mainmenu {
@@ -877,20 +869,20 @@
877869
 @ </head>
878870
 @ <body>
879871
 @ <div class="header">
880872
 @ <div class="logo">
881873
 @ <img src="$home/logo" alt="logo">
882
-@ <br />$<project_name>
874
+@ <br /><nobr>$<project_name></nobr>
883875
 @ </div>
884876
 @ <div class="title">$<title></div>
885
-@ <div class="status"><th1>
877
+@ <div class="status"><nobr><th1>
886878
 @ if {[info exists login]} {
887879
 @ puts "Logged in as $login"
888880
 @ } else {
889881
 @ puts "Not logged in"
890882
 @ }
891
-@ </th1></div>
883
+@ </th1></nobr></div>
892884
 @ </div>
893885
 @ <div class="mainmenu">
894886
 @ <th1>
895887
 @ html "<a href=''$home$index_page''>Home</a>\n"
896888
 @ if {[anycap jor]} {
@@ -963,11 +955,10 @@
963955
 @ text-align: center;
964956
 @ vertical-align: bottom;
965957
 @ font-weight: bold;
966958
 @ color: #558195;
967959
 @ min-width: 200px;
968
-@ white-space: nowrap;
969960
 @ }
970961
 @
971962
 @ /* The page title centered at the top of each page */
972963
 @ div.title {
973964
 @ display: table-cell;
@@ -1168,17 +1159,17 @@
11681159
 @ <a href="$logourl">
11691160
 @ <img src="$baseurl/logo" border="0" alt="$project_name">
11701161
 @ </a>
11711162
 @ </div>
11721163
 @ <div class="title"><small>$<project_name></small><br />$<title></div>
1173
-@ <div class="status"><th1>
1164
+@ <div class="status"><nobr><th1>
11741165
 @ if {[info exists login]} {
11751166
 @ puts "Logged in as $login"
11761167
 @ } else {
11771168
 @ puts "Not logged in"
11781169
 @ }
1179
-@ </th1></div>
1170
+@ </th1></nobr></div>
11801171
 @ </div>
11811172
 @ <div class="mainmenu">
11821173
 @ <th1>
11831174
 @ html "<a href=''$home$index_page''>Home</a>\n"
11841175
 @ if {[anycap jor]} {
11851176
--- src/skins.c
+++ src/skins.c
@@ -44,11 +44,10 @@
44 @ font-size: 2em;
45 @ font-weight: bold;
46 @ background-color: #707070;
47 @ color: #ffffff;
48 @ min-width: 200px;
49 @ white-space: nowrap;
50 @ }
51 @
52 @ /* The page title centered at the top of each page */
53 @ div.title {
54 @ display: table-cell;
@@ -68,11 +67,10 @@
68 @ vertical-align: bottom;
69 @ color: #404040;
70 @ font-size: 0.8em;
71 @ font-weight: bold;
72 @ min-width: 200px;
73 @ white-space: nowrap;
74 @ }
75 @
76 @ /* The header across the top of the page */
77 @ div.header {
78 @ display: table;
@@ -168,17 +166,17 @@
168 @ media="screen">
169 @ </head>
170 @ <body>
171 @ <div class="header">
172 @ <div class="title"><small>$<project_name></small><br />$<title></div>
173 @ <div class="status"><th1>
174 @ if {[info exists login]} {
175 @ puts "Logged in as $login"
176 @ } else {
177 @ puts "Not logged in"
178 @ }
179 @ </th1></div>
180 @ </div>
181 @ <div class="mainmenu">
182 @ <th1>
183 @ html "<a href=''$home$index_page''>Home</a>\n"
184 @ if {[anycap jor]} {
@@ -237,11 +235,10 @@
237 @ text-align: center;
238 @ vertical-align: bottom;
239 @ font-weight: bold;
240 @ font-size: 2.5em;
241 @ color: #a09048;
242 @ white-space: nowrap;
243 @ }
244 @
245 @ /* The page title centered at the top of each page */
246 @ div.title {
247 @ display: table-cell;
@@ -261,11 +258,10 @@
261 @ vertical-align: bottom;
262 @ color: #a09048;
263 @ padding: 5px 5px 0 0;
264 @ font-size: 0.8em;
265 @ font-weight: bold;
266 @ white-space: nowrap;
267 @ }
268 @
269 @ /* The header across the top of the page */
270 @ div.header {
271 @ display: table;
@@ -374,18 +370,18 @@
374 @ </head>
375 @ <body>
376 @ <div class="header">
377 @ <div class="title">$<title></div>
378 @ <div class="status">
379 @ <div class="logo">$<project_name></div><br/>
380 @ <th1>
381 @ if {[info exists login]} {
382 @ puts "Logged in as $login"
383 @ } else {
384 @ puts "Not logged in"
385 @ }
386 @ </th1></div>
387 @ </div>
388 @ <div class="mainmenu">
389 @ <th1>
390 @ html "<a href=''$home$index_page''>Home</a>\n"
391 @ if {[anycap jor]} {
@@ -452,11 +448,10 @@
452 @ display: table-cell;
453 @ text-align: left;
454 @ vertical-align: bottom;
455 @ font-weight: bold;
456 @ color: #333;
457 @ white-space: nowrap;
458 @ }
459 @
460 @ /* The page title centered at the top of each page */
461 @ div.title {
462 @ display: table-cell;
@@ -476,11 +471,10 @@
476 @ vertical-align: bottom;
477 @ padding-bottom: 5px;
478 @ color: #333;
479 @ font-size: 0.8em;
480 @ font-weight: bold;
481 @ white-space: nowrap;
482 @ }
483 @
484 @ /* The header across the top of the page */
485 @ div.header {
486 @ margin:10px 0px 10px 0px;
@@ -612,20 +606,20 @@
612 @ </head>
613 @ <body>
614 @ <div class="header">
615 @ <div class="logo">
616 @ <img src="$home/logo" alt="logo">
617 @ <br />$<project_name>
618 @ </div>
619 @ <div class="title">$<title></div>
620 @ <div class="status"><th1>
621 @ if {[info exists login]} {
622 @ puts "Logged in as $login"
623 @ } else {
624 @ puts "Not logged in"
625 @ }
626 @ </th1></div>
627 @ </div>
628 @ <div class="mainmenu">
629 @ <th1>
630 @ html "<a href=''$home$index_page''>Home</a>\n"
631 @ if {[anycap jor]} {
@@ -688,11 +682,10 @@
688 @ div.logo {
689 @ display: table-cell;
690 @ text-align: right;
691 @ vertical-align: bottom;
692 @ font-weight: normal;
693 @ white-space: nowrap;
694 @ }
695 @
696 @ /* Widths */
697 @ div.header, div.mainmenu, div.submenu, div.content, div.footer {
698 @ max-width: 900px;
@@ -721,11 +714,10 @@
721 @ display: table-cell;
722 @ text-align: right;
723 @ vertical-align: bottom;
724 @ color: #333;
725 @ margin-right: -20px;
726 @ white-space: nowrap;
727 @ }
728 @
729 @ /* The main menu bar that appears at the top of the page beneath
730 @ ** the header */
731 @ div.mainmenu {
@@ -877,20 +869,20 @@
877 @ </head>
878 @ <body>
879 @ <div class="header">
880 @ <div class="logo">
881 @ <img src="$home/logo" alt="logo">
882 @ <br />$<project_name>
883 @ </div>
884 @ <div class="title">$<title></div>
885 @ <div class="status"><th1>
886 @ if {[info exists login]} {
887 @ puts "Logged in as $login"
888 @ } else {
889 @ puts "Not logged in"
890 @ }
891 @ </th1></div>
892 @ </div>
893 @ <div class="mainmenu">
894 @ <th1>
895 @ html "<a href=''$home$index_page''>Home</a>\n"
896 @ if {[anycap jor]} {
@@ -963,11 +955,10 @@
963 @ text-align: center;
964 @ vertical-align: bottom;
965 @ font-weight: bold;
966 @ color: #558195;
967 @ min-width: 200px;
968 @ white-space: nowrap;
969 @ }
970 @
971 @ /* The page title centered at the top of each page */
972 @ div.title {
973 @ display: table-cell;
@@ -1168,17 +1159,17 @@
1168 @ <a href="$logourl">
1169 @ <img src="$baseurl/logo" border="0" alt="$project_name">
1170 @ </a>
1171 @ </div>
1172 @ <div class="title"><small>$<project_name></small><br />$<title></div>
1173 @ <div class="status"><th1>
1174 @ if {[info exists login]} {
1175 @ puts "Logged in as $login"
1176 @ } else {
1177 @ puts "Not logged in"
1178 @ }
1179 @ </th1></div>
1180 @ </div>
1181 @ <div class="mainmenu">
1182 @ <th1>
1183 @ html "<a href=''$home$index_page''>Home</a>\n"
1184 @ if {[anycap jor]} {
1185
--- src/skins.c
+++ src/skins.c
@@ -44,11 +44,10 @@
44 @ font-size: 2em;
45 @ font-weight: bold;
46 @ background-color: #707070;
47 @ color: #ffffff;
48 @ min-width: 200px;
 
49 @ }
50 @
51 @ /* The page title centered at the top of each page */
52 @ div.title {
53 @ display: table-cell;
@@ -68,11 +67,10 @@
67 @ vertical-align: bottom;
68 @ color: #404040;
69 @ font-size: 0.8em;
70 @ font-weight: bold;
71 @ min-width: 200px;
 
72 @ }
73 @
74 @ /* The header across the top of the page */
75 @ div.header {
76 @ display: table;
@@ -168,17 +166,17 @@
166 @ media="screen">
167 @ </head>
168 @ <body>
169 @ <div class="header">
170 @ <div class="title"><small>$<project_name></small><br />$<title></div>
171 @ <div class="status"><nobr><th1>
172 @ if {[info exists login]} {
173 @ puts "Logged in as $login"
174 @ } else {
175 @ puts "Not logged in"
176 @ }
177 @ </th1></nobr></div>
178 @ </div>
179 @ <div class="mainmenu">
180 @ <th1>
181 @ html "<a href=''$home$index_page''>Home</a>\n"
182 @ if {[anycap jor]} {
@@ -237,11 +235,10 @@
235 @ text-align: center;
236 @ vertical-align: bottom;
237 @ font-weight: bold;
238 @ font-size: 2.5em;
239 @ color: #a09048;
 
240 @ }
241 @
242 @ /* The page title centered at the top of each page */
243 @ div.title {
244 @ display: table-cell;
@@ -261,11 +258,10 @@
258 @ vertical-align: bottom;
259 @ color: #a09048;
260 @ padding: 5px 5px 0 0;
261 @ font-size: 0.8em;
262 @ font-weight: bold;
 
263 @ }
264 @
265 @ /* The header across the top of the page */
266 @ div.header {
267 @ display: table;
@@ -374,18 +370,18 @@
370 @ </head>
371 @ <body>
372 @ <div class="header">
373 @ <div class="title">$<title></div>
374 @ <div class="status">
375 @ <div class="logo"><nobr>$<project_name></nobr></div><br/>
376 @ <nobr><th1>
377 @ if {[info exists login]} {
378 @ puts "Logged in as $login"
379 @ } else {
380 @ puts "Not logged in"
381 @ }
382 @ </th1></nobr></div>
383 @ </div>
384 @ <div class="mainmenu">
385 @ <th1>
386 @ html "<a href=''$home$index_page''>Home</a>\n"
387 @ if {[anycap jor]} {
@@ -452,11 +448,10 @@
448 @ display: table-cell;
449 @ text-align: left;
450 @ vertical-align: bottom;
451 @ font-weight: bold;
452 @ color: #333;
 
453 @ }
454 @
455 @ /* The page title centered at the top of each page */
456 @ div.title {
457 @ display: table-cell;
@@ -476,11 +471,10 @@
471 @ vertical-align: bottom;
472 @ padding-bottom: 5px;
473 @ color: #333;
474 @ font-size: 0.8em;
475 @ font-weight: bold;
 
476 @ }
477 @
478 @ /* The header across the top of the page */
479 @ div.header {
480 @ margin:10px 0px 10px 0px;
@@ -612,20 +606,20 @@
606 @ </head>
607 @ <body>
608 @ <div class="header">
609 @ <div class="logo">
610 @ <img src="$home/logo" alt="logo">
611 @ <br /><nobr>$<project_name></nobr>
612 @ </div>
613 @ <div class="title">$<title></div>
614 @ <div class="status"><nobr><th1>
615 @ if {[info exists login]} {
616 @ puts "Logged in as $login"
617 @ } else {
618 @ puts "Not logged in"
619 @ }
620 @ </th1></nobr></div>
621 @ </div>
622 @ <div class="mainmenu">
623 @ <th1>
624 @ html "<a href=''$home$index_page''>Home</a>\n"
625 @ if {[anycap jor]} {
@@ -688,11 +682,10 @@
682 @ div.logo {
683 @ display: table-cell;
684 @ text-align: right;
685 @ vertical-align: bottom;
686 @ font-weight: normal;
 
687 @ }
688 @
689 @ /* Widths */
690 @ div.header, div.mainmenu, div.submenu, div.content, div.footer {
691 @ max-width: 900px;
@@ -721,11 +714,10 @@
714 @ display: table-cell;
715 @ text-align: right;
716 @ vertical-align: bottom;
717 @ color: #333;
718 @ margin-right: -20px;
 
719 @ }
720 @
721 @ /* The main menu bar that appears at the top of the page beneath
722 @ ** the header */
723 @ div.mainmenu {
@@ -877,20 +869,20 @@
869 @ </head>
870 @ <body>
871 @ <div class="header">
872 @ <div class="logo">
873 @ <img src="$home/logo" alt="logo">
874 @ <br /><nobr>$<project_name></nobr>
875 @ </div>
876 @ <div class="title">$<title></div>
877 @ <div class="status"><nobr><th1>
878 @ if {[info exists login]} {
879 @ puts "Logged in as $login"
880 @ } else {
881 @ puts "Not logged in"
882 @ }
883 @ </th1></nobr></div>
884 @ </div>
885 @ <div class="mainmenu">
886 @ <th1>
887 @ html "<a href=''$home$index_page''>Home</a>\n"
888 @ if {[anycap jor]} {
@@ -963,11 +955,10 @@
955 @ text-align: center;
956 @ vertical-align: bottom;
957 @ font-weight: bold;
958 @ color: #558195;
959 @ min-width: 200px;
 
960 @ }
961 @
962 @ /* The page title centered at the top of each page */
963 @ div.title {
964 @ display: table-cell;
@@ -1168,17 +1159,17 @@
1159 @ <a href="$logourl">
1160 @ <img src="$baseurl/logo" border="0" alt="$project_name">
1161 @ </a>
1162 @ </div>
1163 @ <div class="title"><small>$<project_name></small><br />$<title></div>
1164 @ <div class="status"><nobr><th1>
1165 @ if {[info exists login]} {
1166 @ puts "Logged in as $login"
1167 @ } else {
1168 @ puts "Not logged in"
1169 @ }
1170 @ </th1></nobr></div>
1171 @ </div>
1172 @ <div class="mainmenu">
1173 @ <th1>
1174 @ html "<a href=''$home$index_page''>Home</a>\n"
1175 @ if {[anycap jor]} {
1176
M src/style.c
-1
--- src/style.c
+++ src/style.c
@@ -428,11 +428,10 @@
428428
 @ text-align: center;
429429
 @ vertical-align: bottom;
430430
 @ font-weight: bold;
431431
 @ color: #558195;
432432
 @ min-width: 200px;
433
-@ white-space: nowrap;
434433
 @ }
435434
 @
436435
 @ /* The page title centered at the top of each page */
437436
 @ div.title {
438437
 @ display: table-cell;
439438
--- src/style.c
+++ src/style.c
@@ -428,11 +428,10 @@
428 @ text-align: center;
429 @ vertical-align: bottom;
430 @ font-weight: bold;
431 @ color: #558195;
432 @ min-width: 200px;
433 @ white-space: nowrap;
434 @ }
435 @
436 @ /* The page title centered at the top of each page */
437 @ div.title {
438 @ display: table-cell;
439
--- src/style.c
+++ src/style.c
@@ -428,11 +428,10 @@
428 @ text-align: center;
429 @ vertical-align: bottom;
430 @ font-weight: bold;
431 @ color: #558195;
432 @ min-width: 200px;
 
433 @ }
434 @
435 @ /* The page title centered at the top of each page */
436 @ div.title {
437 @ display: table-cell;
438
M win/Makefile.mingw
+5 -5
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -13,14 +13,14 @@
1313
 #
1414
1515
 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
1616
 # By default, this is an empty string (i.e. use the native compiler).
1717
 #
18
-# PREFIX =
18
+PREFIX =
1919
 # PREFIX = mingw32-
2020
 # PREFIX = i686-pc-mingw32-
21
-PREFIX = i686-w64-mingw32-
21
+# PREFIX = i686-w64-mingw32-
2222
 # PREFIX = x86_64-w64-mingw32-
2323
2424
 #### The toplevel directory of the source tree. Fossil can be built
2525
 # in a directory that is separate from the source tree. Just change
2626
 # the following to point from the build directory to the src/ folder.
@@ -42,19 +42,19 @@
4242
 #
4343
 # FOSSIL_ENABLE_JSON = 1
4444
4545
 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
4646
 #
47
-FOSSIL_ENABLE_SSL = 1
47
+# FOSSIL_ENABLE_SSL = 1
4848
4949
 #### Enable scripting support via Tcl/Tk
5050
 #
51
-FOSSIL_ENABLE_TCL = 1
51
+# FOSSIL_ENABLE_TCL = 1
5252
5353
 #### Load Tcl using the stubs mechanism
5454
 #
55
-FOSSIL_ENABLE_TCL_STUBS = 1
55
+# FOSSIL_ENABLE_TCL_STUBS = 1
5656
5757
 #### Use the Tcl source directory instead of the install directory?
5858
 # This is useful when Tcl has been compiled statically with MinGW.
5959
 #
6060
 FOSSIL_TCL_SOURCE = 1
6161
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -13,14 +13,14 @@
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 # PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
21 PREFIX = i686-w64-mingw32-
22 # PREFIX = x86_64-w64-mingw32-
23
24 #### The toplevel directory of the source tree. Fossil can be built
25 # in a directory that is separate from the source tree. Just change
26 # the following to point from the build directory to the src/ folder.
@@ -42,19 +42,19 @@
42 #
43 # FOSSIL_ENABLE_JSON = 1
44
45 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
46 #
47 FOSSIL_ENABLE_SSL = 1
48
49 #### Enable scripting support via Tcl/Tk
50 #
51 FOSSIL_ENABLE_TCL = 1
52
53 #### Load Tcl using the stubs mechanism
54 #
55 FOSSIL_ENABLE_TCL_STUBS = 1
56
57 #### Use the Tcl source directory instead of the install directory?
58 # This is useful when Tcl has been compiled statically with MinGW.
59 #
60 FOSSIL_TCL_SOURCE = 1
61
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -13,14 +13,14 @@
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
21 # PREFIX = i686-w64-mingw32-
22 # PREFIX = x86_64-w64-mingw32-
23
24 #### The toplevel directory of the source tree. Fossil can be built
25 # in a directory that is separate from the source tree. Just change
26 # the following to point from the build directory to the src/ folder.
@@ -42,19 +42,19 @@
42 #
43 # FOSSIL_ENABLE_JSON = 1
44
45 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
46 #
47 # FOSSIL_ENABLE_SSL = 1
48
49 #### Enable scripting support via Tcl/Tk
50 #
51 # FOSSIL_ENABLE_TCL = 1
52
53 #### Load Tcl using the stubs mechanism
54 #
55 # FOSSIL_ENABLE_TCL_STUBS = 1
56
57 #### Use the Tcl source directory instead of the install directory?
58 # This is useful when Tcl has been compiled statically with MinGW.
59 #
60 FOSSIL_TCL_SOURCE = 1
61

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button