WEBDIENSTE/OSINT-Framework
1
0
Fork 0
mirror of https://github.com/lockfale/OSINT-Framework.git synced 2026-08-30 19:49:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts: take origin/master arf.json (Phase 1 dead-link cleanup)

Browse Source 
All 9 entries cherry-picked in 059a8b4 are already present in the remote
version (they were independently merged via PR #546). Resolving by accepting
theirs for arf.json, keeping staged CSS/HTML changes from local branch.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
s0lray
2026-03-21 23:13:47 -04:00
co-authored by Paperclip
parent cfee67407e e21740ac34
commit 2b2cd55353
3 changed files with 789 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/arf.json
+767 -966
View File
File diff suppressed because it is too large Load Diff
public/css/arf.css
+13
View File
@@ -4,6 +4,19 @@ body {
font-family: "Helvetica Neue", Helvetica;
}
noscript p{
text-align: center;
background-color: rgb(255, 228, 196);
margin: 0 auto;
width: 80vw;
padding: 25px 0;
margin-top: 80px;
border-radius: 10px;
border: 1px solid rgb(255, 204, 153);
margin-bottom: 20px;
display: flex-wrap;
}
#body {
margin: 0 auto;
position: relative;
public/index.html
+9 -2
View File
@@ -1,12 +1,19 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<!-- Viewport Settings -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<link type="text/css" rel="stylesheet" href="css/arf.css"/>
<script type="text/javascript" src="js/d3.v3.min.js"></script>
<title>OSINT Framework</title>
</head>
<noscript>
<p>Sorry, Your browser does not support JavaScript! Activate JavaScript on your browser or look for a compatible
browser to use the site.</p>
</noscript>
<body>
<div id="body">
<div id="header">
@@ -37,4 +44,4 @@
</body>
</html>
</html>