typedoc 0.24.1 → 0.24.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (65) hide show
  1. package/dist/index.d.ts +2 -3
  2. package/dist/index.js +2 -3
  3. package/dist/lib/application.js +2 -1
  4. package/dist/lib/converter/plugins/ImplementsPlugin.js +16 -6
  5. package/dist/lib/converter/plugins/PackagePlugin.js +1 -1
  6. package/dist/lib/converter/plugins/SourcePlugin.js +2 -3
  7. package/dist/lib/converter/types.js +3 -1
  8. package/dist/lib/models/comments/comment.js +6 -1
  9. package/dist/lib/models/reflections/abstract.d.ts +5 -2
  10. package/dist/lib/models/reflections/abstract.js +0 -11
  11. package/dist/lib/models/reflections/container.d.ts +0 -8
  12. package/dist/lib/models/reflections/container.js +0 -8
  13. package/dist/lib/models/reflections/declaration.d.ts +0 -8
  14. package/dist/lib/models/reflections/declaration.js +0 -8
  15. package/dist/lib/models/reflections/kind.d.ts +2 -0
  16. package/dist/lib/models/reflections/kind.js +5 -0
  17. package/dist/lib/models/reflections/parameter.d.ts +0 -8
  18. package/dist/lib/models/reflections/parameter.js +0 -9
  19. package/dist/lib/models/reflections/project.d.ts +5 -0
  20. package/dist/lib/models/reflections/project.js +40 -9
  21. package/dist/lib/models/reflections/signature.d.ts +0 -8
  22. package/dist/lib/models/reflections/signature.js +0 -9
  23. package/dist/lib/models/reflections/type-parameter.d.ts +2 -1
  24. package/dist/lib/models/reflections/type-parameter.js +3 -0
  25. package/dist/lib/models/types.d.ts +15 -4
  26. package/dist/lib/models/types.js +20 -3
  27. package/dist/lib/output/themes/MarkedPlugin.js +4 -3
  28. package/dist/lib/output/themes/default/DefaultTheme.js +3 -9
  29. package/dist/lib/output/themes/default/layouts/default.js +1 -1
  30. package/dist/lib/output/themes/default/partials/icon.js +1 -1
  31. package/dist/lib/output/themes/default/partials/member.declaration.js +1 -1
  32. package/dist/lib/output/themes/default/partials/member.signature.body.js +1 -1
  33. package/dist/lib/output/themes/default/partials/member.signature.title.d.ts +4 -4
  34. package/dist/lib/output/themes/default/partials/member.signature.title.js +26 -13
  35. package/dist/lib/output/themes/default/partials/navigation.js +1 -1
  36. package/dist/lib/output/themes/default/partials/parameter.js +5 -5
  37. package/dist/lib/output/themes/default/partials/type.js +44 -31
  38. package/dist/lib/output/themes/default/partials/typeParameters.js +1 -1
  39. package/dist/lib/output/themes/lib.d.ts +2 -0
  40. package/dist/lib/output/themes/lib.js +13 -2
  41. package/dist/lib/serialization/schema.d.ts +1 -1
  42. package/dist/lib/serialization/schema.js +0 -1
  43. package/dist/lib/utils/entry-point.js +6 -16
  44. package/dist/lib/utils/fs.d.ts +1 -7
  45. package/dist/lib/utils/fs.js +19 -17
  46. package/dist/lib/utils/html-entities.json +2233 -0
  47. package/dist/lib/utils/html.d.ts +1 -0
  48. package/dist/lib/utils/html.js +28 -0
  49. package/dist/lib/utils/index.d.ts +3 -2
  50. package/dist/lib/utils/index.js +3 -2
  51. package/dist/lib/utils/jsx.js +8 -7
  52. package/dist/lib/utils/map.d.ts +1 -0
  53. package/dist/lib/utils/map.js +3 -0
  54. package/dist/lib/utils/options/declaration.d.ts +1 -0
  55. package/dist/lib/utils/options/index.d.ts +1 -1
  56. package/dist/lib/utils/options/readers/tsconfig.js +2 -2
  57. package/dist/lib/utils/options/readers/typedoc.js +1 -1
  58. package/dist/lib/utils/options/sources/typedoc.js +6 -0
  59. package/dist/lib/utils/paths.d.ts +7 -0
  60. package/dist/lib/utils/paths.js +15 -6
  61. package/dist/lib/utils/sort.d.ts +1 -1
  62. package/dist/lib/utils/sort.js +9 -1
  63. package/package.json +9 -9
  64. package/static/main.js +3 -3
  65. package/static/style.css +215 -91
