[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test8 layout.css phi...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test8 layout.css phi... |
|
Date: |
Sun, 29 Dec 2013 18:33:53 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 13/12/29 18:33:53
Modified files:
server/staging/nav-bar/test8: layout.css philosophy.fr.html
edu-schools.fr.html home.html
edu-cases-india-ambedkar.html
Log message:
Adjust colors, list luminosity contrast ratios, restore local links.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/layout.css?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/philosophy.fr.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/edu-schools.fr.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/home.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/edu-cases-india-ambedkar.html?cvsroot=www&r1=1.9&r2=1.10
Patches:
Index: layout.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test8/layout.css,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- layout.css 29 Dec 2013 10:03:35 -0000 1.17
+++ layout.css 29 Dec 2013 18:33:52 -0000 1.18
@@ -24,25 +24,52 @@
/*** GENERAL SETTINGS ***/
/* 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
+ white background for inner, searcher, text nav bar & listing
+ standard blue, red: urgent
+ black gpl-compat-matrix, takeactionhomepage (unused?)
+ #111, #222, #333, #555, #666666, #ddd, #eee, #ededed
+ shades of pure gray: text, listing, special items
+ #e7e9eb light bluish gray: translations, edu-nav bar, button, emph-box,
+ footer
#c9cccf bluish gray: top links, searcher, nav bars (main and fsf links)
- #971611 red from GNU banner: button link, navbar li background, special,
- active and visited links
+ #810606 red from join-fsf button: special links
+ #971611 red from GNU banner: button link, navigation li background, active
+ links in nav bars, normal visited links
#b11107 red from FSF logo: border around highlighted boxes, join-fsf link
- #ee0800 brighter red: hover normal links
- #171d33 dark blue (from screenshot), edu-cases ridges, shade behind button
+ #ff0000 pure red: hover
+ #44536b dull blue: background for body
#334683 blue from GNU banner: h2, normal links
- #44536b dull blue: screen background
+ #171d33 dark blue (from screenshot), edu-cases ridges, shade behind button
#ffc pale yellow: highlight background
#ff3 yellow: urgent
#ccffcc light green: gpl-compat-matrix
#e4ffcc light yellowish green: gpl-compat-matrix
- standard blue, red: urgent
*/
+/* Luminosity contrast ratio
+ source: http://springmeier.org/www/contrastcalculator/index.php
+ #333 vs. white 12.63
+ #333 vs. #e7e9eb 10.38
+ #333 vs. #c9cccf 7.83
+ #222 vs. #c9cccf 9.87
+ #971611 vs. white 8.61
+ #971611 vs. #e7e9eb 7.07
+ #971611 vs. #c9cccf 5.34
+ #750000 vs. #c9cccf 7.41
+ #334683 vs. white 8.96
+ #334683 vs. #e7e9eb 7.36
+ #334683 vs. black 2.34
+ #ff0000 vs. #334683 2.24
+ #ff0000 vs. 971611 2.15
+ #ff0000 vs. #750000 2.99
+ #ff0000 vs. #333 3.16
+ #ff0000 vs. #222 3.98
+ #ff0000 vs. #c9cccf 2.48
+ #ff0000 vs. #e7e9eb 3.29
+ #ff0000 vs. white 4.00
+*/
+
+
html, body {
font-size: 1em;
text-align: inherit;
@@ -60,13 +87,12 @@
position: relative;
margin: auto; width: 99%; max-width:74.92em; overflow: hidden;
background-color: white;
- margin-top: .27em; margin-bottom: .27em;
}
a[href] { color: #334683; }
a[href]:visited { color: #971611 !important; }
-a[href]:active, a[href]:hover { color: #ee0800; }
-a:hover { color: #ee0800; }
+a[href]:active, a[href]:hover { color: #ff0000; }
+a:hover { color: #ff0000; }
blockquote { margin: 1em; font-style: italic; }
@@ -103,7 +129,7 @@
#toplinks {
font-size: .9em;
font-weight: bold;
- line-height: 2.6em;
+ line-height: 2.4em;
padding-left: 1em;
margin-bottom: .2em;
background-color: #c9cccf;
@@ -111,22 +137,22 @@
#toplinks a, #toplinks a:visited {
color: #222 !important; text-decoration: none;
}
-#toplinks a:hover { color: #ee0800 !important; text-decoration: underline; }
+#toplinks a:hover { color: #ff0000 !important; }
/* Highlight the link to the FSF mission statement */
#toplinks span.fsf {
font-size: 1.1em;
padding-top: .3em;
}
-#toplinks span.fsf a { color: #971611 !important; }
+#toplinks span.fsf a, #toplinks span.fsf a:visited { color: #750000
!important; }
#toplinks span.fsf a:hover {
- color: #ee0800 !important; text-decoration: underline;
+ color: #ff0000 !important;
}
#searcher {
float: right; width: 22em;
text-align: right;
font-weight: bold;
- line-height: 2.6em;
+ line-height: 2.4em;
padding-right: 1em;
color: white;
background-color: #c9cccf;
@@ -136,8 +162,8 @@
#translations {
clear: both;
font-size: .9em;
- line-height: 1.4em;
- padding-left:.6em; padding-bottom: .3em;
+ line-height: 1.3em;
+ padding-left:.6em; padding-bottom: .2em;
background-color: #e7e9eb;
}
#translations span {
@@ -145,18 +171,18 @@
margin-left: .3em; margin-right: .3em;
}
#translations a, #translations a:visited {
- color: #333 !important; text-decoration: none;
+ color: #222 !important; text-decoration: none;
}
-#translations a:hover { color: #ee0800 !important; text-decoration: underline;
}
+#translations a:hover { color: #ff0000 !important; }
#translations p { margin-bottom: 0.3em; }
/* Highlight the link to the original page */
#translations span.original {
font-size: 1.1em; font-weight: bold;
padding-top: .3em;
}
-#translations span.original a { color: #971611 !important; }
+#translations span.original a, #translations span.original a:visited { color:
#750000 !important; }
#translations span.original a:hover {
- color: #ee0800 !important; text-decoration: underline;
+ color: #ff0000 !important;
}
@@ -164,22 +190,22 @@
/* Begin fundraising banner */
#fundraiserbanner2013-14 {
- max-width: 69em;
+ max-width: 64em;
margin: auto; margin-top: .5em; margin-bottom: 2em;
}
#fundraiserbanner2013-14 .right {
float: right;
- height: 7.2em;
+ height: 6.7em;
margin: 0em;
}
#fundraiserbanner2013-14 .text {
text-align: center;
- font: 1.1em sans-serif;
+ font: 1em sans-serif;
line-height: 1.2em;
padding-top: 1em;
}
#fundraiserbanner2013-14 .text a:visited { color: #334683 !important }
-#fundraiserbanner2013-14 .text a:hover { color: #ee0800 !important }
+#fundraiserbanner2013-14 .text a:hover { color: #ff0000 !important }
#fundraiserbanner2013-14 p { margin: .3em; }
/* End fundraising banner */
@@ -222,24 +248,25 @@
}
#navigation ul {
text-align: center;
- font-size: 0.95em;
- line-height: 2.6em;
+ font-size: 0.9em;
+ line-height: 2.4em;
margin: 0em;
background-color: #c9cccf;
}
#navigation li { display: inline; }
#navigation li a, #navigation li a:visited {
font-weight: bold;
- padding: .3em .9em;
+ padding: .3em .8em;
color: white !important; text-decoration: none;
background-color: #971611;
+ border: 1px solid #971611;
}
#navigation li.active a {
color: #971611 !important;
- background-color: transparent;
+ background-color: white;
}
#navigation li a:hover {
- color: #ee0800 !important; text-decoration: underline;
+ color: #ff0000 !important;
background-color: transparent;
}
@@ -293,7 +320,7 @@
color: #222 !important; text-decoration: none;
}
#fsf-links li a:hover {
- color: #ee0800 !important; text-decoration: underline;
+ color: #ff0000 !important;
}
@@ -315,7 +342,7 @@
color: #b11107 !important; text-decoration: none;
}
#join-fsf a:hover {
- color: #ee0800 !important; text-decoration: underline;
+ color: #ff0000 !important;
}
#join-fsf img {
height: 1.8em;
@@ -339,14 +366,15 @@
margin: 2em 0 2em 0;
}
#backtotop a, #backtotop a:visited { color: #334683 !important; }
-#backtotop a:hover { color: #ee0800 !important; }
+#backtotop a:hover { color: #ff0000 !important; }
+
/*** FOOTER ***/
#footer {
font-size: .9em;
padding: 1em;
- background-color: #f1f2f3;
+ background-color: #e7e9eb;
border-top: 1px solid #c9cccf;
}
#footer p { margin-bottom: 0; }
@@ -374,14 +402,14 @@
-khtml-border-radius: 0.4em;*/
}
.button a { color: #971611; text-decoration: none; }
-.button a:hover { color: #ee0800; }
+.button a:hover { color: #ff0000; }
.large { font-size: 2em; background-color: #e7e9eb }
.small { font-size: 1.6em; background-color: #e7e9eb }
.emph-box {
padding: 1em;
- background-color: #f1f2f3;
+ background-color: #e7e9eb;
border: 1px solid #c9cccf;
}
.emph-box p { font-size: .9em }
@@ -436,7 +464,7 @@
margin: 0; margin-top: 1em;
}
#trans-disclaimer a, #trans-disclaimer a:visited { color: #333 !important; }
-#trans-disclaimer a:hover { color: #ee0800 !important; }
+#trans-disclaimer a:hover { color: #ff0000 !important; }
/* For outdated translations */
#outdated {
@@ -457,7 +485,7 @@
and breadcrumbs for education */
ul#edu-navigation {
text-align: center;
- font-size: .95em; font-weight: bold;
+ font-size: .9em; font-weight: bold;
line-height: 2.4em;
margin: 0em -1.15em;
background-color: #e7e9eb;
@@ -470,18 +498,21 @@
p.edu-breadcrumb { text-align: center; padding: .5em; }
#edu-navigation li a, #edu-navigation li a:visited {
- padding: 0 .6em;
- color: #333 !important; text-decoration: none;
+ padding: .3em .6em;
+ color: #222 !important; text-decoration: none;
+ border: 1px solid #971611;
}
#edu-navigation li.active a {
color: #971611 !important;
+ background-color: white;
}
p.edu-breadcrumb a {
+ font-weight: bold;
color: #971611 !important; text-decoration: none
}
#edu-navigation li a:hover, p.edu-breadcrumb a:hover {
- color: #ee0800 !important;
- text-decoration: underline;
+ color: #ff0000 !important;
+ background-color: transparent;
}
/* styles for subsections of /education "Case Studies" */
@@ -510,7 +541,7 @@
#back { text-align: right; font-weight: bold; }
#back a, #back a:visited { color: #334683 !important; }
-#back a:hover { color: #ee0800 !important; }
+#back a:hover { color: #ff0000 !important; }
/* End items specific to education */
@@ -661,7 +692,7 @@
margin-right: 1em; font-size: 0.9em;
}
#fpnav li a { display: block; padding-top: .5em; padding-bottom: .5em; }
-#fpnav li a:hover { background-color: #ee0800; }
+#fpnav li a:hover { background-color: #ff0000; }
#takeactionhomepage {
background-color: #fb4;
Index: philosophy.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test8/philosophy.fr.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy.fr.html 28 Dec 2013 14:18:41 -0000 1.11
+++ philosophy.fr.html 29 Dec 2013 18:33:52 -0000 1.12
@@ -97,7 +97,7 @@
<div id="fundraiserbanner2013-14">
<a href="https://www.fsf.org/appeal/2013";><img class="right"
-src="building.png" alt="jauge d'avancement des travaux" /></a>
+src="/graphics/building.png" alt="jauge d'avancement des travaux" /></a>
<div class="text">
<p><a href="https://www.fsf.org/appeal/2013"; class="nounderline"><strong
@@ -118,7 +118,7 @@
<div id="logo">
<p><a href="/">
- <img class="imgleft" src="heckert_gnu.small.png" alt=" [Une tête de GNU] "
/> Le système d'exploitation <strong>GNU</strong></a></p>
+ <img class="imgleft" src="/graphics/heckert_gnu.small.png" alt=" [Une tête
de GNU] " /> Le système d'exploitation <strong>GNU</strong></a></p>
</div><!-- /logo -->
</div><!-- /header -->
@@ -147,11 +147,11 @@
<!-- begin edu navigation bar -->
<ul id="edu-navigation">
- <li class="active"><a href="philosophy.fr.html">Introduction</a></li>
+ <li class="active"><a
href="/philosophy/philosophy.html">Introduction</a></li>
<li><a href="http://audio-video.gnu.org/";>Audio / vidéo</a></li>
- <li><a href="essays-and-articles.html">Essais / articles</a></li>
- <li><a
href="speeches-and-interview.html">Discours / entretiens</a></li>
- <li><a
href="third-party-ideas.html">Idées de tierces personnes</a></li>
+ <li><a
href="/philosophy/essays-and-articles.html">Essais / articles</a></li>
+ <li><a
href="/philosophy/speeches-and-interview.html">Discours / entretiens</a></li>
+ <li><a
href="/philosophy/third-party-ideas.html">Idées de tierces personnes</a></li>
<li><a
href="/server/sitemap.html#directory-philosophy">Tous les articles</a></li>
</ul>
<!-- end edu navigation bar -->
@@ -161,7 +161,7 @@
</div><!-- /education-content -->
<div id="trans-disclaimer">
- <a href="/education/edu-schools.en.html">
+ <a href="/philosophy/philosophy.en.html">
L'original de cette page est en anglais
<br />
</a>
@@ -256,7 +256,7 @@
<div class="yui-g" id="fsf-links">
<ul>
- <li><a href="home.html">Accueil GNU</a></li>
+ <li><a href="/">Accueil GNU</a></li>
<li><a href="http://www.fsf.org/";>Accueil FSF</a></li>
<li><a href="/graphics/graphics.html">Art GNU</a></li>
<li><a href="/fun/fun.html">Humour GNU</a></li>
@@ -370,7 +370,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/12/28 14:18:41 $
+$Date: 2013/12/29 18:33:52 $
<!-- timestamp end -->
</p>
Index: edu-schools.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test8/edu-schools.fr.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- edu-schools.fr.html 28 Dec 2013 14:18:41 -0000 1.6
+++ edu-schools.fr.html 29 Dec 2013 18:33:52 -0000 1.7
@@ -106,7 +106,7 @@
<div id="logo">
<p><a href="/">
- <img class="imgleft" src="heckert_gnu.small.png" alt=" [Une tête de GNU] "
/> Le système d'exploitation <strong>GNU</strong></a></p>
+ <img class="imgleft" src="/graphics/heckert_gnu.small.png" alt=" [Une tête
de GNU] " /> Le système d'exploitation <strong>GNU</strong></a></p>
</div><!-- /logo -->
</div><!-- /header -->
@@ -114,7 +114,7 @@
<div id="navigation">
<ul>
<li id="tabAboutGNU"><a
href="/gnu/gnu.html">Ã propos de GNU</a></li>
- <li id="tabPhilosophy"><a href="philosophy.fr.html">Philosophie</a></li>
+ <li id="tabPhilosophy"><a
href="/philosophy/philosophy.html">Philosophie</a></li>
<li id="tabLicenses"><a href="/licenses/licenses.html">Licences</a></li>
<li class="active" id="tabEducation"><a
href="education.html">Ãducation</a></li>
<li id="tabSoftware"><a href="/software/software.html">Logiciel</a></li>
@@ -133,7 +133,7 @@
<!-- begin edu navigation bar -->
<ul id="edu-navigation">
- <li><a href="edu-contents.html">Sommaire éducation</a></li>
+ <li><a href="/education/edu-contents.html">Sommaire éducation</a></li>
<li><a href="/education/edu-cases.html">Ãtudes de cas</a></li>
<li><a href="/education/edu-resources.html">RessourcesÂ
pédagogiques</a></li>
<li><a href="/education/edu-projects.html">Projets pédagogiques</a></li>
@@ -310,7 +310,7 @@
<div class="yui-g" id="fsf-links">
<ul>
- <li><a href="home.html">Accueil GNU</a></li>
+ <li><a href="/">Accueil GNU</a></li>
<li><a href="http://www.fsf.org/";>Accueil FSF</a></li>
<li><a href="/graphics/graphics.html">Art GNU</a></li>
<li><a href="/fun/fun.html">Humour GNU</a></li>
@@ -424,7 +424,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/12/28 14:18:41 $
+$Date: 2013/12/29 18:33:52 $
<!-- timestamp end -->
</p>
Index: home.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test8/home.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- home.html 28 Dec 2013 14:18:41 -0000 1.10
+++ home.html 29 Dec 2013 18:33:52 -0000 1.11
@@ -90,7 +90,7 @@
<div id="logo">
<p><a href="/">
- <img class="imgleft" src="heckert_gnu.small.png" alt=" [A GNU head] "
/> <strong>GNU</strong> Operating System</a></p>
+ <img class="imgleft" src="/graphics/heckert_gnu.small.png" alt=" [A GNU head]
" /> <strong>GNU</strong> Operating System</a></p>
</div><!-- /logo -->
</div><!-- /header -->
@@ -98,7 +98,7 @@
<div id="navigation">
<ul>
<li id="tabAboutGNU"><a href="/gnu/gnu.html">About GNU</a></li>
- <li id="tabPhilosophy"><a href="philosophy.fr.html">Philosophy</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>
@@ -401,7 +401,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/12/28 14:18:41 $
+$Date: 2013/12/29 18:33:52 $
<!-- timestamp end -->
</p>
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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- edu-cases-india-ambedkar.html 28 Dec 2013 16:34:19 -0000 1.9
+++ edu-cases-india-ambedkar.html 29 Dec 2013 18:33:52 -0000 1.10
@@ -72,7 +72,7 @@
<div id="fundraiserbanner2013-14">
<a href="https://www.fsf.org/appeal/2013";><img class="right"
-src="building.png" alt="building progress meter" /></a>
+src="/graphics/building.png" alt="building progress meter" /></a>
<div class="text">
<p><a href="https://www.fsf.org/appeal/2013";
@@ -95,7 +95,7 @@
<div id="logo">
<p><a href="/">
- <img class="imgleft" src="heckert_gnu.small.png" alt=" [A GNU head] "
/> <strong>GNU</strong> Operating System</a></p>
+ <img class="imgleft" src="/graphics/heckert_gnu.small.png" alt=" [A GNU head]
" /> <strong>GNU</strong> Operating System</a></p>
</div><!-- /logo -->
</div><!-- /header -->
@@ -104,9 +104,9 @@
<ul>
<li id="tabAboutGNU"><a href="/gnu/gnu.html">About GNU</a></li>
- <li id="tabPhilosophy"><a href="philosophy.fr.html">Philosophy</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 class="active" id="tabEducation"><a
href="education.fr.html">Education</a></li>
+ <li class="active" 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>
@@ -342,7 +342,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/12/28 16:34:19 $
+$Date: 2013/12/29 18:33:52 $
<!-- timestamp end -->
</p>