Skip to content
This repository was archived by the owner on Jul 6, 2022. It is now read-only.

Commit fff5352

Browse files
committed
UI tweaks; cleaning up some css scars.
1 parent d51467a commit fff5352

4 files changed

Lines changed: 42 additions & 51 deletions

File tree

app/index.html

Lines changed: 27 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,7 @@
4040
<div id="hud" class="main-content"></div>
4141
<div id="system-map" class="main-content active"></div>
4242
<div id="hostiles" class="main-content">
43-
<table id="hostiles-list" class="hostile">
44-
<thead>
45-
<tr>
46-
<th class="ship-icon">&#160;</th>
47-
<th class="name">Name</th>
48-
<th class="alliance">Alliance</th>
49-
<th class="ship-type">Ship Type</th>
50-
<th class="system">System</th>
51-
<th class="reported-at">Time</th>
52-
<th class="actions">&#160;</th>
53-
</tr>
54-
</thead>
55-
<tbody>
56-
</tbody>
57-
</table>
43+
<div class="list"></div>
5844
</div>
5945
<div id="dicks" class="main-content">
6046
<table id="hostiles-list" class="hostile">
@@ -235,30 +221,32 @@ <h3>{{hostiles}} hostile{{#if hostiles}}s{{/if}} in {{name}}</h3>
235221
</script>
236222

237223
<script type="text/x-handlebars-template" id="hostileTemplate">
238-
<tr id="hostile-{{id}}">
239-
<td class="ship-icon">{{{shipIcon}}}</td>
240-
<td class="name"><a href="javascript:CCPEVE.showInfo(1377, {{id}});">{{name}}</a></td>
241-
<td class="alliance">
242-
{{#if allianceName}}
243-
<a href="javascript:CCPEVE.showInfo(16159, {{allianceID}});">&lt;{{allianceName}}&gt;</a>
244-
{{else}}
245-
No Alliance
246-
{{/if}}
247-
</td>
248-
<td class="ship-type" onClick="UIPanels.updateHostileDetailsPanel('{{id}}');">
249-
{{#if shipTypeId}}
250-
<i class="fa fa-eye"></i> <a href="javascript:CCPEVE.showInfo({{shipTypeId}});">{{shipType}}</a>
251-
{{else}}
252-
<i class="fa fa-eye-slash"></i> Non Visual
253-
{{/if}}
254-
</td>
255-
<td class="system {{#if isDocked}}docked{{/if}}"><a href="javascript:CCPEVE.showInfo(5,{{systemId}});">{{systemName}}</a></td>
256-
<td class="reported-at"><a title="Reported by {{reporterName}}">{{reported_at}}</a></td>
257-
<td class="actions">
258-
<a title="Set Destination" onClick="CCPEVE.setDestination({{systemId}})"><i class="fa fa-map-marker" title="Set Destination"></i></a>
259-
{{killboard_link name id}}
260-
</td>
261-
</tr>
224+
<table id="hostiles-list" class="hostile">
225+
<tr id="hostile-{{id}}">
226+
<td class="ship-icon">{{{shipIcon}}}</td>
227+
<td class="name"><a href="javascript:CCPEVE.showInfo(1377, {{id}});">{{name}}</a></td>
228+
<td class="alliance">
229+
{{#if allianceName}}
230+
<a href="javascript:CCPEVE.showInfo(16159, {{allianceID}});">&lt;{{allianceName}}&gt;</a>
231+
{{else}}
232+
No Alliance
233+
{{/if}}
234+
</td>
235+
<td class="ship-type" onClick="UIPanels.updateHostileDetailsPanel('{{id}}');">
236+
{{#if shipTypeId}}
237+
<i class="fa fa-eye"></i> <a href="javascript:CCPEVE.showInfo({{shipTypeId}});">{{shipType}}</a>
238+
{{else}}
239+
<i class="fa fa-eye-slash"></i> Non Visual
240+
{{/if}}
241+
</td>
242+
<td class="system {{#if isDocked}}docked{{/if}}"><a href="javascript:CCPEVE.showInfo(5,{{systemId}});">{{systemName}}</a></td>
243+
<td class="reported-at"><a title="Reported by {{reporterName}}">{{reported_at}}</a></td>
244+
<td class="actions">
245+
<a title="Set Destination" onClick="CCPEVE.setDestination({{systemId}})"><i class="fa fa-map-marker" title="Set Destination"></i></a>
246+
{{killboard_link name id}}
247+
</td>
248+
</tr>
249+
</table>
262250
</script>
263251

264252
<!-- build:js /js/lib.js -->

app/js/Data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ var Data = {
6868
hud: $('#hud'),
6969
map: $('#system-map'),
7070
hostiles: $('#hostiles'),
71-
hostiles_list: $('#hostiles > table > tbody'),
71+
hostiles_list: $('#hostiles > .list'),
7272
members: $('#members'),
7373
events: $('#events'),
7474
scans: $('#scans')

app/js/UI.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ var UI = {
3939
Data.ui.statusClear.on('click', $.proxy(UI.submitStatusClear, null));
4040
Data.ui.statusHostile.on('click', $.proxy(UIPanels.showStatusPanel, null, false));
4141

42-
Data.ui.hostiles_list.slimScroll({
43-
height: 'auto',
44-
color: '#ffcc2a',
45-
alwaysVisible: true
46-
});
42+
// Data.ui.hostiles_list.slimScroll({
43+
// height: 'auto',
44+
// color: '#ffcc2a',
45+
// alwaysVisible: true
46+
// });
4747
},
4848

4949
submitStatusClear: function() {

app/styles/main.css

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,20 @@ div#page, div#content-wrapper { position: relative; height: 100%; width: 100%; b
4040
.sub-bar.left { left: 0 }
4141
.sub-bar.right { right: 0 }
4242

43-
#top-bar, #top-menu, #bottom-bar, #bottom-menu, .sub-bar.left, .sub-bar.right, .member td {
43+
#top-bar, #top-menu, #bottom-bar, #bottom-menu, .sub-bar.left, .sub-bar.right, .member td, .hostile td {
4444
background-color:#222;
4545
border-bottom: 0.2rem solid #181818;
4646
height: 2.4rem
4747
}
4848
#top-bar, #top-bar .sub-bar.right { background-color: #111; }
49-
#bottom-bar .sub-bar.left { background-color: transparent; }
49+
#bottom-bar .sub-bar.left { background-color: transparent; border-top: 0; }
5050

51-
#top-bar, #top-menu, #bottom-bar, #bottom-menu, .sub-bar.left, .sub-bar.right{
51+
#top-bar, #top-menu, #bottom-bar, #bottom-menu, .sub-bar.left, .sub-bar.right {
52+
border-top: 0.16rem solid #666;
53+
border-bottom: 0.16rem solid #333;
54+
background-color: #282828;
55+
position: fixed;
5256
z-index: 6;
53-
position: fixed
5457
}
5558
.sub-bar.left { padding-left: 0.5rem; z-index: 7 !important; }
5659

@@ -186,7 +189,7 @@ div#page, div#content-wrapper { position: relative; height: 100%; width: 100%; b
186189
padding: 0.3rem 1rem 0rem 1rem;
187190
cursor: pointer;
188191
background-color: #222;
189-
border-top: 0.16rem solid #666;
192+
border-top: 0.16rem solid transparent;
190193
border-left: 0.16rem solid #171717;
191194
border-right: 0.16rem solid #171717;
192195
}
@@ -231,7 +234,7 @@ input#info-string-fleet-key {
231234
*/
232235

233236
#hud {
234-
margin-top: 2px;
237+
margin-top: 3px;
235238
}
236239

237240
#hud div {

0 commit comments

Comments
 (0)