package/static/style.css CHANGED
@@ -8,15 +8,33 @@
8
8
  --light-color-accent: #c5c7c9;
9
9
  --light-color-text: #222;
10
10
  --light-color-text-aside: #707070;
11
- --light-color-link: #4da6ff;
12
- --light-color-ts: #db1373;
13
- --light-color-ts-interface: #139d2c;
14
- --light-color-ts-enum: #9c891a;
15
- --light-color-ts-class: #2484e5;
11
+ --light-color-link: #1f70c2;
12
+
13
+ --light-color-ts-project: #b111c9;
14
+ --light-color-ts-module: var(--light-color-ts-project);
15
+ --light-color-ts-namespace: var(--light-color-ts-project);
16
+ --light-color-ts-enum: #7e6f15;
17
+ --light-color-ts-enum-member: var(--light-color-ts-enum);
18
+ --light-color-ts-variable: #4760ec;
16
19
  --light-color-ts-function: #572be7;
17
- --light-color-ts-namespace: #b111c9;
18
- --light-color-ts-private: #707070;
19
- --light-color-ts-variable: #4d68ff;
20
+ --light-color-ts-class: #1f70c2;
21
+ --light-color-ts-interface: #108024;
22
+ --light-color-ts-constructor: var(--light-color-ts-class);
23
+ --light-color-ts-property: var(--light-color-ts-variable);
24
+ --light-color-ts-method: var(--light-color-ts-function);
25
+ --light-color-ts-call-signature: var(--light-color-ts-method);
26
+ --light-color-ts-index-signature: var(--light-color-ts-property);
27
+ --light-color-ts-constructor-signature: var(--light-color-ts-constructor);
28
+ --light-color-ts-parameter: var(--light-color-ts-variable);
29
+ /* type literal not included as links will never be generated to it */
30
+ --light-color-ts-type-parameter: var(--light-color-ts-type-alias);
31
+ --light-color-ts-accessor: var(--light-color-ts-property);
32
+ --light-color-ts-get-signature: var(--light-color-ts-accessor);
33
+ --light-color-ts-set-signature: var(--light-color-ts-accessor);
34
+ /* object literal not included as it is not used and will be removed in 0.25 */
35
+ --light-color-ts-type-alias: #d51270;
36
+ /* reference not included as links will be colored with the kind that it points to */
37
+
20
38
  --light-external-icon: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100' width='10' height='10'><path fill-opacity='0' stroke='%23000' stroke-width='10' d='m43,35H5v60h60V57M45,5v10l10,10-30,30 20,20 30-30 10,10h10V5z'/></svg>");
21
39
  --light-color-scheme: light;
22
40
 
@@ -30,14 +48,32 @@
30
48
  --dark-color-text: #f5f5f5;
31
49
  --dark-color-text-aside: #dddddd;
32
50
  --dark-color-link: #00aff4;
33
- --dark-color-ts: #ff6492;
34
- --dark-color-ts-interface: #6cff87;
51
+
52
+ --dark-color-ts-project: #e14dff;
53
+ --dark-color-ts-module: var(--dark-color-ts-project);
54
+ --dark-color-ts-namespace: var(--dark-color-ts-project);
35
55
  --dark-color-ts-enum: #f4d93e;
36
- --dark-color-ts-class: #61b0ff;
37
- --dark-color-ts-function: #9772ff;
38
- --dark-color-ts-namespace: #e14dff;
39
- --dark-color-ts-private: #e2e2e2;
56
+ --dark-color-ts-enum-member: var(--dark-color-ts-enum);
40
57
  --dark-color-ts-variable: #4d68ff;
