[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 layout7.css ho...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 layout7.css ho... |
|
Date: |
Thu, 19 Nov 2015 19:05:44 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 15/11/19 19:05:44
Modified files:
server/staging/nav-bar/test9: layout7.css home5.html
home2.fr.html home.ko.html
Log message:
Redefine the large button.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.115&r2=1.116
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home5.html?cvsroot=www&r1=1.57&r2=1.58
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home2.fr.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home.ko.html?cvsroot=www&r1=1.3&r2=1.4
Patches:
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- layout7.css 15 Nov 2015 14:00:25 -0000 1.115
+++ layout7.css 19 Nov 2015 19:05:43 -0000 1.116
@@ -316,28 +316,30 @@
/*** BUTTONS ***/
.button, #join-fsf {
- text-align: center;
+ line-height: 1.2em;
font-weight: bold;
}
-.button { font-size: 1.3em; }
+.button a, .button a:visited {
+ text-decoration: none;
+}
+
+/* The large button is defined in home.html.
+ Color and background are left out because they depend
+ on the environment.
+ font-size for #join-fsf is inherited from #fsf-frame. */
+.button.small { font-size: 1.3em; }
+.button.small a, #join-fsf a {
+ padding: .25em .6em;
+ border: .1em solid #999;
+}
/* Display the button link as block in CSS1-only
browsers (they don't support inline-block), */
-.button a, #join-fsf a { display: block; }
+.button.small a, #join-fsf a { display: block; }
/* and as inline-block in CSS2+ browsers. */
@media print,screen {
- .button a, #join-fsf a { display: inline-block; }
-}
-/* Common definitions (color and background are left
- out because they depend on the environment) */
-.button a, #join-fsf a {
- line-height: 1.2em;
- padding: .25em .6em;
- border: .1em solid #999;
-}
-.button a, .button a:visited {
- text-decoration: none;
+ .button.small a, #join-fsf a { display: inline-block; }
}
@@ -352,7 +354,8 @@
-webkit-border-radius: .4em;
-opera-border-radius: .4em;
}
-.box-shadow, .button a, #join-fsf a, #fssbox input[type="submit"] {
+p.button.large, .button.small a, #join-fsf a,
+ #fssbox input[type="submit"] {
box-shadow: 0 .15em #171d33;
-moz-box-shadow: 0 .15em #171d33;
-webkit-box-shadow: 0 .15em #171d33;
@@ -1049,30 +1052,30 @@
}
#home .first-column p.back { margin-bottom: 0; }
#home .second-column h4 img { height: .75em; width: .75em; }
-#home .emph-box { margin-top: 2.2em; }
-#home .emph-box h4 {
- text-align: center;
+#home p.button.large {
font-size: 1.5em;
-}
-#home .emph-box p { font-size: .9em; }
-#home .emph-box p small { font-size: 1em; }
-#home .button p {
- display: inline-block;
- font-size: 1.3em;
- padding: 0 .6em;
- margin: .85em 0 .7em 0;
- background: white;
+ font-family: "FreeSans", sans-serif;
+ padding: .25em .6em;
+ margin: 1.4em 0 1.6em 0;
border: .1em solid #999;
}
-#home .button a, a:visited {
- padding: .25em 0;
+#home .button a, #home .button a:visited {
color: #971611;
text-decoration: none;
- border: none;
- box-shadow: none;
}
#home .button a:hover { color: #777; }
-#software { font-family: "FreeSans", sans-serif; }
+#home .emph-box { margin-top: 0; }
+#home .emph-box h4 {
+ text-align: center;
+ font-size: 1.5em;
+ margin-top: .6em;
+}
+#home .emph-box p { font-size: .9em; }
+#home .emph-box p small { font-size: 1em; }
+#software {
+ font-family: "FreeSans", sans-serif;
+ margin-top: 2.5em;
+}
#Action {
text-align: left;
padding: 0 1em;
@@ -1084,7 +1087,7 @@
color: #171d33;
}
#Action li { margin-bottom: .7em; }
-p#backtotop { float: right; margin-top: 1.5em; }
+p#backtotop { float: right; margin-top: 2.5em; }
#sisters { font-size: .9em; margin: 0 3% 2em 3%; }
@media (max-width: 55em) {
#home .first-column, #home .second-column {
Index: home5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home5.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- home5.html 15 Nov 2015 14:00:26 -0000 1.57
+++ home5.html 19 Nov 2015 19:05:43 -0000 1.58
@@ -31,31 +31,27 @@
}
#home .first-column p.back { margin-bottom: 0; }
#home .second-column h4 img { height: .75em; width: .75em; }
-#home div.emph-box { margin-top: 0; }
-#home .emph-box h4 {
- text-align: center;
- font-size: 1.5em;
- margin-top: .6em;
-}
-#home .emph-box p { font-size: .9em; }
-#home .emph-box p small { font-size: 1em; }
-#home .button { margin: .5em 0 .8em 0; }
-#home .button p {
+#home p.button.large {
display: inline-block;
+ font-size: 1.5em;
font-family: "FreeSans", sans-serif;
- font-size: 1.3em;
- padding: 0 .6em;
- background: white;
+ padding: .25em .6em;
+ margin: 1.4em 0 1.6em 0;
border: .1em solid #999;
}
-#home .button a, a:visited {
- padding: .25em 0;
+#home .button a, #home .button a:visited {
color: #971611;
text-decoration: none;
- border: none;
- box-shadow: none;
}
#home .button a:hover { color: #777; }
+#home .emph-box { margin-top: 0; }
+#home .emph-box h4 {
+ text-align: center;
+ font-size: 1.5em;
+ margin-top: .6em;
+}
+#home .emph-box p { font-size: .9em; }
+#home .emph-box p small { font-size: 1em; }
#software {
font-family: "FreeSans", sans-serif;
margin-top: 2.5em;
@@ -93,14 +89,13 @@
</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/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
is at stake?</p>
<div id="home">
-
<div class="first-column">
<h2>What is GNU?</h2>
@@ -116,7 +111,7 @@
below</a>.</p>
<p class="c"><a href="/distros/screenshot.html"><img
- src="trisquel-medium.jpg" alt="Screenshot of GNU"
+ src="/distros/screenshots/trisquel-medium.jpg" alt="Screenshot of GNU"
/></a></p>
<h2>What is the Free Software Movement?</h2>
@@ -190,16 +185,17 @@
developing the Hurd because it is an interesting technical
project.</p>
-<p class="back"><a href="/gnu/gnu.html">More information</a></p>
+<p class="back"><a href="/gnu/gnu.html">More information</a>.</p>
</div><!-- /first-column -->
<div class="second-column">
-<div class="button"><p class="box-shadow"><a
+<div class="c"><p class="button large"><a
href="/distros/free-distros.html">Try GNU/Linux!</a></p></div>
<div class="emph-box">
+
<h4 id="Flashes"><a href="http://planet.gnu.org/";>Planet GNU</a>
<a href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png"
alt="RSS Feed" /></a></h4>
@@ -211,6 +207,7 @@
<div id="software">
<p><strong>Today's random package is…</strong></p>
+
<!--#include virtual="/server/home-pkgselect.html" -->
<!--#include virtual="/server/home-pkgblurbs.html" -->
@@ -228,15 +225,38 @@
<li><strong><a href="http://www.fsf.org/campaigns";>Support current FSF
campaigns</a></strong>.</li>
-<li><strong>Fight software patents</strong>
+<li>Defend <a href="http://www.laquadrature.net/en/Privacy";>
+privacy</a>, and support <a
+href="http://www.laquadrature.net/en/the-eu-commissions-outrageous-attempt-to-avoid-copyright-reform";>
+global copyright reform</a> with <a
+href="http://www.laquadrature.net/en/";>LQDN</a>.</li>
+
+<li>Support the efforts on net neutrality in Europe,
+<a href="http://www.savetheinternet.com"; title="Net
+neutrality in the United States of America">in the USA</a>
+and <a href="http://saveournet.ca/"; title="Net neutrality in
+Canada">in Canada</a>.</li>
+
+<li><strong>Fight against software patents:</strong>
<a href="http://www.endsoftpatents.org";>worldwide</a>,
-and elsewhere (rotate, one action at a time).</li>
+<a href="/server/takeaction.html#swpat">and Europe</a>.</li>
+
+<li><strong>Watch and share this movie:</strong> <a
+href="http://patentabsurdity.com";>Patent Absurdity</a>—made
+possible by <a href="http://www.fsf.org/associate/";>FSF associate
+members</a> like <a href="http://fsf.org/jfb";>you</a>.</li>
+
+<li><strong><a href="/server/takeaction.html#wipochange">Call
+on WIPO</a></strong> to change its name and mission.</li>
+
+<li>Students! <a href="http://www.aful.org/communiques/univ-offers-me-windows";>
+Claim a refund on your unused Microsoft Windows licences</a>.</li>
-<li>Defend privacy and net neutrality, oppose surveillance, TAFTA, DRM, etc.,
-worldwide and elsewhere (rotate, one action at a time).</li>
+<li><a href="/server/takeaction.html#directory">Add to the Free Software
+Directory</a>.</li>
</ul>
-<p class="back"><a href="/server/takeaction.html">More action items</a></p>
+<p class="back"><a href="/server/takeaction.html">More action items.</a></p>
</div><!-- /Action -->
@@ -268,14 +288,12 @@
<a href="/software/powerguru/">powerguru</a><span class="gnun-split"></span>.
See the package web pages for more information.</p>
-<p><strong>Can you help us <a href="/server/takeaction.html#directory"> update
the Free Software
-Directory</a>?</strong></p>
</div><!-- /highlight-para -->
</div><!-- /second-column -->
</div><!-- /home -->
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.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
@@ -315,7 +333,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/11/15 14:00:26 $
+$Date: 2015/11/19 19:05:43 $
<!-- timestamp end -->
</p>
</div>
Index: home2.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home2.fr.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- home2.fr.html 15 Nov 2015 14:00:26 -0000 1.22
+++ home2.fr.html 19 Nov 2015 19:05:43 -0000 1.23
@@ -14,100 +14,14 @@
partager et d'améliorer les logiciels qu'ils utilisent." />
<link rel="alternate" title="Planet GNU"
href="http://planet.gnu.org/rss20.xml"; type="application/rss+xml" />
-<style type="text/css" media="screen">
-<!--
-#home:after {
- clear: both; content: ""; display: block;
- height: 0px; visibility: hidden; width: 0px;
-}
-#home .first-column {
- width: 60%;
- float: left;
-}
-#home .second-column {
- width: 37%;
- float: right;
-}
-#content div#home h2 {
- text-shadow: none;
- margin-top: .9em; margin-bottom: .6em;
-}
-#home .first-column img {
- width: 100%; max-width: 35em;
- margin: .5em auto 0 auto;
-}
-#home .first-column p.back { margin-bottom: 0; }
-#home .second-column h4 img { height: .75em; width: .75em; }
-#home div.emph-box { margin-top: 0; }
-#home .emph-box h4 {
- text-align: center;
- font-size: 1.5em;
- margin-top: .6em;
-}
-#home .emph-box p { font-size: .9em; }
-#home .emph-box p small { font-size: 1em; }
-#home .button { margin: .5em 0 .8em 0; }
-#home .button p {
- display: inline-block;
- font-family: "FreeSans", sans-serif;
- font-size: 1.3em;
- padding: 0 .6em;
- background: white;
- border: .1em solid #999;
-}
-#home .button a, a:visited {
- padding: .25em 0;
- color: #971611;
- text-decoration: none;
- border: none;
- box-shadow: none;
-}
-#home .button a:hover { color: #777; }
-#software {
- font-family: "FreeSans", sans-serif;
- margin-top: 2.5em;
-}
-#Action {
- text-align: left;
- padding: 0 1em;
- margin: 2.5em 0;
- border-left: .4em solid #b9bcbf; border-right: .4em solid #b9bcbf;
-}
-#content div#home #Action h2 {
- text-align: center;
- color: #171d33;
-}
-#Action li { margin-bottom: .7em; }
-p#backtotop { float: right; margin-top: 2.5em; }
-#sisters { font-size: .9em; margin: 0 3% 2em 3%; }
--->
-<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
-<!--
-#home .first-column {
- clear: right;
- float: right;
-}
-#home .second-column, #backtotop { float: left; }
--->
-<!--#endif -->
-<!--
address@hidden (max-width: 55em) {
- #home .first-column, #home .second-column {
- float: none; width: 100%;
- }
-}
--->
-</style>
-
<!--#include virtual="/server/fs-gang-definitions.html" -->
<!--#include virtual="/po/home.translist" -->
<!--#include virtual="/server/staging/nav-bar/test9/banner.fr.html" -->
-<p class="no-display">GNU est le seul système d'exploitation qui ait été
développé spécialement
+<p class="netscape4">GNU est le seul système d'exploitation qui ait été
développé spécialement
pour donner à ses utilisateurs la liberté. Qu'est-ce que GNU et de quelle
liberté parle-t-on ?</p>
<div id="home">
-
<div class="first-column">
<h2>Qu'est-ce que GNUÂ ?</h2>
@@ -124,7 +38,7 @@
plus sur GNU, voir ci-dessous</a>.</p>
<p class="c"><a href="/distros/screenshot.html"><img
- src="trisquel-medium.jpg" alt="Copie d'écran de GNU"
+ src="/distros/screenshots/trisquel.png" alt="Copie d'écran de GNU"
/></a></p>
<h2>Qu'est-ce que le mouvement du logiciel libre ?</h2>
@@ -198,15 +112,14 @@
initié en 1990 (avant le début de Linux). Des bénévoles continuent à le
développer parce que c'est un projet technique intéressant.</p>
-<p class="back"><a href="/gnu/gnu.html">Plus d'informations</a>.</p>
+<p><a href="/gnu/gnu.html">Plus d'informations</a>.</p>
</div>
<!-- /first-column -->
<div class="second-column">
-<div class="button"><p class="box-shadow"><a
-href="/distros/free-distros.html">Essayer GNU/Linux</a></p></div>
+<p class="button c large"><a href="/distros/free-distros.html">Essayer
GNU/Linux</a></p>
<div class="emph-box">
@@ -218,15 +131,11 @@
et la <a href="/software/recent-releases.html">liste des publications
récentes de GNU</a>.</p>
-<div id="software">
-<p><strong>Today's random package is…</strong></p>
-
<!--#include virtual="/server/home-pkgselect.html" -->
<!--#include virtual="/server/home-pkgblurbs.fr.html" -->
-<p class="back"><a href="/manual/blurbs.html">Brèves descriptions de tous les
logiciels
+<p><a href="/manual/blurbs.html">Brèves descriptions de tous les logiciels
GNU</a></p>
-</div>
-<!-- id="software" -->
+
</div>
<!-- class="emph-box" -->
@@ -270,13 +179,19 @@
<li><a href="/server/takeaction.html#directory">Complétez le répertoire du
logiciel libre</a>.</li>
-</ul>
-<p class="back"><a href="/server/takeaction.html">Toutes les actions</a></p>
+<li><a href="/server/takeaction.html">Toutes les actions</a></li>
-</div>
+</ul>
+<!-- END TakeAction -->
+</div>
<!-- /Action -->
+</div>
+<!-- /second-column -->
+</div>
+
+<!-- /home -->
<div class="highlight-para">
<p><strong>Pouvez-vous contribuer à certains de ces <a
@@ -303,12 +218,8 @@
href="/software/powerguru/">powerguru</a>. Consultez les pages web de ces
logiciels pour plus ample information.</p>
</div>
-<!-- /highlight-para -->
-</div>
-<!-- /second-column -->
-</div>
-<!-- /home -->
+<!-- /highlight-para -->
<div class="translators-notes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -316,7 +227,7 @@
</div>
<!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/staging/nav-bar/footer-text.fr.html" -->
<p id="sisters">La <a href="http://www.fsf.org/";>FSF</a> a aussi des
organisations sÅurs en
<a href="http://www.fsfe.org";>Europe</a>, en <a
href="http://www.fsfla.org/";>Amérique latine</a> et en <a
@@ -361,7 +272,7 @@
<p class="unprintable"><!-- timestamp start -->
Dernière mise à jour :
-$Date: 2015/11/15 14:00:26 $
+$Date: 2015/11/19 19:05:43 $
<!-- timestamp end -->
</p>
Index: home.ko.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home.ko.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- home.ko.html 15 Nov 2015 15:08:39 -0000 1.3
+++ home.ko.html 19 Nov 2015 19:05:43 -0000 1.4
@@ -36,31 +36,27 @@
}
#home .first-column p.back { margin-bottom: 0; }
#home .second-column h4 img { height: .75em; width: .75em; }
-#home div.emph-box { margin-top: 0; }
-#home .emph-box h4 {
- text-align: center;
- font-size: 1.5em;
- margin-top: .6em;
-}
-#home .emph-box p { font-size: .9em; }
-#home .emph-box p small { font-size: 1em; }
-#home .button { margin: .5em 0 .8em 0; }
-#home .button p {
+#home p.button.large {
display: inline-block;
+ font-size: 1.5em;
font-family: "FreeSans", sans-serif;
- font-size: 1.3em;
- padding: 0 .6em;
- background: white;
+ padding: .25em .6em;
+ margin: 1.4em 0 1.6em 0;
border: .1em solid #999;
}
-#home .button a, a:visited {
- padding: .25em 0;
+#home .button a, #home .button a:visited {
color: #971611;
text-decoration: none;
- border: none;
- box-shadow: none;
}
#home .button a:hover { color: #777; }
+#home .emph-box { margin-top: 0; }
+#home .emph-box h4 {
+ text-align: center;
+ font-size: 1.5em;
+ margin-top: .6em;
+}
+#home .emph-box p { font-size: .9em; }
+#home .emph-box p small { font-size: 1em; }
#software {
font-family: "FreeSans", sans-serif;
margin-top: 2.5em;
@@ -108,7 +104,6 @@
<p class="no-display">GNUë ì¬ì©ìê° ìì ë¡ê² ì¬ì©í ì ìê²
ê°ë°ë ì ì¼í ì´ìì²´ì ì
ëë¤. GNUë 무ìì´ë©°, ì´ë í
ìì ê° ìíë¡ì¸ê¹ì?</p>
<div id="home">
-
<div class="first-column">
<h2>GNUë 무ìì¸ê°?</h2>
@@ -120,7 +115,7 @@
ì¶ì²í©ëë¤. (ì¢ë ì íí ë§íë©´, GNU/Linux ë°°í¬í) <a
href="#More-GNU">GNUì ìì¸ ë´</a>.</p>
<p class="c"><a href="/distros/screenshot.html"><img
- src="trisquel-medium.jpg" alt="GNU ì¤í íë©´"
+ src="/distros/screenshots/trisquel-medium.jpg" alt="GNU ì¤í íë©´"
/></a></p>
<h2>ìì ìíí¸ì¨ì´ ì´ëë 무ìì¸ê°?</h2>
@@ -185,9 +180,10 @@
<!-- /first-column -->
<div class="second-column">
-<div class="button"><p class="box-shadow">ë³´<a
href="/distros/free-distros.html">ì§ê¸ GNU/Linux! ë´ë ¤ë°ê¸°</a></p></div>
+<div class="c"><p class="button large">ë³´<a
href="/distros/free-distros.html">ì§ê¸ GNU/Linux! ë´ë ¤ë°ê¸°</a></p></div>
<div class="emph-box">
+
<h4 id="Flashes"><a href="http://planet.gnu.org/";>Planet GNU</a> <a
href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png"
alt="RSS í¼ë" /></a></h4>
@@ -285,7 +281,7 @@
</div>
<!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.ko.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<p id="sisters"><a href="http://www.fsf.org/";>FSF</a>ë <a
href="http://www.fsfe.org";>ì ë½</a>ê³¼
<a href="http://www.fsfla.org/";>ë¼í´ ìë©ë¦¬ì¹´</a>, <a
href="http://fsf.org.in/";>ì¸ë</a>ì ì매 기ê´ì ê°ê³
ììµëë¤.</p>
@@ -326,7 +322,7 @@
<p class="unprintable"><!-- timestamp start -->
ìµì¢
ìì ì¼:
-$Date: 2015/11/15 15:08:39 $
+$Date: 2015/11/19 19:05:43 $
<!-- timestamp end -->
</p>