Skip to content

Commit 864e886

Browse files
TGRHavocTGRHavoc
committed
refactor: various fixes and changes
1 parent 2af6895 commit 864e886

File tree

3 files changed

+10
-141
lines changed

3 files changed

+10
-141
lines changed

‎index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
// Set to the IP of the GTA V server running "live_map"
7272
//var _SETTINGS_queryIp = "http://identity/map-api";
7373
74-
var _SETTINGS_socketUrl = "wss://identityrp.co.uk:30121"
74+
var _SETTINGS_socketUrl = "ws://localhost:30121"
7575
7676
</script>
7777

‎js/src/markers.js

+7
Original file line numberDiff line numberDiff line change
@@ -578,5 +578,12 @@ var MarkerTypes = {
578578
origin: new google.maps.Point( customImageWidth * 4, customImageHeight * 13 ),
579579
anchor: new google.maps.Point( customImageWidth/2, customImageHeight ),
580580
scaledSize: new google.maps.Size( 1024/2,1024/2 )
581+
},
582+
jerryCan : {
583+
icon: "blips_texturesheet.png",
584+
size: new google.maps.Size( customImageWidth, customImageHeight ),
585+
origin: new google.maps.Point( customImageWidth * 8, customImageHeight * 9 ),
586+
anchor: new google.maps.Point( customImageWidth/2, customImageHeight ),
587+
scaledSize: new google.maps.Size( 1024/2,1024/2 )
581588
}
582589
};

‎style/style.css

+2-140
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,4 @@
11

