Skip to content

Commit c9a4603

Browse files
committed
try to fix fonts
1 parent 7e1e12e commit c9a4603

File tree

4 files changed

+28
-33
lines changed

4 files changed

+28
-33
lines changed

Zero-K.info/Styles/fonts.css

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,21 @@
1212
src: url('/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
1313
url('/OpenSans-Regular.ttf') format('truetype'); /* Safari, Android, iOS */
1414
}
15+
16+
17+
@font-face {
18+
font-family: "Xolonium";
19+
font-weight: normal;
20+
src: url("/Styles/fonts/Xolonium-Regular.ttf");
21+
src:
22+
url("/Styles/fonts/Xolonium-Regular.woff") format("woff"),
23+
url("/Styles/fonts/Xolonium-Regular.otf") format("opentype");
24+
}
25+
@font-face {
26+
font-family: "Xolonium";
27+
font-weight: bold;
28+
src: url("/Styles/fonts/Xolonium-Regular.ttf");
29+
src:
30+
url("/Styles/fonts/Xolonium-Bold.woff") format("woff"),
31+
url("/Styles/fonts/Xolonium-Bold.otf") format("opentype");
32+
}

Zero-K.info/Styles/style.css

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
11
.js_tabs {}
22

3-
@font-face {
4-
font-family: "Xolonium";
5-
font-weight: normal;
6-
src: url("./fonts/Xolonium-Regular.ttf");
7-
src:
8-
url("./fonts/Xolonium-Regular.woff") format("woff"),
9-
url("./fonts/Xolonium-Regular.otf") format("opentype");
10-
}
11-
@font-face {
12-
font-family: "Xolonium";
13-
font-weight: bold;
14-
src: url("./fonts/Xolonium-Bold.ttf");
15-
src:
16-
url("./fonts/Xolonium-Bold.woff") format("woff"),
17-
url("./fonts/Xolonium-Bold.otf") format("opentype");
18-
}
19-
203
html
214
{
225
/*background: #000 url("/img/bg_bluehex.gif") fixed;*/

Zero-K.info/Views/Shared/UserDetail.cshtml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<tr>
119119
<td>
120120
<div class="avatarbg">
121-
@Html.AccountAvatar(Model)
121+
<!-- @Html.AccountAvatar(Model) -->
122122
@if (Model.Clan != null) { Html.PrintClan(Model.Clan, true, true); }
123123
else if (Model.Faction != null) { Html.PrintFaction(Model.Faction, true); }
124124
</div>
@@ -211,14 +211,7 @@
211211
</div>
212212
</div>
213213
<br class="clearfloat" />
214-
@if (Model.Faction != null)
215-
{
216-
@:Faction: @Html.PrintFaction(Model.Faction, false)
217-
}
218-
@if (Model.Clan != null)
219-
{
220-
@:Clan: @Html.PrintClan(Model.Clan)
221-
}
214+
222215
@if (Model.Faction != null || Model.Clan != null)
223216
{
224217
<br />
@@ -229,13 +222,6 @@
229222
}
230223

231224

232-
@if (Global.IsModerator)
233-
{
234-
<div class="admin">
235-
@Html.ActionLink("Admin user", "AdminUserDetail", "Users", new { id = Model.AccountID }, null)
236-
</div>
237-
}
238-
239225
@if (Global.AccountID == Model.AccountID && Model.Level <= 5 && !Model.IsDeleted)
240226
{
241227
@Html.IncludeWiki("NewbieIntro")
@@ -258,6 +244,13 @@
258244
</div>
259245

260246

247+
@if (Global.IsModerator)
248+
{
249+
<div class="admin">
250+
@Html.ActionLink("Admin user", "AdminUserDetail", "Users", new { id = Model.AccountID }, null)
251+
</div>
252+
}
253+
261254
<div id="usr_commanders" class="">
262255
<h3>Commanders: </h3>
263256

Zero-K.info/asp.net.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@
336336
<Content Include="Img\border.png" />
337337
<Content Include="Img\btn_donateCC_LG.gif" />
338338
<Content Include="Img\bullet.png" />
339+
<Content Include="Img\chat.png" />
339340
<Content Include="Img\clans\3.png" />
340341
<Content Include="Img\conduct.png" />
341342
<Content Include="Img\delete_icon.png" />

0 commit comments

Comments
 (0)