[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: |
Mon, 07 Apr 2014 18:53:29 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 14/04/07 18:53:29
Modified files:
server/staging/nav-bar/test9: layout7.css license-list.html
Log message:
Don't float the TOC; definitions for color-coded border in the style
tag; fix a missing closing tag.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/license-list.html?cvsroot=www&r1=1.17&r2=1.18
Patches:
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- layout7.css 6 Apr 2014 16:22:32 -0000 1.10
+++ layout7.css 7 Apr 2014 18:53:28 -0000 1.11
@@ -457,15 +457,6 @@
#content h3 a[href]:visited, #content h4 a[href]:visited { color: #334683; }
#content h3 a[href]:hover, #content h4 a[href]:hover { color: #777; }
-/* This is supposed to prevent the bullets from overflowing left-floated items.
-https://stackoverflow.com/questions/710158/why-do-my-list-item-bullets-overlap-floating-elements
*/
-#content ul { margin-left: 1em; }
-#content ul li {
- position: relative;
- left: 1.5em;
- padding-right: 1.5em;
-}
-
/* For column headers in education.html, but could apply elsewhere. */
#content .yui-gc h2 {
text-shadow: none;
@@ -538,6 +529,7 @@
font-weight: bold;
margin: .7em 1em 1.5em 1em;
}
+
div#backtotop {
/* For older versions of layout. */
margin-left: 0; margin-bottom: 0; float: none;
@@ -935,15 +927,15 @@
}
span.anchor-reference-id a:hover { color: #777 !important; }
-/* For license-list.html (not implemented yet) */
+/* For license-list.html */
#content div.toc {
- float: left;
- width: auto; max-width: 100%;
+ width: 41em;
padding-bottom: 1em;
- margin: 1.4em 1.5em 1em 0;
+ margin: 3em 1.5em 1em 0;
background: #f0f2f4;
border: 1px solid #c9cccf;
}
+
#content div.toc h3 { text-align: center; }
#content blockquote#legend p { text-align: center }
@@ -973,40 +965,6 @@
background-color: #999;
border: none;
}
-
-#content dl.green, #content dl.orange,
- #content dl.red, #content dl.blue {
- padding-left: 1em;
- margin-left: 0;
- margin-top: 2em;
-}
-
-#content dl.green { border-left: .4em solid green; }
-#content dl.orange { border-left: .4em dashed orange; }
-#content dl.red { border-left: .4em dotted red; }
-#content dl.blue { border-left: .4em double blue; }
-
-#content div#legend {
- float: right;
- width: auto; max-width: 100%;
- font-style: normal;
- padding: 0 1em 1em 1em;
- margin: 1.5em 0 1em 1em;
- background: #f0f2f4;
- border: 1px solid #c9cccf;
-}
-
-#content div#legend dl { margin: 1em 0 0 0; }
-#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:before { content: "Code for the left border"; }
-#legend dl.green dt:after { font-weight: normal; content: "Free licenses,
compatible with the GNU GPL or FDL"; }
-#legend dl.orange dt:after { font-weight: normal; content: "Free licenses,
incompatible with the GNU GPL and FDL"; }
-#legend dl.red dt:after { font-weight: normal; content: "Nonfree licenses"; }
-#legend dl.blue dt:after { font-weight: normal; content: "Licenses for works
stating a viewpoint"; }
-
/* End license-list definitions */
Index: license-list.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/license-list.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- license-list.html 7 Apr 2014 11:58:20 -0000 1.17
+++ license-list.html 7 Apr 2014 18:53:29 -0000 1.18
@@ -1,20 +1,47 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-
-<head>
-<!-- start of server/head-include-1.html -->
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:address@hidden"; />
-<link rel="icon" type="image/png" href="/graphics/gnu-head-mini.png" />
-<meta name="ICBM" content="42.355469,-71.058627" />
-<meta name="DC.title" content="gnu.org" />
-<!-- end of server/head-include-1.html --><!-- end of server/header.html -->
+
+
+<!--#include virtual="/server/header" -->
<!-- Parent-Version: 1.76 -->
<title>Various Licenses and Comments about Them
- GNU Project - Free Software Foundation</title>
+<style type="text/css" media="print,screen">
+/* For the color-coded borders */
+#content dl.green, #content dl.orange,
+ #content dl.red, #content dl.blue {
+ padding-left: 1em;
+ margin-left: 0;
+ margin-top: 2em;
+}
+
+#content dl.green { border-left: .4em solid green; }
+#content dl.orange { border-left: .4em dashed orange; }
+#content dl.red { border-left: .4em dotted red; }
+#content dl.blue { border-left: .4em double blue; }
+
+#content div#legend {
+ float: right;
+ width: auto; max-width: 100%;
+ font-style: normal;
+ padding: 0 1em 1em 1em;
+ margin: 1.5em 0 1em 1em;
+ background: #f0f2f4;
+ border: 1px solid #c9cccf;
+}
+
+#content div#legend dl { margin: 1em 0 0 0; }
+#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:before { content: "Code for the left border"; }
+#legend dl.green dt:after { font-weight: normal; content: "Free licenses,
compatible with the GNU GPL or FDL"; }
+#legend dl.orange dt:after { font-weight: normal; content: "Free licenses,
incompatible with the GNU GPL and FDL"; }
+#legend dl.red dt:after { font-weight: normal; content: "Nonfree licenses"; }
+#legend dl.blue dt:after { font-weight: normal; content: "Licenses for works
stating a viewpoint"; }
+</style>
+
<!--#include virtual="/licenses/po/license-list.translist" -->
<!-- start of banner.html -->
@@ -57,50 +84,7 @@
<!--#endif -->
<!-- end of server/body-include-1.html -->
-<!-- start of server/body-include-2 -->
-
-<div id="header">
-<div id="fsf-frame">
-<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p><hr
/>
-<div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>GNU/FSF Newsletter</a></p>
-<form
action="https://crm.fsf.org/civicrm/profile/create&reset=1&gid=31";
method="post">
- <div>
- <input name="postURL" type="hidden" value="" />
- <input type="hidden" name="group[25]" value="1" />
- <input name="cancelURL" type="hidden"
value="https://crm.fsf.org/civicrm/profile?reset=1&gid=31"; />
- <input name="_qf_default" type="hidden" value="Edit:cancel" />
- </div>
- <p>
- <input type="text" id="frmEmail" name="email-Primary" size="18"
maxlength="80" value="email address"/>
- <input type="submit" name="_qf_Edit_next" value="Sign up" />
- </p>
-</form>
-</div><!-- /fssbox -->
-</div><!-- /fsf-frame -->
-
-<div id="gnu-banner">
- <a href="/">
- <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] "
/><strong>GNU</strong> Operating System</a>
-</div><!-- /gnu-banner -->
-<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>
-
-</div><!-- /header -->
-
-<div id="navigation">
-
- <ul>
- <li id="tabAboutGNU"><a href="/gnu/gnu.html">About GNU</a></li>
- <li id="tabPhilosophy"><a
href="/philosophy/philosophy.html">Philosophy</a></li>
- <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
- <li id="tabEducation"><a href="/education/education.html">Education</a></li>
- <li id="tabSoftware"><a href="/software/software.html">Software</a></li>
- <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
- <li id="tabHelp"><a href="/help/help.html">Help GNU</a></li>
- </ul>
-
-</div><!-- /navigation -->
-<!-- end of server/body-include-2 --><div id="content">
+<!--#include virtual="/server/body-include-2" -->
<!-- end of server/banner.html -->
<h2>Various Licenses and Comments about Them</h2>
@@ -134,7 +118,7 @@
<li><a href="#OtherLicenses">Licenses for Other Works</a>
<ul>
<li><a href="#OtherLicenses">Licenses for Works of Practical Use
- besides Software and Documentation</a>
+ besides Software and Documentation</a></li>
<li><a href="#Fonts">Licenses for Fonts</a></li>
<li><a href="#OpinionLicenses">Licenses for Works stating a Viewpoint
(e.g., Opinion or Testimony)</a></li>
@@ -2506,7 +2490,7 @@
<p></p><p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/07 11:58:20 $
+$Date: 2014/04/07 18:53:29 $
<!-- timestamp end -->
</p>
</div>