Fossil SCM
Removed accidental dual-emit of skin-level CSS. Copy/paste bug.
Commit
eddb5ac5528bf099bedd933d20d7ec51c42694ace9eddff99c622b3a263c584f
Parent
e2a9fe4bc87824e…
1 file changed
+1
-2
+1
-2
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -1083,11 +1083,11 @@ | ||
| 1083 | 1083 | Blob css = empty_blob; |
| 1084 | 1084 | int i; |
| 1085 | 1085 | const char *zPage = P("name"); |
| 1086 | 1086 | |
| 1087 | 1087 | cgi_set_content_type("text/css"); |
| 1088 | - /* add special missing definitions */ | |
| 1088 | + /* Emit all default rules... */ | |
| 1089 | 1089 | for(i=1; cssDefaultList[i].elementClass; i++){ |
| 1090 | 1090 | char *z = blob_str(&css); |
| 1091 | 1091 | if( !containsSelector(z, cssDefaultList[i].elementClass) ){ |
| 1092 | 1092 | blob_appendf(&css, "%s {\n%s}\n", |
| 1093 | 1093 | cssDefaultList[i].elementClass, |
| @@ -1099,11 +1099,10 @@ | ||
| 1099 | 1099 | "** All CSS above is generated automatically by Fossil to\n" |
| 1100 | 1100 | "** provide default rule implementations which the \"skin\"\n" |
| 1101 | 1101 | "** may cascade.\n" |
| 1102 | 1102 | "***********************************************************/\n", |
| 1103 | 1103 | -1); |
| 1104 | - blob_append(&css,skin_get("css"),-1); | |
| 1105 | 1104 | if(zPage!=0 && zPage[0]!=0){ |
| 1106 | 1105 | char * zFile = mprintf("style.%s.css", zPage); |
| 1107 | 1106 | int nFile = 0; |
| 1108 | 1107 | const char *zBuiltin = (const char *)builtin_file(zFile, &nFile); |
| 1109 | 1108 | if(nFile>0){ |
| 1110 | 1109 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1083,11 +1083,11 @@ | |
| 1083 | Blob css = empty_blob; |
| 1084 | int i; |
| 1085 | const char *zPage = P("name"); |
| 1086 | |
| 1087 | cgi_set_content_type("text/css"); |
| 1088 | /* add special missing definitions */ |
| 1089 | for(i=1; cssDefaultList[i].elementClass; i++){ |
| 1090 | char *z = blob_str(&css); |
| 1091 | if( !containsSelector(z, cssDefaultList[i].elementClass) ){ |
| 1092 | blob_appendf(&css, "%s {\n%s}\n", |
| 1093 | cssDefaultList[i].elementClass, |
| @@ -1099,11 +1099,10 @@ | |
| 1099 | "** All CSS above is generated automatically by Fossil to\n" |
| 1100 | "** provide default rule implementations which the \"skin\"\n" |
| 1101 | "** may cascade.\n" |
| 1102 | "***********************************************************/\n", |
| 1103 | -1); |
| 1104 | blob_append(&css,skin_get("css"),-1); |
| 1105 | if(zPage!=0 && zPage[0]!=0){ |
| 1106 | char * zFile = mprintf("style.%s.css", zPage); |
| 1107 | int nFile = 0; |
| 1108 | const char *zBuiltin = (const char *)builtin_file(zFile, &nFile); |
| 1109 | if(nFile>0){ |
| 1110 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1083,11 +1083,11 @@ | |
| 1083 | Blob css = empty_blob; |
| 1084 | int i; |
| 1085 | const char *zPage = P("name"); |
| 1086 | |
| 1087 | cgi_set_content_type("text/css"); |
| 1088 | /* Emit all default rules... */ |
| 1089 | for(i=1; cssDefaultList[i].elementClass; i++){ |
| 1090 | char *z = blob_str(&css); |
| 1091 | if( !containsSelector(z, cssDefaultList[i].elementClass) ){ |
| 1092 | blob_appendf(&css, "%s {\n%s}\n", |
| 1093 | cssDefaultList[i].elementClass, |
| @@ -1099,11 +1099,10 @@ | |
| 1099 | "** All CSS above is generated automatically by Fossil to\n" |
| 1100 | "** provide default rule implementations which the \"skin\"\n" |
| 1101 | "** may cascade.\n" |
| 1102 | "***********************************************************/\n", |
| 1103 | -1); |
| 1104 | if(zPage!=0 && zPage[0]!=0){ |
| 1105 | char * zFile = mprintf("style.%s.css", zPage); |
| 1106 | int nFile = 0; |
| 1107 | const char *zBuiltin = (const char *)builtin_file(zFile, &nFile); |
| 1108 | if(nFile>0){ |
| 1109 |