starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 08:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38 from Mycroft-Studios/master

Browse Source 
[Refactor] UI Changes
This commit is contained in:
FuraXx
2021-04-25 11:11:33 +02:00
committed by GitHub
parent 2d46087ade ce6703133a
commit c402e75d89
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+2 -2
View File
@@ -2,8 +2,8 @@ ESX = nil
Citizen.CreateThread(function()
while ESX == nil do
Citizen.Wait(5)
TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
Citizen.Wait(0)
end
local GUI, MenuType = {}, 'default'
@@ -65,7 +65,7 @@ Citizen.CreateThread(function()
Citizen.CreateThread(function()
while true do
Citizen.Wait(10)
Citizen.Wait(15)
if IsControlPressed(0, 18) and IsInputDisabled(0) and (GetGameTimer() - GUI.Time) > 150 then
SendNUIMessage({action = 'controlPressed', control = 'ENTER'})
fxmanifest.lua
+1 -3
View File
@@ -19,9 +19,7 @@ files {
'html/ui.html',
'html/css/app.css',
'html/js/mustache.min.js',
'html/js/app.js',
'html/fonts/pdown.ttf',
'html/fonts/bankgothic.ttf'
'html/js/app.js'
}
dependencies {
html/css/app.css
+9 -7
View File
@@ -9,7 +9,8 @@
}
.menu {
font-family: bankgothic;
font-family: 'PT Sans Narrow', sans-serif;
font-size: 22px;
min-width: 400px;
color: #fff;
box-shadow: 0px 0px 50px 0px #000;
@@ -67,7 +68,7 @@
}
.menu .head {
background-color: #506be6;
background-color: #4682B4;
text-align: center;
height: 40px;
line-height: 40px;
@@ -81,14 +82,15 @@
.menu .menu-items .menu-item {
height: 40px;
display: block;
background-color: #f1f1f1;
box-shadow: inset 1px 0px 0px 1px #b8b8b8;
height: 32px;
background-color: rgba(40, 40, 40, 1);
line-height: 32px;
color: #3A3A3A;
color: #ffffff;
padding: 2px;
text-align: center;
}
.menu .menu-items .menu-item.selected {
background-color: #d0d0d0;
background-color: rgba(20, 20, 20, 1);
border-top: 2px solid #e76767;
border-bottom: 2px solid #e76767;
}
html/ui.html
+2
View File
@@ -3,6 +3,8 @@
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="nui://esx_menu_default/html/css/app.css">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=PT+Sans+Narrow&display=swap" rel="stylesheet">
</head>
<body>