awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 03:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing merge conflicts

Browse Source
This commit is contained in:
Vladyslav Matsiiako
2022-12-27 17:57:14 -05:00
parent babf35b44e
commit 74d883c15a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/components/dashboard/DropZone.tsx
+3 -3
View File
@@ -129,7 +129,7 @@ const DropZone = ({
</div> </div>
) : keysExist ? ( ) : keysExist ? (
<div <div
className="opacity-60 hover:opacity-100 duration-200 relative bg-bunker outline max-w-[calc(100%-1rem)] w-full outline-dashed outline-gray-600 rounded-md outline-2 flex flex-col items-center justify-center mb-16 mx-auto mt-1 py-8 px-2" className="opacity-60 hover:opacity-100 duration-200 relative bg-mineshaft-900 outline max-w-[calc(100%-1rem)] w-full outline-dashed outline-chicago-600 rounded-md outline-2 flex flex-col items-center justify-center mb-16 mx-auto mt-1 py-8 px-2"
onDragEnter={handleDragEnter} onDragEnter={handleDragEnter}
onDragOver={handleDragOver} onDragOver={handleDragOver}
onDragLeave={handleDragLeave} onDragLeave={handleDragLeave}
@@ -150,9 +150,9 @@ const DropZone = ({
<div className="flex flex-row"> <div className="flex flex-row">
<FontAwesomeIcon <FontAwesomeIcon
icon={faUpload} icon={faUpload}
className="text-gray-300 text-3xl mr-6" className="text-bunker-300 text-3xl mr-6"
/> />
<p className="text-gray-300 mt-1">{t("common:drop-zone-keys")}</p> <p className="text-bunker-300 mt-1">{t("common:drop-zone-keys")}</p>
</div> </div>
{errorDragAndDrop ? ( {errorDragAndDrop ? (
<div className="mt-8 max-w-xl opacity-80"> <div className="mt-8 max-w-xl opacity-80">