58
+ --dark-color-ts-function: #9772ff;
59
+ --dark-color-ts-class: #61b0ff;
60
+ --dark-color-ts-interface: #6cff87;
61
+ --dark-color-ts-constructor: var(--dark-color-ts-class);
62
+ --dark-color-ts-property: var(--dark-color-ts-variable);
63
+ --dark-color-ts-method: var(--dark-color-ts-function);
64
+ --dark-color-ts-call-signature: var(--dark-color-ts-method);
65
+ --dark-color-ts-index-signature: var(--dark-color-ts-property);
66
+ --dark-color-ts-constructor-signature: var(--dark-color-ts-constructor);
67
+ --dark-color-ts-parameter: var(--dark-color-ts-variable);
68
+ /* type literal not included as links will never be generated to it */
69
+ --dark-color-ts-type-parameter: var(--dark-color-ts-type-alias);
70
+ --dark-color-ts-accessor: var(--dark-color-ts-property);
71
+ --dark-color-ts-get-signature: var(--dark-color-ts-accessor);
72
+ --dark-color-ts-set-signature: var(--dark-color-ts-accessor);
73
+ /* object literal not included as it is not used and will be removed in 0.25 */
74
+ --dark-color-ts-type-alias: #ff6492;
75
+ /* reference not included as links will be colored with the kind that it points to */
76
+
41
77
  --dark-external-icon: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100' width='10' height='10'><path fill-opacity='0' stroke='%23fff' stroke-width='10' d='m43,35H5v60h60V57M45,5v10l10,10-30,30 20,20 30-30 10,10h10V5z'/></svg>");
42
78
  --dark-color-scheme: dark;
43
79
  }
@@ -53,14 +89,30 @@
53
89
  --color-text: var(--light-color-text);
54
90
  --color-text-aside: var(--light-color-text-aside);
55
91
  --color-link: var(--light-color-link);
56
- --color-ts: var(--light-color-ts);
57
- --color-ts-interface: var(--light-color-ts-interface);
58
- --color-ts-enum: var(--light-color-ts-enum);
59
- --color-ts-class: var(--light-color-ts-class);
60
- --color-ts-function: var(--light-color-ts-function);
92
+
93
+ --color-ts-module: var(--light-color-ts-module);
61
94
  --color-ts-namespace: var(--light-color-ts-namespace);
62
- --color-ts-private: var(--light-color-ts-private);
95
+ --color-ts-enum: var(--light-color-ts-enum);
96
+ --color-ts-enum-member: var(--light-color-ts-enum-member);
63
97
  --color-ts-variable: var(--light-color-ts-variable);
98
+ --color-ts-function: var(--light-color-ts-function);
99
+ --color-ts-class: var(--light-color-ts-class);
100
+ --color-ts-interface: var(--light-color-ts-interface);
101
+ --color-ts-constructor: var(--light-color-ts-constructor);
102
+ --color-ts-property: var(--light-color-ts-property);
103
+ --color-ts-method: var(--light-color-ts-method);
104
+ --color-ts-call-signature: var(--light-color-ts-call-signature);
105
+ --color-ts-index-signature: var(--light-color-ts-index-signature);
106
+ --color-ts-constructor-signature: var(
107
+ --light-color-ts-constructor-signature
108
+ );
109
+ --color-ts-parameter: var(--light-color-ts-parameter);
110
+ --color-ts-type-parameter: var(--light-color-ts-type-parameter);
111
+ --color-ts-accessor: var(--light-color-ts-accessor);
112
+ --color-ts-get-signature: var(--light-color-ts-get-signature);
113
+ --color-ts-set-signature: var(--light-color-ts-set-signature);
114
+ --color-ts-type-alias: var(--light-color-ts-type-alias);
115
+
64
116
  --external-icon: var(--light-external-icon);
65
117
  --color-scheme: var(--light-color-scheme);
66
118
  }
@@ -77,14 +129,30 @@
77
129
  --color-text: var(--dark-color-text);
78
130
  --color-text-aside: var(--dark-color-text-aside);
79
131
  --color-link: var(--dark-color-link);
80
- --color-ts: var(--dark-color-ts);
81
- --color-ts-interface: var(--dark-color-ts-interface);
82
- --color-ts-enum: var(--dark-color-ts-enum);
83
- --color-ts-class: var(--dark-color-ts-class);
84
- --color-ts-function: var(--dark-color-ts-function);
132
+
133
+ --color-ts-module: var(--dark-color-ts-module);
85
134
  --color-ts-namespace: var(--dark-color-ts-namespace);
