[SCM] Samba Website Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  68d6ae9 place searchbox inside banner
      from  5fab003 add border radius is opacity to sitemap and header image

https://git.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 68d6ae9dafd287dbe5f2531d4ea323b3d70dc4b6
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Apr 26 04:24:21 2020 +0200

    place searchbox inside banner

-----------------------------------------------------------------------

Summary of changes:
 header_style.html          | 19 +++++++++----------
 header_style_start.html    | 18 +++++++++---------
 style/2010/grey/screen.css | 12 +++++++-----
 3 files changed, 25 insertions(+), 24 deletions(-)


Changeset truncated at 500 lines:

diff --git a/header_style.html b/header_style.html
index a13d4da..fae24f8 100755
--- a/header_style.html
+++ b/header_style.html
@@ -19,17 +19,16 @@
 			<!-- header -->
 			<div id="hd">
 				<div class="noPrint" id="hdScreen">
-					<div id="search">
-						<form action="https://duckduckgo.com" method="get">
-							<label for="searchString">search samba.org:</label>
-							<input type="text" name="q" class="text" id="searchString">
-							<input type="image" src="/samba/style/2010/grey/buttonSearch.png" class="image" id="searchButton">
-							<input type="hidden" name="sites" value="samba.org">
-						</form>
+					<div id="bannerStart">
+						<div id="search">
+							<form action="https://duckduckgo.com" method="get">
+								<label for="searchString">search samba.org:</label>
+								<input type="text" name="q" class="text" id="searchString">
+								<input type="image" src="/samba/style/2010/grey/buttonSearch.png" class="image" id="searchButton">
+								<input type="hidden" name="sites" value="samba.org">
+							</form>
+						</div>
 					</div>
-					<div class="clearing"></div>
-					<div id="banner"></div>
-					<div class="clearing"></div>
 				</div>
 				<div class="noScreen" id="hdPrint">
 					<img src="/samba/style/2010/grey/headerPrint.jpg" alt="Samba" id="hdPrintImage">
diff --git a/header_style_start.html b/header_style_start.html
index faca7d6..fe2d280 100644
--- a/header_style_start.html
+++ b/header_style_start.html
@@ -19,17 +19,17 @@
 			<!-- header -->
 			<div id="hd">
 				<div class="noPrint" id="hdScreen">
-					<div id="search">
-						<form action="https://duckduckgo.com" method="get">
-							<label for="searchString">search samba.org:</label>
-							<input type="text" name="q" class="text" id="searchString">
-							<input type="image" src="/samba/style/2010/grey/buttonSearch.png" class="image" id="searchButton">
-							<input type="hidden" name="sites" value="samba.org">
-						</form>
+					<div id="bannerStart">
+						<div id="search">
+							<form action="https://duckduckgo.com" method="get">
+								<label for="searchString">search samba.org:</label>
+								<input type="text" name="q" class="text" id="searchString">
+								<input type="image" src="/samba/style/2010/grey/buttonSearch.png" class="image" id="searchButton">
+								<input type="hidden" name="sites" value="samba.org">
+							</form>
+						</div>
 					</div>
 					<div class="clearing"></div>
-					<div id="bannerStart"></div>
-					<div class="clearing"></div>
 				</div>
 				<div class="noScreen" id="hdPrint">
 					<img src="/samba/style/2010/grey/headerPrint.jpg" alt="Samba" id="hdPrintImage">
diff --git a/style/2010/grey/screen.css b/style/2010/grey/screen.css
index 28c8d4b..de63699 100644
--- a/style/2010/grey/screen.css
+++ b/style/2010/grey/screen.css
@@ -187,28 +187,30 @@ body * {
 }
 
 /* search form */
-#hd #search {
+#hd #bannerStart #search {
+	border-right:10px;
 	float: right;
 	clear: both;
 }
 
-#hd #search label {
+#hd #bannerStart #search label {
 	font-family: Georgia, serif;
 	font-weight: bold;
 }
 
-#hd #search #searchString {
+#hd #bannerStart #search #searchString {
 	width: 128px;
 	height: 17px;
-	margin: 0 2px;
+	margin-right: 10pt;
 	padding: 0 1px;
 	border: 1px solid #585858;
 	color: var(--main-text-color);
 }
 
-#hd #search #searchButton {
+#hd #bannerStart #search #searchButton {
 	position: relative;
 	top: 5px;
+	right: 9px;
 }
 
 /* banner */


-- 
Samba Website Repository