[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 layout7.css li...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 layout7.css li... |
|
Date: |
Sat, 12 Apr 2014 07:54:32 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 14/04/12 07:54:32
Modified files:
server/staging/nav-bar/test9: layout7.css license-list.html
Log message:
Float the big-section hraders and place big-subsection headers in a div
to adjust margins.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/license-list.html?cvsroot=www&r1=1.29&r2=1.30
Patches:
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- layout7.css 11 Apr 2014 22:00:57 -0000 1.22
+++ layout7.css 12 Apr 2014 07:53:46 -0000 1.23
@@ -934,7 +934,7 @@
/* For license-list.html */
#content div.toc {
- max-width: 41em;
+ max-width: 45em;
padding: 0 1em 1em 1em;
margin: 3em auto 1em auto;
background: #f0f2f4;
@@ -942,23 +942,26 @@
}
#content div.toc h3 { text-align: center; }
-#content blockquote#legend p { text-align: center }
-
-#content h3.big-section {
- display: inline-block;
+#content div.big-section {
+ float: left;
+}
+#content div.big-section h3 {
font-size: 1.8em;
padding: .2em 0;
- margin: 1em 0 .4em 0;
+ margin: 1.3em .3em .6em 0 ;
color: black;
border-top: .2em solid #6989b6;
border-bottom: .2em solid #6989b6;
}
#content div.big-subsection {
- padding: 1em 0 .3em 0;
+ margin-top: 1.3em;
+ margin-bottom: 2em;
}
#content div.big-subsection h4 {
+ clear: both;
display: inline;
font-size: 1.5em;
+ margin-right: .3em;
color: black;
}
Index: license-list.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/license-list.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- license-list.html 11 Apr 2014 22:06:03 -0000 1.29
+++ license-list.html 12 Apr 2014 07:53:50 -0000 1.30
@@ -1,7 +1,12 @@
+
+
<!--#include virtual="/server/header.html" -->
<!-- Parent-Version: 1.76 -->
+
<title>Various Licenses and Comments about Them
- GNU Project - Free Software Foundation</title>
+
+
<!--#include virtual="/licenses/po/license-list.translist" -->
<style type="text/css" media="print,screen">
@@ -33,7 +38,7 @@
width: auto; max-width: 100%;
font-style: normal;
padding: 0 1em 1em 1em;
- margin: 1.5em 0 1em 1em;
+ margin: 2.5em 0 1.5em 1.5em;
background: #f0f2f4;
border: 1px solid #c9cccf;
}
@@ -42,7 +47,10 @@
#content div#legend dt { padding: 1em 0; margin: 0; }
#content div#legend dd { margin: 0; }
-#legend blockquote { font-size: 1.3em; font-style: normal; text-align: center;
font-weight: bold; }
+#legend blockquote {
+ text-align: center;
+ font-size: 1.3em; font-style: normal; font-weight: bold;
+}
#legend dl.green dt:after, #legend dl.orange dt:after,
#legend dl.red dt:after, #legend dl.blue dt:after { font-weight: normal; }
-->
@@ -70,27 +78,52 @@
#legend dl.blue dt:after { content: "Licenses for works stating a viewpoint"; }
</style>
-<!-- start of server/banner.html -->
-<!-- start of head-include-2.html -->
+<!-- start of banner.html -->
+<!-- start of head-include-2.html -->
<link rel="stylesheet" href="combo.css" media="screen" />
-<link rel="stylesheet" href="layout7.css" media="screen" />
-
+<link rel="stylesheet" href="layout7.21.css" media="screen" />
<link rel="stylesheet" href="/mini.css" media="handheld" />
+<link rel="stylesheet" href="print.css" media="print" />
+<!-- end of head-include-2.html -->
-<link rel="stylesheet" href="/print.css" media="print" />
-
-<!-- end of head-include-2.html --></head>
+</head>
<body>
<div class="inner">
-<!--#include virtual="body-include-1.html" -->
+<!-- start of server/body-include-1.html -->
+<!--#set var="HTML_BODY" value="yes" -->
+
+<div id="toplinks">
+ <a href="#content">Skip to main text</a>
+</div> <!-- /toplinks -->
+
+<div id="searcher">
+ <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
+ <div>
+ <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
+ value="Why GNU/Linux?" onfocus="this.value=''" />
+ <input type="submit" value="Search" />
+ </div><!-- unnamed label -->
+ </form>
+</div><!-- /searcher -->
+
+<!--#if expr="$TRANSLATION_LIST" -->
+<!--#echo encoding="none" var="TRANSLATION_LIST" -->
+<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
+<!-- if initial translation list isn't included before banner.html,
+ then the file may use an old boilerplate that contains
+ div#translations in its body, and we mustn't duplicate it here. -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
+<!--#endif -->
+<!-- end of server/body-include-1.html -->
<!--#include virtual="/server/body-include-2.html" -->
<div id="content">
-<!-- end of server/banner.html --><h2>Various Licenses and Comments about
Them</h2>
+<!-- end of server/banner.html -->
+<h2>Various Licenses and Comments about Them</h2>
<div class="toc">
@@ -131,9 +164,11 @@
</div> <!-- /class="toc" -->
-
-<h3 id="Introduction" class="big-section">
+<div class="big-section">
+<h3 id="Introduction">
Introduction</h3>
+</div>
+<div style="clear: left;"></div>
<p>We classify a license according to certain key criteria:</p>
@@ -201,8 +236,11 @@
<dl class="blue"><dt></dt><dd></dd></dl>
</div>
-<h3 id="SoftwareLicenses" class="big-section">
+<div class="big-section">
+<h3 id="SoftwareLicenses">
Software Licenses</h3>
+</div>
+<div style="clear: left;"></div>
<div class="big-subsection">
<h4 id="GPLCompatibleLicenses">
@@ -1010,7 +1048,7 @@
<p>This is a lax, permissive non-copyleft free software license
which is compatible with the GNU GPL.</p></dd>
-</dl> <!-- end class "green" -->
+</dl> <!-- end class="green" -->
<hr class="separator" />
@@ -1620,14 +1658,14 @@
<p><a href="#Zope20">Version 2.0 of the Zope Public License</a> is
GPL-compatible.</p></dd>
-</dl> <!-- end class="orange -->
+</dl> <!-- end class="orange" -->
<hr class="separator" />
<div class="big-subsection">
<span id="NonFreeSoftwareLicense"></span>
-<h4 id="NonFreeSoftwareLicenses">
- Nonfree Software Licenses</h4>
+<h4><a id="NonFreeSoftwareLicenses">
+ Nonfree Software Licenses</a></h4>
<span class="anchor-reference-id">
(<a href="#NonFreeSoftwareLicenses">#NonFreeSoftwareLicenses</a>)</span>
</div>
@@ -2080,10 +2118,11 @@
</dl> <!-- end class="red" -->
-<div>
-<h3 id="DocumentationLicenses" class="big-section">
+<div class="big-section">
+<h3 id="DocumentationLicenses">
Licenses For Documentation</h3>
</div>
+<div style="clear: left;"></div>
<div class="big-subsection">
<h4 id="FreeDocumentationLicenses">
@@ -2209,9 +2248,10 @@
</dl> <!-- end class="red" -->
-<div>
-<h3 id="OtherLicenses" class="big-section">Licenses for Other Works</h3>
+<div class="big-section">
+<h3 id="OtherLicenses">Licenses for Other Works</h3>
</div>
+<div style="clear: left;"></div>
<div class="big-subsection">
<h4>Licenses for Works of Practical Use
@@ -2432,8 +2472,38 @@
<p class="back"><strong><a href="/licenses/licenses.html">More about
licenses</a></strong></p>
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
+
+<!-- begin server/footer-text.html -->
+
+<div id="fsf-links">
+ <ul>
+ <li><a href="/">GNU home</a></li>
+ <li><a href="http://www.fsf.org/";>FSF</a></li>
+ <li><a href="/graphics/graphics.html">GNU Art</a></li>
+ <li><a href="/fun/fun.html">Fun</a></li>
+ <li><a href="/people/people.html">GNU's Who?</a></li>
+ <li><a
href="http://directory.fsf.org";>Free Software Directory</a></li>
+ <li><a href="/accessibility/accessibiliity.html">Accessibility</a></li>
+ <li><a href="/server/sitemap.html">Site map</a></li>
+ </ul>
+</div><!-- /fsf-links -->
+
+<div id="mission-statement">
+
+<blockquote>
+<p dir="rtl" ><a href="http://www.fsf.org";><img id="fsfbanner"
src="logo-fsf.org-notext.png" alt=" [FSF logo] "/></a><strong>âOur mission is
to preserve, protect and promote the freedom to use, study, copy, modify, and
redistribute computer software, and to defend the rights of Free Software
users.â</strong></p>
+</blockquote>
+
+<p>The <a href="http://www.fsf.org";>Free Software Foundation</a> is the
principal organizational sponsor of the GNU Operating System. <strong>Support
GNU and the FSF</strong> by <a href="http://shop.fsf.org/";>buying manuals and
gear</a>, <a href="https://my.fsf.org/associate/support_freedom?referrer=4052";>
<strong>joining the FSF</strong></a> as an associate member, or making a
<strong>donation</strong>, either <a href="http://donate.fsf.org/";>directly to
the FSF</a> or <a
href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via Flattr</a>.</p>
+
+<p id="backtotop"><a href="#header">Back to Top</a></p>
+
+</div> <!-- /mission-statement -->
+
+<!-- end server/footer-text.html -->
+
<div id="footer">
+
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to <a
@@ -2460,7 +2530,7 @@
information on coordinating and submitting translations of this article.</p>
</div>
-<p>Copyright © 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 2012 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
@@ -2470,7 +2540,7 @@
<p></p><p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/11 22:06:03 $
+$Date: 2014/04/12 07:53:50 $
<!-- timestamp end -->
</p>
</div>