86
- --color-ts-private: var(--dark-color-ts-private);
135
+ --color-ts-enum: var(--dark-color-ts-enum);
136
+ --color-ts-enum-member: var(--dark-color-ts-enum-member);
87
137
  --color-ts-variable: var(--dark-color-ts-variable);
138
+ --color-ts-function: var(--dark-color-ts-function);
139
+ --color-ts-class: var(--dark-color-ts-class);
140
+ --color-ts-interface: var(--dark-color-ts-interface);
141
+ --color-ts-constructor: var(--dark-color-ts-constructor);
142
+ --color-ts-property: var(--dark-color-ts-property);
143
+ --color-ts-method: var(--dark-color-ts-method);
144
+ --color-ts-call-signature: var(--dark-color-ts-call-signature);
145
+ --color-ts-index-signature: var(--dark-color-ts-index-signature);
146
+ --color-ts-constructor-signature: var(
147
+ --dark-color-ts-constructor-signature
148
+ );
149
+ --color-ts-parameter: var(--dark-color-ts-parameter);
150
+ --color-ts-type-parameter: var(--dark-color-ts-type-parameter);
151
+ --color-ts-accessor: var(--dark-color-ts-accessor);
152
+ --color-ts-get-signature: var(--dark-color-ts-get-signature);
153
+ --color-ts-set-signature: var(--dark-color-ts-set-signature);
154
+ --color-ts-type-alias: var(--dark-color-ts-type-alias);
155
+
88
156
  --external-icon: var(--dark-external-icon);
89
157
  --color-scheme: var(--dark-color-scheme);
90
158
  }
@@ -108,14 +176,30 @@ body {
108
176
  --color-text: var(--light-color-text);
109
177
  --color-text-aside: var(--light-color-text-aside);
110
178
  --color-link: var(--light-color-link);
111
- --color-ts: var(--light-color-ts);
112
- --color-ts-interface: var(--light-color-ts-interface);
113
- --color-ts-enum: var(--light-color-ts-enum);
114
- --color-ts-class: var(--light-color-ts-class);
115
- --color-ts-function: var(--light-color-ts-function);
179
+
180
+ --color-ts-module: var(--light-color-ts-module);
116
181
  --color-ts-namespace: var(--light-color-ts-namespace);
117
- --color-ts-private: var(--light-color-ts-private);
182
+ --color-ts-enum: var(--light-color-ts-enum);
183
+ --color-ts-enum-member: var(--light-color-ts-enum-member);
118
184
  --color-ts-variable: var(--light-color-ts-variable);
185
+ --color-ts-function: var(--light-color-ts-function);
186
+ --color-ts-class: var(--light-color-ts-class);
187
+ --color-ts-interface: var(--light-color-ts-interface);
188
+ --color-ts-constructor: var(--light-color-ts-constructor);
189
+ --color-ts-property: var(--light-color-ts-property);
190
+ --color-ts-method: var(--light-color-ts-method);
191
+ --color-ts-call-signature: var(--light-color-ts-call-signature);
192
+ --color-ts-index-signature: var(--light-color-ts-index-signature);
193
+ --color-ts-constructor-signature: var(
194
+ --light-color-ts-constructor-signature
195
+ );
196
+ --color-ts-parameter: var(--light-color-ts-parameter);
197
+ --color-ts-type-parameter: var(--light-color-ts-type-parameter);
198
+ --color-ts-accessor: var(--light-color-ts-accessor);
199
+ --color-ts-get-signature: var(--light-color-ts-get-signature);
200
+ --color-ts-set-signature: var(--light-color-ts-set-signature);
201
+ --color-ts-type-alias: var(--light-color-ts-type-alias);
202
+
119
203
  --external-icon: var(--light-external-icon);
120
204
  --color-scheme: var(--light-color-scheme);
121
205
  }
