Skip to content

Commit 36b12c8

Browse files
TGRHavocTGRHavoc
committed
refactor: update to latest development commit
I can't remember what I changed but, something has so...
1 parent 4eea576 commit 36b12c8

File tree

4 files changed

+82
-30
lines changed

4 files changed

+82
-30
lines changed

‎index.php

+37-6
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
.gm-style .gm-style-mtc label,.gm-style .gm-style-mtc div{font-weight:400}
5151

52-
@media print { .gm-style .gmnoprint, .gmnoprint { display:none }}@media screen { .gm-style .gmnoscreen, .gmnoscreen { display:none }}
52+
@media print { .gm-style .gmnoprint, .gmnoprint { display:none }}@media screen { .gm-style .gmnoscreen, .gmnoscreen { display:none }}
5353

5454
.gm-style {
5555
font: 400 11px Roboto, Arial, sans-serif;
@@ -187,15 +187,22 @@
187187
Hide/Show Controls
188188
</a>
189189
</li>
190+
191+
<li class="nv-item">
192+
<a class="nav-link" role="button" id="blipToggle" data-toggle="collapse" data-target="#blip-filter-dropdown" aria-controls="blip-filter-dropdown" aria-label="Toggle blip controls" aria-expanded="false">
193+
Blip controls
194+
</a>
195+
</li>
196+
190197
</ul>
191198
</div>
192199
</div>
193200

194201
</nav>
195202

196203
<div id="wrapper" class="container-fluid">
197-
<div class="row">
198-
<div id="sidebar" class="col-md-2 col-sm-6 col-xs-12 float-left collapse">
204+
<div id="control-wrapper" >
205+
<div id="sidebar" class="custom-menu col-md-2 col-sm-6 col-xs-12 float-left collapse">
199206
<div class="list-group border-0 card text-center text-md-left" style="padding: 8px 0;">
200207

201208
<a class="nav-header">Controls</a>
@@ -254,10 +261,34 @@
254261
</div>
255262
</div>
256263

257-
<main id="map-holder" class="col-12 main" >
258-
<div id="map-canvas" style="position: relative; overflow: hidden; background-color: rgb(15, 168, 210);"></div>
259-
</main>
264+
<div id="blip-filter-dropdown" class="custom-menu col-sm-0 col-xs-0 col-md-12 collapse">
265+
<div class="list-group border-0 card text-center text-md-left" style="padding: 8px 0;">
266+
267+
<a class="nav-header">Blip Controls</a>
268+
269+
<div class="row">
270+
271+
<a class="list-group-item d-inline-block collapsed" href="#">
272+
<span class="d-md-inline">Refresh Blips</span>
273+
</a>
274+
<a class="list-group-item d-inline-block collapsed" href="#">
275+
<span class="d-md-inline">Refresh Blips</span>
276+
</a>
277+
<a class="list-group-item d-inline-block collapsed" href="#">
278+
<span class="d-md-inline">Refresh Blips</span>
279+
</a>
280+
<a class="list-group-item d-inline-block collapsed" href="#">
281+
<span class="d-md-inline">Refresh Blips</span>
282+
</a>
283+
</div>
284+
285+
</div>
286+
</div>
260287
</div>
288+
289+
<main id="map-holder" class="col-12 main" >
290+
<div id="map-canvas" style="position: relative; overflow: hidden; background-color: rgb(15, 168, 210);"></div>
291+
</main>
261292
</div>
262293

263294
<?php

‎js/src/init.js

+7
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ function initPage() {
3535
$(window).on("load resize", function() {
3636
$(".map-tab-content").height((($("#tab-content").height() - $(".page-title-1").height()) - ($("#map-overlay-global-controls").height() * 4.2)));
3737
});
38+
39+
var $myGroup = $('#control-wrapper');
40+
$myGroup.on('show.bs.collapse','.collapse', function() {
41+
console.log("hidding?");
42+
$myGroup.find('.collapse.show').collapse('hide');
43+
});
44+
3845
}
3946

4047
function getBlipMarkerId(blip){

‎style/src/style.css

+37-23
Original file line numberDiff line numberDiff line change
@@ -182,20 +182,20 @@ input[type=text] {display:inline;}
182182
text-align: center;
183183
}
184184

185-
#sidebar {
185+
.custom-menu {
186186
overflow: hidden;
187187
overflow-y: scroll;
188188
z-index: 3;
189189
background-color: #333;
190190
}
191-
#sidebar .list-group {
191+
.custom-menu .list-group {
192192
background-color: #333;
193193
}
194-
#sidebar i {
194+
.custom-menu i {
195195
margin-right: 6px;
196196
}
197197

198-
#sidebar .list-group-item {
198+
.custom-menu .list-group-item {
199199
border-radius: 0;
200200
background-color: #333;
201201
color: #ccc;
@@ -207,12 +207,12 @@ input[type=text] {display:inline;}
207207
}
208208

209209
/* highlight active menu */
210-
#sidebar .list-group-item:not(.collapsed) {
210+
.custom-menu .list-group-item:not(.collapsed) {
211211
background-color: #222;
212212
}
213213

214214
/* closed state */
215-
#sidebar .list-group .list-group-item[aria-expanded="false"]::after {
215+
.custom-menu .list-group .list-group-item[aria-expanded="false"]::after {
216216
content: " \f0d7";
217217
font-family: FontAwesome;
218218
display: inline;
@@ -221,10 +221,10 @@ input[type=text] {display:inline;}
221221
}
222222

223223
/* open state */
224-
#sidebar .list-group .list-group-item[aria-expanded="true"] {
224+
.custom-menu .list-group .list-group-item[aria-expanded="true"] {
225225
background-color: #222;
226226
}
227-
#sidebar .list-group .list-group-item[aria-expanded="true"]::after {
227+
.custom-menu .list-group .list-group-item[aria-expanded="true"]::after {
228228
content: " \f0da";
229229
font-family: FontAwesome;
230230
display: inline;
@@ -233,53 +233,53 @@ input[type=text] {display:inline;}
233233
}
234234

235235
/* level 1*/
236-
#sidebar .list-group .collapse .list-group-item,
237-
#sidebar .list-group .collapsing .list-group-item {
236+
.custom-menu .list-group .collapse .list-group-item,
237+
.custom-menu .list-group .collapsing .list-group-item {
238238
padding-left: 20px;
239239
}
240240

241241
/* level 2*/
242-
#sidebar .list-group .collapse > .collapse .list-group-item,
243-
#sidebar .list-group .collapse > .collapsing .list-group-item {
242+
.custom-menu .list-group .collapse > .collapse .list-group-item,
243+
.custom-menu .list-group .collapse > .collapsing .list-group-item {
244244
padding-left: 30px;
245245
}
246246

247247
/* level 3*/
248-
#sidebar .list-group .collapse > .collapse > .collapse .list-group-item {
248+
.custom-menu .list-group .collapse > .collapse > .collapse .list-group-item {
249249
padding-left: 40px;
250250
}
251251

252252
@media (max-width:768px) {
253-
#sidebar {
253+
.custom-menu {
254254
overflow-x: visible;
255255
transition: all 0.25s ease;
256256
transform: translateX(-45px);
257257
position: fixed;
258258
}
259259

260-
#sidebar.show {
260+
.custom-menu.show {
261261
transform: translateX(0);
262262
}
263263

264-
#sidebar::-webkit-scrollbar{ width: 0px; }
264+
.custom-menu::-webkit-scrollbar{ width: 0px; }
265265

266-
#sidebar, #sidebar .list-group {
266+
.custom-menu, .custom-menu .list-group {
267267
min-width: 35px;
268268
}
269269
/* overlay sub levels on small screens */
270-
#sidebar .list-group .collapse.show, #sidebar .list-group .collapsing {
270+
.custom-menu .list-group .collapse.show, .custom-menu .list-group .collapsing {
271271
position: relative;
272272
z-index: 1;
273273
width: 190px;
274274
top: 0;
275275
}
276-
#sidebar .list-group > .list-group-item {
276+
.custom-menu .list-group > .list-group-item {
277277
text-align: center;
278278
padding: .75rem .5rem;
279279
}
280280
/* hide caret icons of top level when collapsed */
281-
#sidebar .list-group > .list-group-item[aria-expanded="true"]::after,
282-
#sidebar .list-group > .list-group-item[aria-expanded="false"]::after {
281+
.custom-menu .list-group > .list-group-item[aria-expanded="true"]::after,
282+
.custom-menu .list-group > .list-group-item[aria-expanded="false"]::after {
283283
display:none;
284284
}
285285
}
@@ -288,7 +288,7 @@ input[type=text] {display:inline;}
288288
visibility: visible;
289289
height: 100vh;
290290
}
291-
#sidebar.collapsing {
291+
.custom-menu.collapsing {
292292
visibility: visible;
293293
height: 0;
294294
-webkit-transition-property: height, visibility;
@@ -316,6 +316,20 @@ input[type=text] {display:inline;}
316316
float: left;
317317
}
318318

319-
#sidebar span.badge {
319+
.custom-menu span.badge {
320320
font-size: 100%;
321321
}
322+
323+
#blip-filter-dropdown{
324+
width: 100%;
325+
}
326+
327+
#blip-filter-dropdown.collapse.show{
328+
height: 100%;
329+
}
330+
331+
#blip-filter-dropdown .list-group-item{
332+
width: 150px;
333+
float: left;
334+
border: 1px solid rgba(0, 0, 0, 0.125);
335+
}

‎utils/config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Config{
2828

2929
// Set to false to enable the miinified versions of JS and CSS files
3030
// that should speed up content delivery on production websites
31-
public $debug = false;
31+
public $debug = true;
3232

3333
// Set to the IP of your FiveM server (public address).
3434
public $fivemIP = "127.0.0.1";

0 commit comments

Comments
 (0)