Skip to content

Commit

Permalink
Merge branch 'main' into ptr
Browse files Browse the repository at this point in the history
  • Loading branch information
kodewdle committed Dec 6, 2024
2 parents f99ffee + 46f15cd commit a800744
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ElvUI/Core/Media/SharedMedia.lua
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ E.Media.Arrows.ArrowUp = E.Media.Textures.ArrowUp

do -- LSM Font Preloader ~Simpy
local preloader = CreateFrame('Frame')
preloader:SetPoint('TOP', UIParent, 'BOTTOM', 0, -500)
preloader:SetPoint('TOP', UIParent, 'BOTTOM', 0, -90000)
preloader:SetSize(100, 100)

local cacheFont = function(key, data)
Expand Down
3 changes: 1 addition & 2 deletions ElvUI/Core/Modules/Chat/Chat.lua
Original file line number Diff line number Diff line change
Expand Up @@ -768,9 +768,8 @@ end
function CH:PositionButtonFrame(chat)
if not chat.buttonFrame then return end

chat.buttonFrame:SetScale(0.00001)
chat.buttonFrame:ClearAllPoints()
chat.buttonFrame:SetPoint('TOP', chat, 'BOTTOM', 0, -99999)
chat.buttonFrame:SetPoint('TOP', chat, 'BOTTOM', 0, -90000)
end

function CH:StyleChat(frame)
Expand Down

0 comments on commit a800744

Please sign in to comment.