From 40f18df90fcee40bb5d4f5d9fd7ee776c56b469f Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Mon, 5 Dec 2016 14:39:07 +0100
Subject: [PATCH] Simplified CSS, removed external contents

---
 advanced/blockingpage.css | 101 +++++---------------------------------
 advanced/index.php        |   4 +-
 2 files changed, 13 insertions(+), 92 deletions(-)

diff --git a/advanced/blockingpage.css b/advanced/blockingpage.css
index f4451f28..bb37939d 100644
--- a/advanced/blockingpage.css
+++ b/advanced/blockingpage.css
@@ -16,15 +16,14 @@ b	{ font-weight: bold; }
 i	{ font-style: italic; }
 
 footer, pre, input[type='url'], input[type='text'], .alist, .transparent td { font-family: monospace; }
-body, header { background: #E1E1E1; }
+/*body, header { background: #E1E1E1; }*/
 
 body {
-	background-image: url('http://firebog.net/bg.png'), -webkit-linear-gradient(top, rgba(220,220,220,0.95), rgba(240,240,240,0.95));
-	background-image: url('http://firebog.net/bg.png'), linear-gradient(to bottom, rgba(220,220,220,0.95), rgba(240,240,240,0.95));
+	background-image: -webkit-linear-gradient(top, rgba(240,240,240,0.95), rgba(190,190,190,0.95));
+	background-image: linear-gradient(to bottom, rgba(240,240,240,0.95), rgba(190,190,190,0.95));
 	background-attachment: fixed;
 	color: rgba(64,64,64,0.95);
-	text-shadow: 0 1px rgba(0,0,0,0.04);
-	font: 14px Arial, sans-serif;
+	font: 14px, sans-serif;
 	line-height: 1em;
 }
 
@@ -53,11 +52,13 @@ header h1, header div {
 }
 
 header h1 {
-	font: bold 1.6em "Trebuchet MS", sans-serif;
+	font-size: 22px;
+	font-weight: bold;
 	width: 100%;
 	padding: 8px 0;
 	text-indent: 32px;
-	background: url("http://firebog.net/PHV.svg") left no-repeat;
+	background: url("http://pi.hole/admin/img/logo.svg") left no-repeat;
+	background-size: 30px 22px;
 }
 
 header h1 a, h1 a:hover { color: inherit; }
@@ -68,13 +69,13 @@ header .alt { width: 85px; font-size: 0.8em; padding-right: 4px; text-align: rig
 main {
 	display: block;
 	width: 80%;
-	padding: 8px;
+	padding: 10px;
 	font-size: 1em;
 	background-color: rgba(255,255,255,0.85);
 	margin: 8px auto;
 	box-sizing: border-box;
 	border: 1px solid rgba(0,0,0,0.25);
-	box-shadow:  0 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow:  4px 4px rgba(0,0,0,0.1);
 	line-height: 1.2em;
 	border-radius: 8px;
 }
@@ -123,90 +124,10 @@ li a { position: relative; top: 1px; } /* Center bullet-point arrows */
 a.safe { background-color: rgba(0,220,0,0.5); }
 a.warn { background-color: rgba(220,0,0,0.5); }
 
-.blocked, .toggle, .sourcever, .mini, .addurl a, .editurl a { margin-top: 8px; }
 .blocked a, .mini a { display: table-cell; }
 .blocked a.safe { width: 100%; }
 
-.ministatus { text-align: center; }
-
-input[type='url'], input[type='text'] { /* Swapped rgba is shared with .buttons a */
-	font-size: 1.15em;
-	padding: 2px 4px;
-	text-align: left;
-	cursor: text;
-	width: 100%;
-	box-sizing: border-box;
-	background-image: -webkit-linear-gradient(top, rgba(0,0,0,0.05), rgba(255,255,255,0.05));
-	background-image: linear-gradient(to bottom, rgba(0,0,0,0.05), rgba(255,255,255,0.05));
-}
-
-input:focus {
-	outline: none;
-	box-shadow: 0 0 0 2px rgba(0,128,240,0.4);
-	border-radius: 4px;
-}
-
 /* Types of text */
-.pre { white-space: pre; overflow: auto; -webkit-overflow-scrolling: touch; }
-.msg { display: block; line-height: 1.2em; font-weight: bold; font-size: 1.15em; margin: 4px 8px 8px 8px; white-space: pre-line; }
-.request, .finalresults, .sourcever, .invocation, .parameters, .transparent td, .actionfilecontent, .actionslist { font-size: 0.9em; line-height: 1.2em; } /* "Pre sized" */
-
-.request, .finalresults, .parameters, .actionfilecontent, .actionslist { /* Dashed outline for excessive text */
-	line-height: 1.2em;
-	padding: 4px;
-	border: 1px dashed rgba(0,0,0,0.25);
-	border-right: 0;
-	background-image: -webkit-linear-gradient(left, #FFF 70%, rgba(255,255,255,0));
-	background-image: linear-gradient(to right, #FFF 70%, rgba(255,255,255,0));
-	border-radius: 4px 0 0 4px;
-}
-
-.parameters, .finalresults { /* Small scrollbox for excessive text */
-	max-height: 116px;
-	overflow-y: scroll;
-	-webkit-overflow-scrolling: touch;
-}
-
-.editactions { font-size: 0.8em; }
-.actionslist { margin: 4px 0; }
-
-/* Matching actions in show-url-info */
-.transparent { width: 100%; margin: 0; }
-.transparent th { display: block; box-sizing: border-box; text-align: left; padding: 2px 4px; border-radius: 4px; background-image: -webkit-linear-gradient(left, rgba(0,0,0,0.08), transparent 80%); background-image: linear-gradient(to right, rgba(0,0,0,0.08), transparent 80%); } /* Rgba is shared with h2 */
-.transparent td { margin: 4px; display: block; }
-.transparent th a { display: none; position: relative; top: -1px; font-size: 0.75em; padding: 2px 5px 1px 3px; } /* Buttons 0.75 0.86 */
-.transparent tr:first-child a, .transparent tr:nth-last-child(2) a { display: inline-block; } /* Only show buttons for First/Last files */
+.msg { white-space: pre; overflow: auto; -webkit-overflow-scrolling: touch; display: block; line-height: 1.2em; font-weight: bold; font-size: 1.15em; margin: 4px 8px 8px 8px; white-space: pre-line; }
 
 footer { font-size: 0.8em; text-align: center; width: 87%; margin: 4px auto; }
-
-/* Specific Fixes */
-.alist br:first-child { display: none; } /* Final results is displayed in "pre format", so remove first BR */
-.filter a[href*="show-status"] { margin-left: 12px; } /* Margin for View/Edit on show-status */
-
-/* Safari & iOS */
-@media screen and (min-color-index:0) and(-webkit-min-device-pixel-ratio:0) { @media {
-	::-webkit-input-placeholder { position: relative; top: 3px; }
-	.transparent th a { padding: 2px 4px 1px 4px; }
-	a.safe { background-color: rgba(0,220,0,0.4); }
-	a.warn { background-color: rgba(220,0,0,0.4); }
-}}
-
-@media only screen and (orientation:portrait) {
-	main { width: 100%; border-radius: 0; margin: 0; border-style: none; border-bottom-style: solid; }
-	header h1 { display: block; overflow: auto; -webkit-overflow-scrolling: touch; }
-	::-webkit-input-placeholder { top: 2px; }
-}
-
-@media only screen and (min-device-width : 320px) and (max-device-width : 667px) and (orientation : landscape) {
-	main { width: 100%;  border-radius: 0; margin: 0; border-style: none; border-bottom-style: solid; }
-	h2 { padding-bottom: 2px; } /* Necessary for underline to show */
-	main { font-size: 0.6em; }
-	ul li { font-size: 1.7em; }
-	ul li a { font-size: 0.6em; }
-	input[type='url'] { font-size: 1.85em; }
-	.buttons { font-size: 1.7em; }
-	.editactions  { font-size: 1.3em; }
-	.request { font-size: 1.5em; }
-	.transparent th a { font-size: 1.35em; }
-	::-webkit-input-placeholder { top: 2px; }
-}
diff --git a/advanced/index.php b/advanced/index.php
index c51fd71c..7df55d78 100644
--- a/advanced/index.php
+++ b/advanced/index.php
@@ -68,8 +68,8 @@ if($uri == "/")
 	<input id="quiet" type="hidden" value="yes">
 	<button id="btnSearch" class="buttons blocked" type="button" style="visibility: hidden;"></button>
 	This page is blocked because it is explicitly contained within the following block list(s):
-	<pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre>
-	<div class='buttons blocked'><a class='safe' href='javascript:history.back()'>Back to safety</a>
+	<pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre><br/>
+	<div class='buttons blocked'><a class='safe' href='javascript:history.back()'>Go back</a>
 </main>
 <footer>Generated <?php echo date('D g:i A, M d'); ?> by Pi-hole <?php echo $piHoleVersion; ?></footer>
 <script src="http://<?php echo $_SERVER['SERVER_ADDR']; ?>/admin/js/other/jquery.min.js"></script>