Skip to content

Commit 2f89227

Browse files
committed
Apply some styling changes to the colony view
1 parent baf6088 commit 2f89227

File tree

2 files changed

+47
-37
lines changed

2 files changed

+47
-37
lines changed

src/Public/static/css/stu.css

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,6 +1535,20 @@ td.populationValue img {
15351535
vertical-align: middle;
15361536
}
15371537

1538+
div.colonyInfoContainer {
1539+
display: grid;
1540+
grid-template-columns: 49% 49%;
1541+
column-gap: 2%;
1542+
}
1543+
1544+
div.colonyInfoContainer img {
1545+
vertical-align: middle;
1546+
}
1547+
1548+
div.colonyInfoContainer div {
1549+
line-height: 1.8em;
1550+
}
1551+
15381552
@media (min-width: 1025px) and (max-width: 1280px) {
15391553
div.container {
15401554
width: 1000px;

src/html/colonymacros.xhtml

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -547,46 +547,42 @@
547547
</div>
548548
</div>
549549
<br />
550-
<div class="box">
551-
<div class="box_title">Informationen</div>
552-
<div class="box_body">
553-
<img src="/assets/planets/${COLONY/getColonyClassId}.png" style="width: 15px; height: 15px;" /> <span>Planet
554-
<span tal:replace="COLONY/getPlanetName" /></span> (${COLONY/getSX}|${COLONY/getSY})
555-
<span>in Sternensystem</span>
556-
<tr>
557-
<td>
558-
<tal:block tal:condition="STARSYSTEM_ENTRY_TAL/wasDiscovered">
559-
<a href="database.php?SHOW_ENTRY=1&cat=7&ent=${STARSYSTEM_ENTRY_TAL/getId}"
560-
title="Karte des Systems öffnen">
561-
<img src="assets/map/${COLONY/getSystem/getMapField/getFieldId}.png"
562-
style="width: 15px; height: 15px;" />
563-
<span>${COLONY/getSystem/getName}
564-
(${COLONY/getSystem/getCx}|${COLONY/getSystem/getCy})</span>
565-
</a>
566-
</tal:block>
567-
<tal:block tal:condition="not:STARSYSTEM_ENTRY_TAL/wasDiscovered">
568-
<img src="assets/map/${COLONY/getSystem/getMapField/getFieldId}.png" style="width: 15px; height: 15px;"
569-
title="Sternensystem" />
570-
<span>${COLONY/getSystem/getName}
571-
(${COLONY/getSystem/getCx}|${COLONY/getSystem/getCy})</span>
572-
</tal:block>
573-
</td>
574-
</tr>
575-
<br />
576-
<tr>
577-
<td>
578-
<img src="assets/buttons/t_${COLONY/getDayTimePrefix}.png" title="${COLONY/getDayTimeName}" />
550+
<div class="colonyInfoContainer">
551+
<div class="box">
552+
<div class="box_title">Planet</div>
553+
<div class="box_body">
554+
<div>
555+
<img src="/assets/planets/${COLONY/getColonyClassId}.png" style="width: 30px; height: 30px;" />
556+
<span tal:replace="COLONY/getPlanetName" />(${COLONY/getSX}|${COLONY/getSY})
557+
</div>
558+
<div>
559+
<img src="assets/buttons/t_${COLONY/getDayTimePrefix}.png" tal:attributes="title COLONY/getDayTimeName" />
579560
<span>${COLONY/getColonyTimeHour}:${COLONY/getColonyTimeMinute} Uhr</span>
580-
</td>
581-
<td>
582-
<img src="assets/buttons/classm.png" title="Eigenrotationsdauer" /> <span
583-
tal:content="formatSeconds:COLONY/getRotationTime">
584-
ROTATIONTIME</span>
585-
</td>
586-
</tr>
561+
<img src="assets/buttons/classm.png" title="Eigenrotationsdauer" alt="Eigenrotationsdauer" />
562+
<span tal:content="formatSeconds:COLONY/getRotationTime"> ROTATIONTIME</span>
563+
</div>
564+
</div>
565+
</div>
566+
<div class="box">
567+
<div class="box_title">Sternensystem</div>
568+
<div class="box_body">
569+
<tal:block tal:condition="STARSYSTEM_ENTRY_TAL/wasDiscovered">
570+
<a href="database.php?SHOW_ENTRY=1&cat=7&ent=${STARSYSTEM_ENTRY_TAL/getId}"
571+
title="Karte des Systems öffnen">
572+
<img src="assets/map/${COLONY/getSystem/getMapField/getFieldId}.png" title="Sternensystem" />
573+
<span>${COLONY/getSystem/getName} (${COLONY/getSystem/getCx}|${COLONY/getSystem/getCy})</span>
574+
</a>
575+
</tal:block>
576+
<tal:block tal:condition="not:STARSYSTEM_ENTRY_TAL/wasDiscovered">
577+
<img src="assets/map/${COLONY/getSystem/getMapField/getFieldId}.png" title="Sternensystem" />
578+
<span>${COLONY/getSystem/getName} (${COLONY/getSystem/getCx}|${COLONY/getSystem/getCy})</span>
579+
</tal:block>
580+
<div>
581+
Typ: <span tal:replace="COLONY/getSystem/getSystemType/getDescription">TYPE</span>
582+
</div>
583+
</div>
587584
</div>
588585
</div>
589-
<br />
590586
<tal:block tal:condition="COLONY/getUserDepositMinings">
591587
<div class="box">
592588
<div class="box_title">Geschürfte Ressourcen</div>

0 commit comments

Comments
 (0)