[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 body-include-2...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 body-include-2... |
|
Date: |
Fri, 16 Oct 2015 09:51:34 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 15/10/16 09:51:34
Modified files:
server/staging/nav-bar/test9: body-include-2.html home2.fr.html
home5.html layout7.css
license-list.html style.css
Log message:
Further cleanup of layout.css; revert line-width limit.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home2.fr.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home5.html?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.109&r2=1.110
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/license-list.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/style.css?cvsroot=www&r1=1.11&r2=1.12
Patches:
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- body-include-2.html 7 Oct 2015 10:47:17 -0000 1.32
+++ body-include-2.html 16 Oct 2015 09:51:00 -0000 1.33
@@ -2,7 +2,7 @@
<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>
+<p id="join-fsf" class="button small"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p>
<div id="fssbox">
<p><a href="http://www.fsf.org/fss";>Free Software Supporter</a></p>
<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
method="post">
Index: home2.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home2.fr.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- home2.fr.html 8 Oct 2015 16:04:53 -0000 1.17
+++ home2.fr.html 16 Oct 2015 09:51:00 -0000 1.18
@@ -16,41 +16,30 @@
<style type="text/css" media="screen">
<!--
-div.inner #content { padding-left: 3%; padding-right: 3%; }
-#home:after {
- clear: both; content: ""; display: block;
- height: 0px; visibility: hidden; width: 0px;
-}
#home .first-column {
width: 60%;
- float: left;
+ float: left; margin: 0 !important;
}
#home .second-column {
width: 37%;
float: right;
}
-#home .first-column, #home .second-column {
- margin: 0;
-}
-
-#home h2 {
+#content div#home h2 {
text-shadow: none;
- padding: 0;
margin-top: .9em; margin-bottom: .6em;
}
#home .first-column img {
width: 100%; max-width: 35em;
margin: .5em auto 1em auto;
}
-#home .second-column h4 img { height: .75em; width: .75em; }
-
+#home .first-column p.back { margin-bottom: 2.5em; }
#home .button {
text-align: center;
font-weight: bold;
margin-top: 2em; margin-bottom: 2.5em;
}
+#home .second-column h4 img { height: .75em; width: .75em; }
#home .emph-box {
- padding-bottom: 1.7em;
border-top-left-radius: 2em;
border-top-right-radius: 2em;
-moz-border-top-left-radius: 2em;
@@ -62,33 +51,30 @@
-opera-border-top-left-radius: 2em;
-opera-border-top-right-radius: 2em;
}
+#home .emph-box h4 {
+ text-align: center;
+ font-size: 1.5em;
+}
#home .emph-box p { font-size: .9em; }
-
#Action {
text-align: left;
padding: 0 1em;
margin: 2.5em 0;
border-left: .4em solid #b9bcbf; border-right: .4em solid #b9bcbf;
}
-#Action h2 {
- float: none;
+#content div#home #Action h2 {
text-align: center;
- padding-top: 0;
color: #171d33;
}
#Action li { margin-bottom: .7em; }
-
+#home .highlight-para { margin-bottom: 2.5em; }
+#backtotop { float: right; margin-top: 2.5em; }
+#sisters { font-size: .9em; margin: 0 3% 1.5em 3%; }
@media (max-width: 55em) {
#home .first-column, #home .second-column {
float: none; width: 100%; }
}
-#content .emph-box h4 {
- text-align: center;
- font-size: 1.5em;
-}
-#sisters { font-size: .9em; margin: 0 3% 1.5em 3%; }
-->
-
</style>
<!--#include virtual="/server/fs-gang-definitions.html" -->
@@ -349,7 +335,7 @@
<p class="unprintable"><!-- timestamp start -->
Dernière mise à jour :
-$Date: 2015/10/08 16:04:53 $
+$Date: 2015/10/16 09:51:00 $
<!-- timestamp end -->
</p>
Index: home5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home5.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- home5.html 8 Oct 2015 16:49:45 -0000 1.48
+++ home5.html 16 Oct 2015 09:51:00 -0000 1.49
@@ -9,41 +9,30 @@
<style type="text/css" media="screen">
<!--
-div.inner #content { padding-left: 3%; padding-right: 3%; }
-#home:after {
- clear: both; content: ""; display: block;
- height: 0px; visibility: hidden; width: 0px;
-}
#home .first-column {
width: 60%;
- float: left;
+ float: left; margin: 0 !important;
}
#home .second-column {
width: 37%;
float: right;
}
-#home .first-column, #home .second-column {
- margin: 0;
-}
-
-#home h2 {
+#content div#home h2 {
text-shadow: none;
- padding: 0;
margin-top: .9em; margin-bottom: .6em;
}
#home .first-column img {
width: 100%; max-width: 35em;
margin: .5em auto 1em auto;
}
-#home .second-column h4 img { height: .75em; width: .75em; }
-
+#home .first-column p.back { margin-bottom: 2.5em; }
#home .button {
text-align: center;
font-weight: bold;
margin-top: 2em; margin-bottom: 2.5em;
}
+#home .second-column h4 img { height: .75em; width: .75em; }
#home .emph-box {
- padding-bottom: 1.7em;
border-top-left-radius: 2em;
border-top-right-radius: 2em;
-moz-border-top-left-radius: 2em;
@@ -55,36 +44,34 @@
-opera-border-top-left-radius: 2em;
-opera-border-top-right-radius: 2em;
}
+#home .emph-box h4 {
+ text-align: center;
+ font-size: 1.5em;
+}
#home .emph-box p { font-size: .9em; }
-
#Action {
text-align: left;
padding: 0 1em;
margin: 2.5em 0;
border-left: .4em solid #b9bcbf; border-right: .4em solid #b9bcbf;
}
-#Action h2 {
- float: none;
+#content div#home #Action h2 {
text-align: center;
- padding-top: 0;
color: #171d33;
}
#Action li { margin-bottom: .7em; }
-
+#home .highlight-para { margin-bottom: 2.5em; }
+#backtotop { float: right; margin-top: 2.5em; }
+#sisters { font-size: .9em; margin: 0 3% 1.5em 3%; }
@media (max-width: 55em) {
#home .first-column, #home .second-column {
float: none; width: 100%; }
}
-#content .emph-box h4 {
- text-align: center;
- font-size: 1.5em;
-}
-#sisters { font-size: .9em; margin: 0 3% 1.5em 3%; }
-->
</style>
<!--#include virtual="/server/fs-gang-definitions.html" -->
<!--#include virtual="/po/home.translist" -->
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
+<!--#include virtual="/server/staging/banner/test9/banner.html" -->
<p class="no-display">GNU is the only operating system developed
specifically to give its users freedom. What is GNU, and what freedom
@@ -286,7 +273,7 @@
</div><!-- /home -->
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/staging/banner/test9/footer-text.html" -->
<p id="sisters">The <a href="http://www.fsf.org/";>FSF</a> also has sister
organizations in <a href="http://www.fsfe.org";>Europe</a>, <a
@@ -326,7 +313,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/08 16:49:45 $
+$Date: 2015/10/16 09:51:00 $
<!-- timestamp end -->
</p>
</div>
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- layout7.css 11 Oct 2015 20:34:23 -0000 1.109
+++ layout7.css 16 Oct 2015 09:51:00 -0000 1.110
@@ -186,12 +186,6 @@
#content ul#edu-navigation {
margin-left: -3.2%; margin-right: -3.2%;
}
address@hidden (min-width: 60em) {
- #content { padding-left: 10%; padding-right: 10%; }
- #content ul#edu-navigation {
- margin-left: -12.5%; margin-right: -12.5%;
- }
-}
/* Backgrounds */
@@ -227,13 +221,11 @@
blockquote { font-style: italic; }
ul li { list-style: square; }
form input { font-family: inherit; }
-
acronym, abbr { border-bottom: 1px dotted #111; }
-img { border: 0; }
-
pre { overflow: auto; }
p, pre, ul li, ol li, dt, dd, code, address { line-height: 1.3em; }
+p { margin-top: 1em; } /* In combo.css: margin-bottom:1em. */
ul, ol, blockquote { margin: .5em 3% 1em 3%; }
/* Lists of underlined links are difficult to read. The top margin gives a
@@ -253,7 +245,6 @@
address { margin-bottom: 1em; }
.center, .c { text-align: center; }
-#content .nocenter{ text-align: left; }
.underline { text-decoration: underline; }
.nounderline { text-decoration: none; }
@@ -276,24 +267,27 @@
/*** BUTTONS ***/
.button a, .button a:visited {
- color: #971611;
+ font-family: "FreeSans", sans-serif;
+ font-weight: bold;
text-decoration: none;
}
-.button a:hover {
- color: #777;
-}
-.large a {
+.button.large a, .button.large a:visited {
display: inline-block;
- font-family: "FreeSans", sans-serif;
font-size: 1.6em;
line-height: 1.3em;
- padding: .1em .4em;
+ padding: .1em .6em;
+ color: #971611;
background-color: #e7e9eb;
border: .4em solid #c9cccf;
}
-.small {
- font-size: 1.6em;
+.button.small a {
+ font-size: 1.3em;
+ padding: .3em .6em;
background-color: #e7e9eb;
+ border: .1em solid #999;
+}
+.button.large a:hover, .button.small a:hover {
+ color: #777;
}
@@ -308,8 +302,7 @@
-webkit-border-radius: .4em;
-opera-border-radius: .4em;
}
-#join-fsf a, #join-fsf a:visited, .button a, .button a:visited,
- #fssbox input[type="submit"] {
+.button a, #fssbox input[type="submit"] {
box-shadow: 0 .15em #171d33;
-moz-box-shadow: 0 .15em #171d33;
-webkit-box-shadow: 0 .15em #171d33;
@@ -323,6 +316,54 @@
}
+/* RETURN LINKS */
+
+#content p.back, p#backtotop {
+ text-align: right; /* p#backtotop is redefined as floating in home.html. */
+ line-height: 1.5em;
+ font-weight: bold;
+ margin: 2em 2% 1.5em 2%;
+}
+
+p.back a, .back a:visited,
+ #backtotop a, #backtotop a:visited { color: #333; }
+p.back a:hover,
+ #backtotop a:hover { color: #777; }
+
+/* For older versions of layout. */
+div#backtotop { padding-left: 3%; padding-right: 3% }
+div#backtotop { margin-top: 1em; }
+
+
+/* BIG SECTION HEADERS */
+
+/* Used in license-list.html and proprietary-surveillance.html,
+ but could apply elsewhere. */
+
+div.big-section {
+ float: left;
+}
+div.big-section h3 {
+ font-size: 1.8em;
+ padding: .2em 0;
+ margin: 1.3em .3em .6em 0 ;
+ color: black;
+ border-top: .2em solid #6989b6;
+ border-bottom: .2em solid #6989b6;
+}
+div.big-subsection {
+ margin-top: 1.3em;
+ margin-bottom: 2em;
+}
+div.big-subsection h4 {
+ clear: both;
+ display: inline;
+ font-size: 1.5em;
+ margin-right: .3em;
+ color: black;
+}
+
+
/*** SEPARATOR ***/
/* For license-list.html, but could be used elsewhere. */
@@ -353,7 +394,7 @@
color: black;
}
.highlight {
-/* Please do not add borders. This style is applied to an in-line tag. */
+/* Please do not add borders. This style is applied to an in-line element. */
padding: .2em .5em;
background-color: #fff898;
border: 0;
@@ -374,19 +415,19 @@
/*** NOTES AND ANNOUNCEMENTS ***/
/* Announcements */
-#content div.announcement {
+div.announcement {
font-size: 1.1em; font-weight: bold;
padding: 0 1em;
margin: 1.5em 0;
color: #333;
border-left: .5em solid #b9bcbf;
}
-#content div.announcement blockquote {
+div.announcement blockquote {
margin-left: 0; margin-right: 0;
}
/* Notes about mailing lists, etc. */
-#content .note {
+.note {
clear: right;
float: right;
text-align: center;
@@ -396,7 +437,7 @@
margin: .3em 0 1em 1.5em;
border: .3em solid #3465a4;
}
-#content .note p {
+.note p {
font-size: 1.1em;
line-height: 1.4em;
padding: 0 1em ;
@@ -440,27 +481,27 @@
/*** TABLES OF CONTENTS ***/
/* Common definitions */
-#content div.summary, #content div.toc {
+div.summary, div.toc {
padding: 1.5em 1.5em 1.8em 1.5em;
background: #f0f2f4;
border: 1px solid #c9cccf;
}
-#content div.summary a, #content div.toc a {
+div.summary a, div.toc a {
text-decoration: none;
}
-#content div.summary a:hover, #content div.toc a:hover {
+div.summary a:hover, div.toc a:hover {
color: black; text-decoration: underline;
}
-#content div.summary ul, #content div.toc ul {
+div.summary ul, div.toc ul {
margin-top: 0; margin-bottom: 0;
}
-#content div.summary h3, #content div.toc h3,
-#content div.summary h4 {
+div.summary h3, div.toc h3,
+div.summary h4 {
text-align: center; padding-top: 0; margin-top: .2em;
}
/* Small tables of contents */
-#content div.summary {
+div.summary {
clear: right;
float: right;
max-width: 20em;
@@ -474,12 +515,58 @@
}
/* Big tables of contents */
-#content div.toc {
+div.toc {
max-width: 45em;
margin: 3em auto 2em auto;
}
+/*** LYRICS ***/
+
+.lyrics {
+ background-color: #f0f2f4; font-style: italic; width: 25em;
+ padding: 2em; border: 2px solid #e7e9eb;
+ margin-left: 2em; margin-right: 2em;
+}
+
+
+/*** IMAGES ***/
+
+/* For photo-like images */
+.portrait, .landscape {
+ float: right; max-width: 100%;
+ margin: .3em 0 1em 1.5em;
+}
+.portrait img, .landscape img { width: 100%; }
+.portrait { width: 22em; }
address@hidden (max-width: 46em) {
+ #content .portrait { float: none; margin: auto; }
+}
+.landscape { width: 27em; }
address@hidden (max-width: 51em) {
+ #content .landscape { float: none; margin: auto; }
+}
+
+/* Still used in /s/cgicc/. */
+#gplv3-dogear {
+ position: absolute;
+ top: -1px;
+ left: -1px;
+}
+#gplv3-dogear h3 {margin: 0;}
+#gplv3-dogear a {
+ background-image: url('/graphics/dogear.png');
+ border: 0;
+ display: block;
+ overflow: hidden;
+ height: 0px !important;
+ width: 64px;
+ padding: 0;
+ padding-top: 64px;
+ cursor: pointer;
+}
+
+
/*** LISTINGS ***/
.listing,
@@ -545,82 +632,6 @@
}
-/* BIG SECTION HEADERS */
-
-/* For license-list.html, but could apply elsewhere. */
-
-#content div.big-section {
- float: left;
-}
-#content div.big-section h3 {
- font-size: 1.8em;
- padding: .2em 0;
- margin: 1.3em .3em .6em 0 ;
- color: black;
- border-top: .2em solid #6989b6;
- border-bottom: .2em solid #6989b6;
-}
-#content div.big-subsection {
- 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;
-}
-
-
-/*** IMAGES ***/
-
-/* For photo-like images */
-#content .portrait, #content .landscape {
- float: right; max-width: 100%;
- margin: .3em 0 1em 1.5em;
-}
-.portrait img, .landscape img { width: 100%; }
-.portrait { width: 22em; }
address@hidden (max-width: 46em) {
- #content .portrait { float: none; margin: auto; }
-}
-.landscape { width: 27em; }
address@hidden (max-width: 51em) {
- #content .landscape { float: none; margin: auto; }
-}
-
-/* Still used in /s/cgicc/. */
-#gplv3-dogear {
- position: absolute;
- top: -1px;
- left: -1px;
-}
-#gplv3-dogear h3 {margin: 0;}
-#gplv3-dogear a {
- background-image: url('/graphics/dogear.png');
- border: 0;
- display: block;
- overflow: hidden;
- height: 0px !important;
- width: 64px;
- padding: 0;
- padding-top: 64px;
- cursor: pointer;
-}
-
-
-/*** MUSIC AND POEMS ***/
-
-#content .caption { color: #334683; font-size: 1.5em; margin:0; }
-
-.lyrics {
- background-color: #f0f2f4; font-style: italic; width: 25em;
- padding: 2em; border: 2px solid #e7e9eb;
- margin-left: 2em; margin-right: 2em;
-}
-
-
/************************
** PAGE DESCRIPTION **
@@ -736,11 +747,9 @@
#join-fsf { padding: .4em 0; }
#join-fsf a, #join-fsf a:visited {
- padding: .3em 1em;
color: #971611;
- background: #e7e9eb;
- border: .1em solid #999;
}
+
#fssbox {
padding: 0;
margin-top: 1.3em;
@@ -919,19 +928,8 @@
#content small { font-size: .9em; }
-/* Equivalent of #backtotop within a section */
-#content p.back {
- text-align: right;
- font-weight: bold;
- line-height: 1.5em;
- padding: 0 2%;
- margin-top: 2em; margin-bottom: 0;
-}
-#content p.back a, .back a:visited { color: #333; }
-#content p.back a:hover { color: #777; }
-
-/*** MISSION STATEMENT + BACK TO TOP ***/
+/*** MISSION STATEMENT ***/
#mission-statement {
font-size: 0.9em;
@@ -939,24 +937,17 @@
}
#mission-statement blockquote {
font-weight: bold;
- margin: 1em 0;
+ margin: 0;
}
#mission-statement img {
float: left;
height: 2em;
margin: .3em .5em;
}
-#mission-statement p { margin: 0 0 .2em 0; }
-
-#backtotop a {
- clear: both;
- float: right;
+#backtotop {
font-size: 1.1em;
- font-weight: bold;
margin: 2.5em 2% 1.5em 2%;
}
-#backtotop a, #backtotop a:visited { color: #333; }
-#backtotop a:hover { color: #777; }
/*** FOOTER ***/
@@ -984,15 +975,15 @@
/*** TRANSLATIONS ***/
/* Note saying the page is a translation. */
-#content .trans-disclaimer {
+.trans-disclaimer {
text-align: center;
font-weight: bold;
font-style: italic;
margin: 1em; margin-bottom: 0;
}
-#content .trans-disclaimer a,
-#content .trans-disclaimer a:visited { color: #333; }
-#content .trans-disclaimer a:hover { color: #777; }
+.trans-disclaimer a,
+.trans-disclaimer a:visited { color: #333; }
+.trans-disclaimer a:hover { color: #777; }
/* Outdated translations */
#outdated {
@@ -1015,7 +1006,7 @@
}
/* Translators notes */
-#content .translators-notes {
+.translators-notes {
clear: both;
font-size: .9em; margin-top: 2.2em;
}
@@ -1046,7 +1037,7 @@
border-top: .35em ridge #3465a4;
border-bottom: .35em ridge #3465a4;
padding: 1.5em 0;
- margin: 2em 0;
+ margin: 2em 4%;
}
/* make h3 for edu-cases look like h4 for other pages */
@@ -1056,6 +1047,7 @@
}
+
/*************
** UNUSED? **
*************/
@@ -1065,7 +1057,6 @@
div.spacer { height: .1em; width: 100%; background-color: transparent; }
/* For the old version of education.html, but could apply elsewhere. */
-/* Are the .yui-* classes still in use?? */
#content .yui-gc h2 {
text-shadow: none;
margin-bottom: .7em;
@@ -1089,7 +1080,3 @@
/* Still used in some old /server/banner.*.html? */
#links { display: none !important; }
-/* For older versions of layout. */
-div#backtotop { padding-left: 3%; padding-right: 3% }
-div#backtotop a { margin-top: 1em; }
-
Index: license-list.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/license-list.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- license-list.html 9 Oct 2015 20:28:09 -0000 1.39
+++ license-list.html 16 Oct 2015 09:51:01 -0000 1.40
@@ -11,7 +11,7 @@
#content #TableOfContents {
padding-top: .9em; margin-bottom: 1em;
}
-#content p.back { margin-top: 3em; }
+#content p.back { padding-top: 1em; }
#content blockquote#fsf-licensing { margin-top: 1.3em; }
/* Definitions for color-coded border */
#content dl.green, #content dl.orange,
@@ -2633,7 +2633,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/09 20:28:09 $
+$Date: 2015/10/16 09:51:01 $
<!-- timestamp end -->
</p>
</div>
Index: style.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/style.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- style.css 11 Oct 2015 12:26:41 -0000 1.11
+++ style.css 16 Oct 2015 09:51:01 -0000 1.12
@@ -47,6 +47,5 @@
body div.inner ul { margin-bottom: 1.5em; margin-left: 1.41%; }
body div#content ul { margin-left: 0; }
-/* The translation list is at the bottom, and usually empty. No need for a
border. */
+/* The translation list is at the bottom, usually empty. No need for a border.
*/
body div#translations { border: none; }
-