michael/FumbleAround
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Reverted back to 4cd4110 before changes were made to monitoring. Trying"

Browse source 
This reverts commit 97f3a78f9d.

revert
This commit is contained in:
dwebmm 2025-01-21 02:35:10 -06:00
parent 92628b6dc5
commit 7e9107f9f2
2 changed files with 6 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
index.html
View file

@ -309,6 +309,9 @@
) { ) {
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> parent of 97f3a78 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
fumble(); fumble();
return; return;
} }
@ -338,6 +341,7 @@
</div> </div>
`; `;
document.body.appendChild(httpModal); document.body.appendChild(httpModal);
<<<<<<< HEAD
======= =======
// Show blocked content modal // Show blocked content modal
const blockedModal = document.getElementById('blockedModal'); const blockedModal = document.getElementById('blockedModal');
@ -366,6 +370,8 @@
// Can't access title due to CORS - assume page is OK // Can't access title due to CORS - assume page is OK
} }
>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying) >>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
=======
>>>>>>> parent of 97f3a78 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
// Handle button clicks // Handle button clicks
const openBtn = httpModal.querySelector('.http-open-btn'); const openBtn = httpModal.querySelector('.http-open-btn');

36
styles.css
View file

@ -912,29 +912,17 @@ main:hover .floating-button {
<<<<<<< HEAD <<<<<<< HEAD
} }
<<<<<<< HEAD
.http-modal .modal-content { .http-modal .modal-content {
max-width: 400px; max-width: 400px;
} }
.http-modal-buttons { .http-modal-buttons {
=======
.blocked-modal .modal-content {
max-width: 400px;
}
.blocked-modal-buttons {
>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
display: flex; display: flex;
gap: 10px; gap: 10px;
margin-top: 20px; margin-top: 20px;
} }
<<<<<<< HEAD
.http-open-btn, .http-skip-btn { .http-open-btn, .http-skip-btn {
=======
.blocked-retry-btn, .blocked-open-btn {
>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
flex: 1; flex: 1;
padding: 12px; padding: 12px;
border: none; border: none;
@ -945,16 +933,11 @@ main:hover .floating-button {
transition: background-color 0.3s ease; transition: background-color 0.3s ease;
} }
<<<<<<< HEAD
.http-open-btn { .http-open-btn {
=======
.blocked-retry-btn {
>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
background-color: #ff4500; background-color: #ff4500;
color: white; color: white;
} }
<<<<<<< HEAD
.dark-mode .http-open-btn { .dark-mode .http-open-btn {
background-color: #ff6b4a; background-color: #ff6b4a;
} }
@ -964,35 +947,16 @@ main:hover .floating-button {
} }
.http-skip-btn { .http-skip-btn {
=======
.dark-mode .blocked-retry-btn {
background-color: #ff6b4a;
}
.blocked-retry-btn:hover {
background-color: #ff5722;
}
.blocked-open-btn {
>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
background-color: #f0f0f0; background-color: #f0f0f0;
color: #333; color: #333;
} }
<<<<<<< HEAD
.dark-mode .http-skip-btn { .dark-mode .http-skip-btn {
=======
.dark-mode .blocked-open-btn {
>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
background-color: #2a2a2a; background-color: #2a2a2a;
color: #fff; color: #fff;
} }
<<<<<<< HEAD
.http-skip-btn:hover { .http-skip-btn:hover {
=======
.blocked-open-btn:hover {
>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
background-color: #e0e0e0; background-color: #e0e0e0;
======= =======
>>>>>>> b6825be (Revert "Reverted back to 4cd4110 before changes were made to monitoring. Trying") >>>>>>> b6825be (Revert "Reverted back to 4cd4110 before changes were made to monitoring. Trying")