qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [qemu-web PATCH 2/6] Simplify copyright and integrate into footer
Date: Wed,  8 Sep 2021 13:28:10 +0100	[thread overview]
Message-ID: <20210908122814.707744-3-berrange@redhat.com> (raw)
In-Reply-To: <20210908122814.707744-1-berrange@redhat.com>

The copyright information is at the base of the page so logically part of
the page footer structure.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 _includes/copyright.html    |  8 --------
 _includes/footer.html       |  3 +++
 _layouts/blog.html          |  1 -
 _layouts/home.html          |  1 -
 _layouts/page.html          |  1 -
 assets/css/style-mobile.css |  2 +-
 assets/css/style.css        | 28 ++++++++++++----------------
 7 files changed, 16 insertions(+), 28 deletions(-)
 delete mode 100644 _includes/copyright.html

diff --git a/_includes/copyright.html b/_includes/copyright.html
deleted file mode 100644
index cdcd98f..0000000
--- a/_includes/copyright.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="copyright">
-	<div id="copyright-inner">
-	  <div class="container">
-	    This site is made available under the terms of
-	    <a href="{{ relative_root }}/license.html">a number of licenses</a>.
-	  </div>
-	</div>
-</div>
diff --git a/_includes/footer.html b/_includes/footer.html
index b614795..6e1b247 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -27,4 +27,7 @@
 			<li><a href="https://xenproject.org">Xen</a></li>
 		</ul>
 	</div>
+	<div id="licenses">
+		<a href="{{ relative_root }}/license.html">Website licenses</a>
+	</div>
 </div>
diff --git a/_layouts/blog.html b/_layouts/blog.html
index b300636..b7fcdbf 100644
--- a/_layouts/blog.html
+++ b/_layouts/blog.html
@@ -21,7 +21,6 @@ Released for free under the Creative Commons Attribution 3.0 license (templated.
 	
 	{% include sidebar.html %}
 	{% include footer.html %}
-	{% include copyright.html %}
 
 </body>
 </html>
diff --git a/_layouts/home.html b/_layouts/home.html
index d94c9b0..f7b6931 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -18,7 +18,6 @@ Released for free under the Creative Commons Attribution 3.0 license (templated.
 	{{ content }}
 
 	{% include footer.html %}
-	{% include copyright.html %}
 
 </body>
 </html>
diff --git a/_layouts/page.html b/_layouts/page.html
index d650054..765d204 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -23,7 +23,6 @@ Released for free under the Creative Commons Attribution 3.0 license (templated.
 	</div>
 	
 	{% include footer.html %}
-	{% include copyright.html %}
 
 </body>
 </html>
diff --git a/assets/css/style-mobile.css b/assets/css/style-mobile.css
index 1bae7a2..213a3fb 100644
--- a/assets/css/style-mobile.css
+++ b/assets/css/style-mobile.css
@@ -242,7 +242,7 @@
 /* Columns                                                                       */
 /*********************************************************************************/
 
-	#main, #footer-inner, #copyright-inner
+	#main, #footer-inner
 	{
 		margin-left: 0%;
 		width: 100%;
diff --git a/assets/css/style.css b/assets/css/style.css
index bed0bf4..9daa18b 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -428,7 +428,7 @@
 /* Columns                                                                       */
 /*********************************************************************************/
 
-	#main, #copyright-inner
+	#main
 	{
 		margin-left: 16.667%;
 		width: 66.667%;
@@ -525,23 +525,19 @@
 		margin: 0
 	}
 
-/*********************************************************************************/
-/* Copyright                                                                     */
-/*********************************************************************************/
-
-	#copyright
-	{
-		clear: left;
-		border-top: 1px solid #aaaaaa;
-		position: relative;
-		color: #aaaaaa;
-		background: #ffffff;
-		padding: 1em 0em;
+	#licenses {
+		padding: 0em;
+		padding-left: 1em;
+		padding-right: 1em;
+		font-size: smaller;
+		color: #401200;
+		background: #fff;
+		margin: 1em;
+		margin-top: 2em;
 	}
 
-	#copyright a
-	{
-		color: inherit;
+	#licenses {
+		float: right;
 	}
 
 /*********************************************************************************/
-- 
2.31.1



  parent reply	other threads:[~2021-09-08 12:41 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-08 12:28 [qemu-web PATCH 0/6] Small header/footer layout changes Daniel P. Berrangé
2021-09-08 12:28 ` [qemu-web PATCH 1/6] Compress the two front page headings into one Daniel P. Berrangé
2021-09-08 12:28 ` Daniel P. Berrangé [this message]
2021-09-08 12:28 ` [qemu-web PATCH 3/6] Put a full SFC membership blurb in footer of every page Daniel P. Berrangé
2021-09-08 12:28 ` [qemu-web PATCH 4/6] Move wiki link from footer into the header navbar Daniel P. Berrangé
2021-09-08 12:28 ` [qemu-web PATCH 5/6] Simplify and restructure the page footer Daniel P. Berrangé
2021-09-08 12:28 ` [qemu-web PATCH 6/6] Add link to "page source" for all pages Daniel P. Berrangé
2021-09-10 15:39 ` [qemu-web PATCH 0/6] Small header/footer layout changes Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210908122814.707744-3-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).