@@ -130,14 +214,30 @@ body {
130
214
  --color-text: var(--dark-color-text);
131
215
  --color-text-aside: var(--dark-color-text-aside);
132
216
  --color-link: var(--dark-color-link);
133
- --color-ts: var(--dark-color-ts);
134
- --color-ts-interface: var(--dark-color-ts-interface);
135
- --color-ts-enum: var(--dark-color-ts-enum);
136
- --color-ts-class: var(--dark-color-ts-class);
137
- --color-ts-function: var(--dark-color-ts-function);
217
+
218
+ --color-ts-module: var(--dark-color-ts-module);
138
219
  --color-ts-namespace: var(--dark-color-ts-namespace);
139
- --color-ts-private: var(--dark-color-ts-private);
220
+ --color-ts-enum: var(--dark-color-ts-enum);
221
+ --color-ts-enum-member: var(--dark-color-ts-enum-member);
140
222
  --color-ts-variable: var(--dark-color-ts-variable);
223
+ --color-ts-function: var(--dark-color-ts-function);
224
+ --color-ts-class: var(--dark-color-ts-class);
225
+ --color-ts-interface: var(--dark-color-ts-interface);
226
+ --color-ts-constructor: var(--dark-color-ts-constructor);
227
+ --color-ts-property: var(--dark-color-ts-property);
228
+ --color-ts-method: var(--dark-color-ts-method);
229
+ --color-ts-call-signature: var(--dark-color-ts-call-signature);
230
+ --color-ts-index-signature: var(--dark-color-ts-index-signature);
231
+ --color-ts-constructor-signature: var(
232
+ --dark-color-ts-constructor-signature
233
+ );
234
+ --color-ts-parameter: var(--dark-color-ts-parameter);
235
+ --color-ts-type-parameter: var(--dark-color-ts-type-parameter);
236
+ --color-ts-accessor: var(--dark-color-ts-accessor);
237
+ --color-ts-get-signature: var(--dark-color-ts-get-signature);
238
+ --color-ts-set-signature: var(--dark-color-ts-set-signature);
239
+ --color-ts-type-alias: var(--dark-color-ts-type-alias);
240
+
141
241
  --external-icon: var(--dark-external-icon);
142
242
  --color-scheme: var(--dark-color-scheme);
143
243
  }
@@ -538,43 +638,6 @@ input[type="checkbox"]:checked ~ svg .tsd-checkbox-checkmark {
538
638
  -o-page-break-inside: avoid;
539
639
  page-break-inside: avoid;
540
640
  }
541
- .tsd-index-panel a,
542
- .tsd-index-panel a.tsd-parent-kind-module {
543
- color: var(--color-ts);
544
- }
545
- .tsd-index-panel a.tsd-parent-kind-interface {
546
- color: var(--color-ts-interface);
547
- }
548
- .tsd-index-panel a.tsd-parent-kind-enum {
549
- color: var(--color-ts-enum);
550
- }
551
- .tsd-index-panel a.tsd-parent-kind-class {
552
- color: var(--color-ts-class);
553
- }
554
- .tsd-index-panel a.tsd-kind-module {
555
- color: var(--color-ts-namespace);
556
- }
557
- .tsd-index-panel a.tsd-kind-interface {
558
- color: var(--color-ts-interface);
559
- }
560
- .tsd-index-panel a.tsd-kind-enum {
561
- color: var(--color-ts-enum);
562
- }
563
- .tsd-index-panel a.tsd-kind-class {
564
- color: var(--color-ts-class);
565
- }
566
- .tsd-index-panel a.tsd-kind-function {
567
- color: var(--color-ts-function);
568
- }
569
- .tsd-index-panel a.tsd-kind-namespace {
570
- color: var(--color-ts-namespace);
571
- }
572
- .tsd-index-panel a.tsd-kind-variable {
573
- color: var(--color-ts-variable);
574
- }
575
- .tsd-index-panel a.tsd-is-private {
576
- color: var(--color-ts-private);
577
- }
578
641
 