2-
/* General/Typography ---------------------- */
3-
html { background-color: #333439;height:100%;width:100%;overflow:hidden;}
4-
body { background-color: #333439;margin:0;padding:0;font-family: 'Droid Sans', sans-serif;color:#c2c2c2;height:100%;width:100%;overflow:hidden;}
5-
html, html a {-webkit-font-smoothing: antialiased !important;text-shadow: 1px 1px 1px rgba(0,0,0,0.004);}
6-
ul {list-style-type: none; padding:0; margin:0;}
7-
h1 { font-size: 32px; }
8-
h1 span { color:#3399FF;}
9-
h2 { font-size: 28px; }
10-
h3 { font-size: 23px; }
11-
h4 { font-size: 18px; }
12-
h5 { font-size: 15px;}
13-
h6 { font-size: 13px; }
14-
a { color: #3399FF; text-decoration: none; line-height: inherit; }
15-
a:hover { color: #FFFFFF; }
16-
a:focus { color: #FFFFFF; outline: none; }
17-
18-
.a-italic {font-style:italic;}
19-
.a-bold {font-weight:bold;}
20-
.a-linethrough {text-decoration:line-through;}
21-
.a-center {text-align:center;}
22-
.a-right {text-align:right;}
23-
.a-left {text-align:left;}
24-
.a-xsmall {font-size:0.6em;}
25-
.div-middle {position: fixed;left:50%;top:50%;}
26-
.div-center {margin:0 auto;}
27-
28-
.block {display:block;}
29-
.inline {display:inline;}
30-
31-
.clear { clear: both; }
32-
.left { float: left; }
33-
.right { float: right; }
34-
.hidden { display: none; }
35-
36-
/* UI/General ---------------------- */
37-
.page-title {font-weight:bold;font-size:1.3em;border-bottom:1px solid #fff;padding-left:10px;}
38-
.page-title-1 {font-weight:bold;font-size:1.3em;border-bottom:2px solid #636363;padding: 5px;padding-left:10px;margin-bottom:10px;}
39-
.ui-widget {margin-bottom: 20px;}
40-
.ui-widget strong { font-weight: 900; }
41-
.ui-widget p {margin: 0.5em 0;line-height:1;font-size: 0.8em;}
42-
43-
/* UI/Forms ---------------------- */
44-
select {background-color:#fff;font-family: inherit;border: 1px solid #ccc;-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);color: rgba(0,0,0,0.75);font-size: .875em;height: 2.3125em;width: 100%;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;-webkit-transition: 0 .45s .45s ease-in-out;-moz-transition: 0 .45s .45s ease-in-out;transition: box-shadow .45s .45s ease-in-out;margin: 0 0 1em;padding: .5em;}
45-
fieldset legend {color: #D6D6D6;background: transparent;}
46-
fieldset{border-color: #3f3f3f;-moz-border-radius:5px;border-radius: 5px;-webkit-border-radius: 5px;}
47-
input[type=text] {display:inline;}
48-
.form-button {text-align: center;margin: 0 auto;}
49-
.button {width: auto;cursor: pointer;display: inline-block; line-height: 1; margin: 0; outline: none; padding: 5px 10px 6px; position: relative; text-align: center; text-decoration: none; background-color:#3399FF;-webkit-box-shadow: inset 0px -3px 1px rgba(0, 0, 0, 0.45), 0px 2px 2px rgba(0, 0, 0, 0.25);-moz-box-shadow: inset 0px -3px 1px rgba(0, 0, 0, 0.45), 0px 2px 2px rgba(0, 0, 0, 0.25);box-shadow: inset 0px -3px 1px rgba(0, 0, 0, 0.45), 0px 2px 2px rgba(0, 0, 0, 0.25);-webkit-border-radius: 3px;-moz-border-radius: 3px;border-radius: 3px;border:1px solid #2d2d2d}
50-
.button:hover {background-color:#9EC3FF;}
51-
.red-bg {background-color:#FF6161 !important;}
52-
.red-bg:hover {background-color:#FFB0B0 !important;}
53-
.required {color:#ed2024;}
54-
.error {color:#bc433f;}
55-
.ok {color:#3db656;}
56-
.input-coord {width:125px!important;}
57-
.small-select {width:55px;}
58-
.small-input {width:75px !important;}
59-
.medium-input {width:175px !important;}
60-
#multi_find_data {height: 200px;}
61-
62-
/* UI/Classes ----------------------*/
63-
.marker-item {display: inline-block;border-bottom: 1px solid #636363;line-height:18px;width:100%;}
64-
.marker-item a {color: #3399FF !important;}
65-
.marker-item a:hover {color: #3399FF !important;text-decoration:underline !important;}
66-
.marker-item img {width:16px;height:16px;vertical-align:middle;border:none;}
67-
.three-split {width: 33.3%;}
68-
.marker-desc {float: left;word-wrap:break-word;width:auto;padding: 5px 0;}
69-
.marker-options {float: right;width:90px;padding:5px;}
70-
.no-margin{margin:0;}
71-
.no-padding {padding:0;}
72-
.fill {width:100%;height:100%;}
73-
.map-tab-content {margin:0 auto;overflow: auto;overflow-x: hidden;height:100%;padding:10px;}
74-
.map-overlay-content {padding:0;margin:0;height:100%;}
75-
.map-overlay-content ul {padding:0;margin:0;}
76-
.button input {position: absolute;top: 0;right: 0;margin: 0;opacity: 0;-ms-filter: 'alpha(opacity=0)';font-size: 1em;direction: ltr;cursor: pointer;}
77-
.fix-row label {display:block;vertical-align: middle;padding: 8px 0;}
78-
.fix-row input {float:right;}
79-
.info-window {padding:10px;}
80-
.info-icon {background-image: url(../images/icons/info.png);background-repeat:no-repeat;background-position: center center;float:left;width:32px;height:32px;margin-right:5px;}
81-
.info-header-box {height:33px;border-bottom:1px solid #333;margin-bottom:2px;}
82-
.info-header {float:left;font-size:1.8em!important;font-weight:bold!important;color:#333!important;padding-top:3px;}
83-
.info-body {color:#333 !important;}
84-
.info-body-row {padding: 2px 0;color:#333 !important;}
85-
86-
/* UI/Div ---------------------- */
87-
#wrapper {position: relative;width:100%;height:100%;min-height:100%;position:relative;}
88-
#logo-box{background-color: #333439;padding: 5px; height: 104px; width: 104px;position:absolute;overflow:hidden;z-index: 99;bottom: 0;right: 0;border-radius:15px 0 0 0;}
89-
#content {width:100%;height:100%;}
90-
#map-holder {position:absolute;right:0;bottom:0;top:0;height:100%;left: 350px;overflow:hidden;padding-bottom:90px;}
91-
#map-canvas {width:100%;height:100%;background-color:#0fa8d2;}
92-
#map-overlay {background-color:#333439;width:340px;height:100%;position: absolute; top: 0; right: -340px; z-index: 99;}
93-
#map-overlay .inner {background-color:#333439;width:350px;height:100%;position: absolute; top: 0; right: 0; z-index: 99;}
94-
#map-overlay-slide {float:left;background-color:#333439;width:30px;padding:35px 15px;margin-left:-30px;margin-top:50%;cursor:pointer;border-radius:5px 0 0 5px;}
95-
#map-overlay-global-controls {display: block;width:100%;margin:0 auto;position:absolute;bottom: 0;left:0;padding: 10px 2px;border-top:2px solid #636363;}
96-
#tab-nav {background-color:#fff;height:28px;}
97-
#tab-content {margin:0 auto;height:100%;width:100%;}
98-
#map-overlay-global-navigation {margin:0;padding:0;width:100%;height:29px;}
99-
#map-overlay-global-navigation li {float:left;margin:0;padding:0;text-align:center;width:33.3%;}
100-
#map-overlay-global-navigation a {background-color:#fff;width:100%;}
101-
#map-overlay-global-navigation li a {display:block;width:100%;color:#333;padding:8px 14px 8px 14px;text-decoration:none;font-size:9px;font-family:Verdana, Arial, Helvetica, sans-serif;font-weight:bold;text-transform:uppercase;}
102-
#map-overlay-global-navigation li a:hover {background-color:#3399FF;color:#fff;}
103-
#map-overlay-global-navigation li a.active {background-color:#333439;color:#fff;}
104-
105-
#ad-box {position: absolute; bottom: 0;left: 0;width:100%;margin:0 auto;}
106-
#google-ads {width:100%;max-height:90px;margin:0 auto;}
107-
#paypal-donate {background-color:#333439;width:400px;padding:5px;font-size: 11px;}
108-
109-
#info-button {background-color:#333439;width: 24px; height: 24px;padding:4px;position: absolute; bottom: 0;right: 0;margin-bottom:100px;border-radius:5px 0 0 0;z-index: 99;}
110-
#about-box {background-color:#333439;width:100%;height:90px;padding:5px;position: absolute; bottom: 0;right: 0;text-align:right;z-index: 99;}
111-
112-
/* UI/Fixes ---------------------- */
113-
.gm-style img { max-width: none; }
114-
.gm-style label { width: auto; display: inline; }
115-
116-
/* UI/Overides --------------------- */
117-
#cookieChoiceInfo { background-color: #333!important; }
118-
119-
/* SIDEBAR */
120-
#side-bar {
121-
position: absolute;
122-
top: 0;
123-
left: 0;
124-
width: 350px;
125-
height: 100%;
126-
background-color: #f1f1f1;
127-
-moz-box-shadow: 2px 0 3px 0 #888;
128-
-webkit-box-shadow: 2px 0 3px 0 #888;
129-
box-shadow: 2px 0 3px 0 #888;
130-
z-index:101;
131-
-webkit-transition: all 0.3s linear;
132-
-moz-transition: all 0.3s linear;
133-
-o-transition: all 0.3s linear;
134-
transition: all 0.3s linear;
135-
-webkit-backface-visibility: hidden;
136-
-moz-backface-visibility: hidden;
137-
-ms-backface-visibility: hidden;
138-
backface-visibility: hidden;
139-
}
1402
/* General/Typography ---------------------- */
1413
html { background-color: #333439;height:100%;width:100%;overflow:hidden;}
1424
body { background-color: #333439;margin:0;padding:0;font-family: 'Droid Sans', sans-serif;color:#c2c2c2;height:100%;width:100%;overflow:hidden;}
@@ -220,7 +82,7 @@ input[type=text] {display:inline;}
22082
.info-header-box {height:33px;border-bottom:1px solid #333;margin-bottom:2px;}
22183
.info-header {float:left;font-size:1.8em!important;font-weight:bold!important;color:#333!important;padding-top:3px;}
22284
.info-body {color:#333 !important;}
223-
.info-body-row {padding: 2px 0;color:#333 !important;}
85+
.info-body-row {padding: 2px 0;color:#333 !important; margin: 0;}
22486

22587
/* UI/Div ---------------------- */
22688
#wrapper {position: relative;width:100%;height:100%;min-height:100%;position:relative;}
@@ -281,5 +143,5 @@ input[type=text] {display:inline;}
281143
font-size: 1.25em;
282144
}
283145
.row .info-body-row{
284-
margin-left: 0;
146+
margin: 0;
285147
}

0 commit comments

Comments
 (0)