[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test8 edu-cases-indi...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test8 edu-cases-indi... |
|
Date: |
Thu, 26 Dec 2013 22:52:57 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 13/12/26 22:52:57
Modified files:
server/staging/nav-bar/test8: edu-cases-india-ambedkar.html
home.html philosophy.fr.html
edu-schools.fr.html layout.css
style.fr.css
Log message:
Remove min-width, change join-fsf button and minor changes
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/edu-cases-india-ambedkar.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/home.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/philosophy.fr.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/edu-schools.fr.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/layout.css?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/style.fr.css?cvsroot=www&r1=1.2&r2=1.3
Patches:
Index: edu-cases-india-ambedkar.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test8/edu-cases-india-ambedkar.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edu-cases-india-ambedkar.html 24 Dec 2013 12:49:09 -0000 1.3
+++ edu-cases-india-ambedkar.html 26 Dec 2013 22:52:57 -0000 1.4
@@ -61,8 +61,11 @@
<!-- start of server/body-include-2 -->
<div id="header">
-
-
+<div id="logo">
+ <p><a href="/">
+ <img class="imgleft" src="heckert_gnu.small.png" alt=" [A GNU head] " />
+ <br /> <strong>GNU</strong><br /> Operating System</a></p>
+</div><!-- /logo -->
<!-- Begin fundraising banner -->
<div id="fundraiserbanner2013-14">
@@ -83,9 +86,7 @@
Donate today, and build us up for 2014.</a></p>
</div>
</div><!-- /fundraising banner -->
- <div id="logo">
- <a href="/"><img class="topbanner" src="new-topbanner.jpg" alt="GNU
Operating System" /></a>
- </div><!-- /logo -->
+
</div><!-- /header -->
<div id="navigation">
@@ -222,10 +223,9 @@
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/";>
Creative Commons Attribution-Share Alike 3.0 Unported License</a>.</p>
-<a href="/education/edu-cases-india.html">More Case Studies
-in India</a> <br />
-<a href="/education/edu-cases.html">Back to Case Studies</a>
-
+<p id="back"><a href="/education/edu-cases-india.html">More Case Studies
+in India</a>
+<br /><a href="/education/edu-cases.html">Back to Case Studies</a></p>
</div><!-- for id="content", starts in the include above -->
<!-- begin server/footer-text.html -->
@@ -242,14 +242,10 @@
</ul>
</div>
- <div class="yui-g" id="mission-statement">
- <div class="fsf-join">
- <a href="http://fsf.org/jfb";><img
src="http://www.april.org/files/join-fsf.en.png";
- title="Join FSF banner" alt="Join FSF banner"/></a>
- </div>
+<div class="yui-g" id="mission-statement">
<div id="fssbox">
- <h4>Sign up for the <br /><a href="http://www.fsf.org/fss";>Free SoftwareÂ
Supporter</a></h4>
+ <h4>Sign up for the<br /><a href="http://www.fsf.org/fss";>Free SoftwareÂ
Supporter</a></h4>
<p>A monthly email newsletter about GNU and Free Software</p>
<form
action="https://crm.fsf.org/civicrm/profile/create&reset=1&gid=31";
method="post">
<div>
@@ -258,7 +254,7 @@
<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><label>Enter your email address (e.g. address@hidden)</label></p>
+ <p><label>Enter your email address<br />(address@hidden)</label></p>
<p><input type="text" id="frmEmail" name="email-Primary" size="15"
maxlength="80" />
<input type="submit" name="_qf_Edit_next" value="Ok" /></p>
</form>
@@ -266,28 +262,34 @@
<p>The <a href="http://www.fsf.org";>Free Software
Foundation</a> is the principal organizational sponsor of the <a
-href="http://www.gnu.org/";>GNU Operating System</a>. <strong>Our
+href="http://www.gnu.org/";>GNU Operating System</a>.</p>
+
+<p><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> Support GNU and the FSF by <a
+rights of Free Software users.â</strong></p>
+
+<p>Support GNU and the FSF by <a
href="http://shop.fsf.org/";>buying manuals and gear</a>, <a
href="http://www.fsf.org/join";>joining the FSF as an associate
member</a> or by making a
donation, 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>The <a href="http://www.fsf.org/";>FSF</a> also has sister
+<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
+JOINÂ Â <img src="logo-fsf.org-notext.png" alt=" [FSF Logo] "/>Â Â NOW</a><br
/>
+
+<strong>⇒</strong> The FSF also has sister
organizations in <a href="http://www.fsfe.org";>Europe</a>, <a
href="http://www.fsfla.org/";>Latin America</a> and <a
href="http://fsf.org.in/";>India</a>.</p>
-<p id="backtotop"><a href="#header">back to top</a></p>
-
-
-
+<p id="backtotop"><a href="#header">Back to Top</a></p>
</div>
+
<!-- end server/footer-text.html -->
+
<div id="footer">
<p>Please send general FSF & GNU inquiries to
@@ -328,7 +330,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/12/24 12:49:09 $
+$Date: 2013/12/26 22:52:57 $
<!-- timestamp end -->
</p>
</div>
Index: home.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test8/home.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- home.html 24 Dec 2013 11:37:10 -0000 1.6
+++ home.html 26 Dec 2013 22:52:57 -0000 1.7
@@ -78,31 +78,11 @@
<!-- start of server/body-include-2 -->
<div id="header">
-
-
-
-<!-- Begin fundraising banner -->
-<div id="fundraiserbanner2013-14">
-<a href="https://www.fsf.org/appeal/2013";><img class="right"
-src="building.png" alt="building progress meter" /></a>
-
-<div class="text">
-<p><a href="https://www.fsf.org/appeal/2013";
-class="nounderline"><strong class="nounderline">Free software is a
-cornerstone of any modern free society.</br /> We build this
-foundation.</strong></a></p>
-
-<p><a href="https://www.fsf.org/appeal/2013";
-class="nounderline">With your help, we will raise $450,000 this winter</br />
-to make this foundation even stronger.</a></p>
-
-<p><a href="https://www.fsf.org/appeal/2013";>
-Donate today, and build us up for 2014.</a></p>
-</div>
-</div><!-- /fundraising banner -->
- <div id="logo">
- <a href="/"><img class="topbanner" src="new-topbanner.jpg" alt="GNU
Operating System" /></a>
- </div><!-- /logo -->
+<div id="logo">
+ <p><a href="/">
+ <img class="imgleft" src="heckert_gnu.small.png" alt=" [A GNU head] " />
+ <br /> <strong>GNU</strong><br /> Operating System</a></p>
+</div><!-- /logo -->
</div><!-- /header -->
<div id="navigation">
@@ -310,6 +290,7 @@
</div><!-- class="yui-g highlight-para" -->
</div><!-- for id="content", starts in the include above -->
+
<!-- begin server/footer-text.html -->
<div class="yui-g" id="fsf-links">
@@ -324,14 +305,10 @@
</ul>
</div>
- <div class="yui-g" id="mission-statement">
- <div class="fsf-join">
- <a href="http://fsf.org/jfb";><img
src="http://www.april.org/files/join-fsf.en.png";
- title="Join FSF banner" alt="Join FSF banner"/></a>
- </div>
+<div class="yui-g" id="mission-statement">
<div id="fssbox">
- <h4>Sign up for the <br /><a href="http://www.fsf.org/fss";>Free SoftwareÂ
Supporter</a></h4>
+ <h4>Sign up for the<br /><a href="http://www.fsf.org/fss";>Free SoftwareÂ
Supporter</a></h4>
<p>A monthly email newsletter about GNU and Free Software</p>
<form
action="https://crm.fsf.org/civicrm/profile/create&reset=1&gid=31";
method="post">
<div>
@@ -340,7 +317,7 @@
<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><label>Enter your email address (e.g. address@hidden)</label></p>
+ <p><label>Enter your email address<br />(address@hidden)</label></p>
<p><input type="text" id="frmEmail" name="email-Primary" size="15"
maxlength="80" />
<input type="submit" name="_qf_Edit_next" value="Ok" /></p>
</form>
@@ -348,27 +325,31 @@
<p>The <a href="http://www.fsf.org";>Free Software
Foundation</a> is the principal organizational sponsor of the <a
-href="http://www.gnu.org/";>GNU Operating System</a>. <strong>Our
+href="http://www.gnu.org/";>GNU Operating System</a>.</p>
+
+<p><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> Support GNU and the FSF by <a
+rights of Free Software users.â</strong></p>
+
+<p>Support GNU and the FSF by <a
href="http://shop.fsf.org/";>buying manuals and gear</a>, <a
href="http://www.fsf.org/join";>joining the FSF as an associate
member</a> or by making a
donation, 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>The <a href="http://www.fsf.org/";>FSF</a> also has sister
+<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
+JOINÂ Â <img src="logo-fsf.org-notext.png" alt=" [FSF Logo] "/>Â Â NOW</a><br
/>
+
+<strong>⇒</strong> The FSF also has sister
organizations in <a href="http://www.fsfe.org";>Europe</a>, <a
href="http://www.fsfla.org/";>Latin America</a> and <a
href="http://fsf.org.in/";>India</a>.</p>
-<p id="backtotop"><a href="#header">back to top</a></p>
-
-
-
-
+<p id="backtotop"><a href="#header">Back to Top</a></p>
</div>
+
<!-- end server/footer-text.html -->
<div id="footer">
@@ -407,7 +388,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/12/24 11:37:10 $
+$Date: 2013/12/26 22:52:57 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test8/philosophy.fr.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy.fr.html 24 Dec 2013 09:51:06 -0000 1.7
+++ philosophy.fr.html 26 Dec 2013 22:52:57 -0000 1.8
@@ -97,8 +97,11 @@
<!-- start of server/body-include-2 -->
<div id="header">
-
-
+<div id="logo">
+ <p><a href="/">
+ <img class="imgleft" src="heckert_gnu.small.png" alt=" [Une tête de GNU] " />
+ <br /> <strong>GNU</strong><br />
le système d'exploitation</a></p>
+</div><!-- /logo -->
<!-- Begin fundraising banner -->
<div id="fundraiserbanner2013-14">
@@ -117,11 +120,7 @@
rendre plus solides en 2014.</a></p>
</div><!-- /text -->
</div><!-- /fundraising banner -->
- <div id="logo">
- <p><a href="/">
- <img class="imgleft" src="heckert_gnu.small.png" alt=" [Une tête de GNU] "
/>
- <br /> <strong>GNU</strong><br /> le système
d'exploitation</a></p>
- </div><!-- /logo -->
+
</div><!-- /header -->
<div id="navigation">
@@ -242,21 +241,23 @@
électroniques</a>.</p>
-<div style="font-size: small;">
+<div id="transnotes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
<b>Note de traduction</b><ol>
<li id="TransNote1">En anglais, le mot <cite>free</cite> veut dire
« libre », mais aussi « gratuit », d'où la confusion possible. <a
-href="#TransNote1-rev">↑</a></li></ol></div>
+href="#TransNote1-rev">↑</a></li></ol>
+
</div>
+</div>
<!-- for id="content", starts in the include above -->
<!-- begin server/footer-text.html -->
- <div class="yui-g" id="fsf-links">
+<div class="yui-g" id="fsf-links">
<ul>
<li><a href="home.html">Accueil GNU</a></li>
<li><a href="http://www.fsf.org/";>Accueil FSF</a></li>
@@ -266,14 +267,10 @@
<li><a href="http://directory.fsf.org";>Répertoire du logiciel
libre</a></li>
<li><a href="/server/sitemap.html">Plan du site</a></li>
</ul>
- </div>
+</div>
- <div class="yui-g" id="mission-statement">
- <div class="fsf-join">
+<div class="yui-g" id="mission-statement">
- <a href="http://fsf.org/jfb";><img
src="http://www.april.org/files/join-fsf.en.png";
- title="Join FSF banner" alt="Join FSF banner"/></a>
- </div>
<div id="fssbox">
<h4>Abonnez-vous au<br /><a href="http://www.fsf.org/fss";>Free SoftwareÂ
Supporter</a></h4>
<p>un courriel d'information mensuel sur GNU et le logicielÂ
libre</p>
@@ -289,12 +286,17 @@
<input type="submit" name="_qf_Edit_next" value="Ok" /></p>
</form>
</div><!-- /fssbox -->
+
<p>La <a href="http://www.fsf.org";>Free Software Foundation</a> est le
principal sponsor institutionnel du <a href="http://www.gnu.org/";>système
-d'exploitation GNU</a>. <strong>Notre mission est de préserver, protéger et
+d'exploitation GNU</a>.</p>
+
+<p><strong>« Notre mission est de préserver, protéger et
promouvoir la liberté d'utiliser, d'étudier, de copier, de modifier et de
redistribuer les programmes informatiques, et de défendre les droits des
-utilisateurs de logiciels libres.</strong> Soutenez GNU et la FSF <a
+utilisateurs de logiciels libres. »</strong></p>
+
+<p>Soutenez GNU et la FSF <a
href="http://shop.fsf.org/";>en achetant des manuels et autres objets</a>, <a
href="http://www.fsf.org/join";>en adhérant à la FSF en tant que membre
associé</a> ou en faisant un don, soit <a
@@ -302,13 +304,15 @@
href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via
Flattr</a>.</p>
+<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
+REJOIGNEZÂ Â LAÂ Â <img src="logo-fsf.org-notext.png" alt=" [FSF Logo]
"/></a></p>
+
<p id="backtotop"><a href="#header">Haut de la page</a></p>
- </div>
+</div>
<!-- end server/footer-text.html -->
-
<div id="footer">
<p>Veuillez envoyer les requêtes concernant la FSF et GNU à <a
@@ -365,13 +369,13 @@
Commons attribution de paternité, pas de modification, 3.0 Ãtats-Unis
(CC BY-ND 3.0 US)</a>.</p>
-
<div id="translators-credits">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
Traduction : Odile Bénassy.<br />Révision : <a
href="mailto:trad-gnu@april.org";>trad-gnu@april.org</a>
</div>
+
<!-- start of server/bottom-notes.html -->
<br />
<p id="bottom-notes"><a
href="http://www.fsf.org/about/dmca-notice";>Notification
@@ -381,7 +385,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/12/24 09:51:06 $
+$Date: 2013/12/26 22:52:57 $
<!-- timestamp end -->
</p>
</div>
Index: edu-schools.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test8/edu-schools.fr.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-schools.fr.html 24 Dec 2013 11:37:10 -0000 1.2
+++ edu-schools.fr.html 26 Dec 2013 22:52:57 -0000 1.3
@@ -106,9 +106,11 @@
rendre plus solides en 2014.</a></p>
</div>
</div><!-- /fundraising banner -->
- <div id="logo">
- <a href="/"><img class="topbanner" src="new-topbanner.fr.jpg" alt="Système
d'exploitation GNU" /></a>
- </div><!-- /logo -->
+<div id="logo">
+ <p><a href="/">
+ <img class="imgleft" src="heckert_gnu.small.png" alt=" [Une tête de GNU] " />
+ <br /> <strong>GNU</strong><br /> le systèmeÂ
d'exploitation</a></p>
+</div><!-- /logo -->
</div><!-- /header -->
<div id="navigation">
@@ -308,7 +310,7 @@
<!-- begin server/footer-text.html -->
- <div class="yui-g" id="fsf-links">
+<div class="yui-g" id="fsf-links">
<ul>
<li><a href="home.html">Accueil GNU</a></li>
<li><a href="http://www.fsf.org/";>Accueil FSF</a></li>
@@ -318,13 +320,9 @@
<li><a href="http://directory.fsf.org";>Répertoire du logiciel
libre</a></li>
<li><a href="/server/sitemap.html">Plan du site</a></li>
</ul>
- </div>
+</div>
- <div class="yui-g" id="mission-statement">
- <div class="fsf-join">
- <a href="http://fsf.org/jfb";><img
src="http://www.april.org/files/join-fsf.en.png";
- title="Join FSF banner" alt="Join FSF banner"/></a>
- </div>
+<div class="yui-g" id="mission-statement">
<div id="fssbox">
<h4>Abonnez-vous au<br /><a href="http://www.fsf.org/fss";>Free SoftwareÂ
Supporter</a></h4>
@@ -341,12 +339,17 @@
<input type="submit" name="_qf_Edit_next" value="Ok" /></p>
</form>
</div><!-- /fssbox -->
+
<p>La <a href="http://www.fsf.org";>Free Software Foundation</a> est le
principal sponsor institutionnel du <a href="http://www.gnu.org/";>système
-d'exploitation GNU</a>. <strong>Notre mission est de préserver, protéger et
+d'exploitation GNU</a>.</p>
+
+<p><strong>« Notre mission est de préserver, protéger et
promouvoir la liberté d'utiliser, d'étudier, de copier, de modifier et de
redistribuer les programmes informatiques, et de défendre les droits des
-utilisateurs de logiciels libres.</strong> Soutenez GNU et la FSF <a
+utilisateurs de logiciels libres. »</strong></p>
+
+<p>Soutenez GNU et la FSF <a
href="http://shop.fsf.org/";>en achetant des manuels et autres objets</a>, <a
href="http://www.fsf.org/join";>en adhérant à la FSF en tant que membre
associé</a> ou en faisant un don, soit <a
@@ -354,9 +357,12 @@
href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via
Flattr</a>.</p>
+<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
+REJOIGNEZÂ Â LAÂ Â <img src="logo-fsf.org-notext.png" alt=" [FSF Logo]
"/></a></p>
+
<p id="backtotop"><a href="#header">Haut de la page</a></p>
- </div>
+</div>
<!-- end server/footer-text.html -->
@@ -417,7 +423,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/12/24 11:37:10 $
+$Date: 2013/12/26 22:52:57 $
<!-- timestamp end -->
</p>
</div>
Index: layout.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test8/layout.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- layout.css 24 Dec 2013 09:51:06 -0000 1.7
+++ layout.css 26 Dec 2013 22:52:57 -0000 1.8
@@ -26,12 +26,12 @@
/* colors
#111, #333, #555, #666666, #ddd, #eee, #ededed
shades of pure gray: special items
- #f1f2f3, very light bluish gray: button, footer
- #e7e9eb, light bluish gray: translations, edu-nav bar
+ #f1f2f3 very light bluish gray: button, footer
+ #e7e9eb light bluish gray: translations, edu-nav bar
#c9cccf bluish gray: top links, searcher, nav bars (main and fsf links)
- #971611 red from GNU banner
- #8c1410 almost the same, a bit darker: special, active and visited links
- #b11107 red from FSF logo: button link, navbar li background
+ #810606 red from join-fsf button: special, active and visited links
+ #971611 red from GNU banner: button link, navbar li background
+ #b11107 red from FSF logo: border around highlighted boxes
#ee0800 brighter red: hover normal links
#171d33 dark blue (from screenshot), edu-cases ridges, shade behind button
#334683 blue from banner: h2, normal links
@@ -65,7 +65,7 @@
}
a[href] { color: #334683; }
-a[href]:visited { color: #b11107; }
+a[href]:visited { color: #810606; }
a[href]:active, a[href]:hover { color: #ee0800; }
a:hover { color: #ee0800; }
@@ -75,7 +75,6 @@
img { border: 0; }
-
.center, .c { text-align: center; }
.nocenter{ text-align: left; }
@@ -105,7 +104,6 @@
#toplinks {
font-size: .9em;
font-weight: bold;
- min-width: 50em;
line-height: 2.6em; padding-left: 1em;
margin-bottom: .2em;
background-color: #c9cccf;
@@ -117,7 +115,7 @@
font-size: 1.1em;
padding-top: .3em;
}
-#toplinks span.fsf a { color: #8c1410 !important; }
+#toplinks span.fsf a { color: #810606 !important; }
#toplinks span.fsf a:hover {
color: #222 !important; text-decoration: underline;
}
@@ -139,7 +137,7 @@
font-size: 1.1em; font-weight: bold;
padding-top: .3em;
}
-#translations span.original a { color: #8c1410 !important; }
+#translations span.original a { color: #810606 !important; }
#translations span.original a:hover {
color: #333 !important; text-decoration: underline;
}
@@ -156,22 +154,23 @@
/*** HEADER ***/
-#header { min-width: 72em; }
#header:after {
clear: both; content: ""; display: block;
height: 0px; visibility: hidden; width: 0px;
}
#logo {
+ width: 10em; float: left;
font-size: 2em;
font: sans-serif;
- font-weight: bold; line-height: normal;
+ font-weight: bold; line-height: .8em;
padding-left: 1em;
- margin-bottom: .7em;
+ margin-top: .5em; margin-bottom: .4em;
}
#logo img {
- height: 4.054em; margin: 0; padding: 0;
- position: relative; top: .86em;
+ height: 3.5em; margin: 0; padding: 0;
+ position: relative; top: .25em;
}
+#logo p { margin: 0; }
#logo a strong {
color: #971611; font-size: 1.89em; font-style: normal;
}
@@ -183,20 +182,18 @@
/*** SPECIAL BANNER ***/
/* Begin fundraising banner */
-#fundraiserbanner2013-14 {
- clear:both;
- float: right; width: 43em;
-}
+#fundraiserbanner2013-14 { min-width: 65%; float: right; }
+
#fundraiserbanner2013-14 .right {
float: right; height: 8em;
- padding-top: 1.3em; padding-right: .5em;
+ padding-top: 1.4em; padding-right: .7em;
}
#fundraiserbanner2013-14 .text {
text-align: left;
font: 1.1em sans-serif;
- line-height: 1.2em; padding: 0 .6em;
- margin: 1.4em 0;
- border-left: .2em solid #334683;
+ line-height: 1.2em; padding: .3em .5em;
+ margin: .91em; margin-left: 0;
+ border: 1px solid #c9cccf;
}
#fundraiserbanner2013-14 p { margin: .3em; }
/* End fundraising banner */
@@ -221,10 +218,10 @@
font-weight: bold;
padding: .3em .9em;
color: white; text-decoration: none;
- background-color: #b11107;
+ background-color: #971611;
}
#navigation li.active a {
- color: #8c1410; background-color: transparent;
+ color: #810606; background-color: transparent;
}
#navigation li a:hover {
text-decoration: underline;
@@ -246,7 +243,7 @@
color: #334683;
}
#content:lang(ar), #content:lang(fa), #content:lang(he) { text-align: right; }
-#content h2 a { color: #8c1410 !important; }
+#content h2 a { color: #810606 !important; }
#content h3, #content h4, #content h5, #content h6 { line-height: 1.5em; }
#content h3 { font-size: 1.6em; }
#content h4 { font-size: 1.3em; }
@@ -260,8 +257,10 @@
#content li, #fsf-campaigns li, #content dd, #content p, #content pre,
#content dt, #content code, #content address { line-height: 1.3em; }
+#transnotes { font-size: .9em; }
-/*** EXTERNAL LINKS ***/
+
+/*** ADDITIONAL LINKS ***/
#fsf-links ul {
text-align: center;
@@ -282,32 +281,41 @@
/*** FSF STUFF ***/
#mission-statement {
- font-size: 0.9em;
+ font-size: .9em;
line-height: 1.3em;
- padding: 2.2em 1em 0 1em;
-}
-#mission-statement .fsf-join {
- float: right;
- width: 10em;
- margin: 3em 1em 2em 2em;
+ margin: 2.2em 1.1em 0 1.1em;
}
-#mission-statement .fsf-join img { width: 100%; }
+#join-fsf {
+ font-size: 1.2em;
+ line-height: 2.2em;
+ text-align: center;
+}
+#join-fsf a, #join-fsf a:visited {
+ font-weight: bold;
+ color: #b11107; text-decoration: none;
+}
+#join-fsf a:hover { color: #333; text-decoration: underline; }
+#join-fsf img {
+ height: 1.8em;
+ position: relative; top: .5em;
+}
#fssbox {
float: left;
text-align: center;
font-size: 1em;
- width: 25em;
+ width: 17em;
line-height: 1.2em;
- padding: .7em .5em 0 .5em;
- margin: .2em 1em 1.8em 1em;
+ padding: 1em .5em .5em .5em;
+ margin: .2em 1em 1em 0;
border: .23em solid #b11107;
}
+#fsf-sisters { text-align: center; }
#backtotop {
text-align: right;
font-size: 1.1em; font-weight: bold;
- margin-top: 2em; margin-right: 1em;
+ margin: 2em 0 2em 0;
}
@@ -315,7 +323,7 @@
#footer {
font-size: .9em;
- padding: 2em;
+ padding: 1em;
background-color: #f1f2f3;
border-top: 1px solid #c9cccf;
}
@@ -343,7 +351,7 @@
/* -moz-border-radius: 0.4em;
-khtml-border-radius: 0.4em;*/
}
-.button a { color: #b11107; text-decoration: none; }
+.button a { color: #971611; text-decoration: none; }
.button a:hover { color: #ee0800; }
.large { font-size: 2em; background-color: #e7e9eb }
@@ -441,10 +449,10 @@
color: #333; text-decoration: none;
}
p.edu-breadcrumb { text-align: center; padding: .5em; }
-p.edu-breadcrumb a { color: #8c1410 !important; text-decoration: none }
+p.edu-breadcrumb a { color: #810606 !important; text-decoration: none }
#edu-navigation li.active a, #edu-navigation li a:hover {
- color: #8c1410 !important;
+ color: #810606 !important;
}
#edu-navigation li a:hover, p.edu-breadcrumb a:hover {
color: #333 !important;
@@ -469,6 +477,8 @@
margin-right: 3em;
}
+#back { text-align: right; font-weight: bold; }
+
/* End items specific to education */
Index: style.fr.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test8/style.fr.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- style.fr.css 24 Dec 2013 09:51:06 -0000 1.2
+++ style.fr.css 26 Dec 2013 22:52:57 -0000 1.3
@@ -29,8 +29,11 @@
ol#translator-notes-alpha li{list-style-type: lower-alpha;}
-/* No arrow in the header. It doesn' look good with FSF campaign material. */
+/* No arrow in the header. It doesn't look good with FSF campaign material. */
#header a[href^="http://"]:before,
a[href^="https://"]:before { content: ""; }
-.fsf-join a[href^="http://"]:before,
-a[href^="https://"]:before { content: ""; }
+
+/* Give more space to the French topbanner and less space to the fundraiser */
+#logo { width: 12em; }
+#fundraiserbanner2013-14 { min-width: 61.5%; }
+