579
642
  .tsd-flag {
580
643
  display: inline-block;
@@ -603,21 +666,6 @@ input[type="checkbox"]:checked ~ svg .tsd-checkbox-checkmark {
603
666
  margin-bottom: 0;
604
667
  border-bottom: none;
605
668
  }
606
- .tsd-member [data-tsd-kind] {
607
- color: var(--color-ts);
608
- }
609
- .tsd-member [data-tsd-kind="Interface"] {
610
- color: var(--color-ts-interface);
611
- }
612
- .tsd-member [data-tsd-kind="Enum"] {
613
- color: var(--color-ts-enum);
614
- }
615
- .tsd-member [data-tsd-kind="Class"] {
616
- color: var(--color-ts-class);
617
- }
618
- .tsd-member [data-tsd-kind="Private"] {
619
- color: var(--color-ts-private);
620
- }
621
669
 
622
670
  .tsd-navigation.settings {
623
671
  margin: 1rem 0;
@@ -626,9 +674,10 @@ input[type="checkbox"]:checked ~ svg .tsd-checkbox-checkmark {
626
674
  .tsd-page-navigation a {
627
675
  display: inline-flex;
628
676
  align-items: center;
629
- padding: 0.25rem 0;
677
+ padding: 0.25rem;
630
678
  color: var(--color-text);
631
679
  text-decoration: none;
680
+ box-sizing: border-box;
632
681
  }
633
682
  .tsd-navigation a {
634
683
  /* why 3rem? No idea, but it seems to work. */
@@ -1046,6 +1095,78 @@ img {
1046
1095
  background: var(--color-background-warning);
1047
1096
  }
1048
1097
 
1098
+ .tsd-kind-project {
1099
+ color: var(--color-ts-project);
1100
+ }
1101
+ .tsd-kind-module {
1102
+ color: var(--color-ts-module);
1103
+ }
1104
+ .tsd-kind-namespace {
1105
+ color: var(--color-ts-namespace);
1106
+ }
1107
+ .tsd-kind-enum {
1108
+ color: var(--color-ts-enum);
1109
+ }
1110
+ .tsd-kind-enum-member {
1111
+ color: var(--color-ts-enum-member);
1112
+ }
1113
+ .tsd-kind-variable {
1114
+ color: var(--color-ts-variable);
1115
+ }
1116
+ .tsd-kind-function {
1117
+ color: var(--color-ts-function);
1118
+ }
1119
+ .tsd-kind-class {
1120
+ color: var(--color-ts-class);
1121
+ }
1122
+ .tsd-kind-interface {
1123
+ color: var(--color-ts-interface);
1124
+ }
1125
+ .tsd-kind-constructor {
1126
+ color: var(--color-ts-constructor);
1127
+ }
1128
+ .tsd-kind-property {
1129
+ color: var(--color-ts-property);
1130
+ }
1131
+ .tsd-kind-method {
1132
+ color: var(--color-ts-method);
1133
+ }
1134
+ .tsd-kind-call-signature {
1135
+ color: var(--color-ts-call-signature);
1136
+ }
1137
+ .tsd-kind-index-signature {
1138
+ color: var(--color-ts-index-signature);
1139
+ }
1140
+ .tsd-kind-constructor-signature {
1141
+ color: var(--color-ts-constructor-signature);
1142
+ }
1143
+ .tsd-kind-parameter {
1144
+ color: var(--color-ts-parameter);
1145
+ }
1146
+ .tsd-kind-type-literal {
1147
+ color: var(--color-ts-type-literal);
1148
+ }
1149
+ .tsd-kind-type-parameter {
1150
+ color: var(--color-ts-type-parameter);
1151
+ }
1152
+ .tsd-kind-accessor {
1153
+ color: var(--color-ts-accessor);
1154
+ }
1155
+ .tsd-kind-get-signature {
1156
+ color: var(--color-ts-get-signature);
1157
+ }
1158
+ .tsd-kind-set-signature {
1159
+ color: var(--color-ts-set-signature);
1160
+ }
1161
+ .tsd-kind-type-alias {
1162
+ color: var(--color-ts-type-alias);
1163
+ }
1164
+
1165
+ /* if we have a kind icon, don't color the text by kind */
1166
+ .tsd-kind-icon ~ span {
1167
+ color: var(--color-text);
1168
+ }
1169
+
1049
1170
  * {
1050
1171
  scrollbar-width: thin;
1051
1172
  scrollbar-color: var(--color-accent) var(--color-icon-background);
@@ -1172,6 +1293,9 @@ img {
1172
1293
  top: 42px;
1173
1294
  padding-top: 1rem;
1174
1295
  }
1296
+ .site-menu {
1297
+ margin-top: 1rem;
1298
+ }
1175
1299
  }
1176
1300
 
1177
1301
  /* two sidebars */