[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test8 layout.css hom...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test8 layout.css hom... |
|
Date: |
Mon, 30 Dec 2013 13:57:17 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 13/12/30 13:57:17
Modified files:
server/staging/nav-bar/test8: layout.css home.html
philosophy.fr.html
Log message:
Fix broken div.edu-cases; adjustments to nav bars and urgent div.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/layout.css?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/home.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test8/philosophy.fr.html?cvsroot=www&r1=1.12&r2=1.13
Patches:
Index: layout.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test8/layout.css,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- layout.css 29 Dec 2013 20:08:36 -0000 1.19
+++ layout.css 30 Dec 2013 13:57:16 -0000 1.20
@@ -25,7 +25,7 @@
/* colors
white background for inner, searcher, text nav bar & listing
- standard blue, red: urgent
+ blue urgent links
black gpl-compat-matrix, takeactionhomepage (unused?)
#111, #222, #333, #555, #666666, #ddd, #eee, #ededed
shades of pure gray: text, listing, special items
@@ -34,14 +34,13 @@
#c9cccf bluish gray: top links, searcher, nav bars (main and fsf 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
- #ff0000 pure red: hover
+ links in nav bars, normal visited links border around highlighted
+ boxes, join-fsf link
+ red hover
#44536b dull blue: background for body
#334683 blue from GNU banner: h2, normal links
#171d33 dark blue (from screenshot), edu-cases ridges, shade behind button
#ffc pale yellow: highlight background
- #ff6 medium yellow: hover background
#ff3 yellow: urgent
#ccffcc light green: gpl-compat-matrix
#e4ffcc light yellowish green: gpl-compat-matrix
@@ -49,6 +48,9 @@
/* Luminosity contrast ratio
source: http://springmeier.org/www/contrastcalculator/index.php
+ #000 (black) vs. #fff (white) 21.3
+ #000 vs. #ff3 19.6
+ #00f (blue) vs. #ff3 8.02
#333 vs. white 12.63
#333 vs. #e7e9eb 10.38
#333 vs. #c9cccf 7.83
@@ -60,14 +62,14 @@
#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
+ #f00 (red) vs. #334683 2.24
+ #f00 vs. 971611 2.15
+ #f00 vs. #750000 2.99
+ #f00 vs. #333 3.16
+ #f00 vs. #222 3.98
+ #f00 vs. #c9cccf 2.48
+ #f00 vs. #e7e9eb 3.29
+ #f00 vs. white 4.00
*/
@@ -92,8 +94,8 @@
a[href] { color: #334683; }
a[href]:visited { color: #971611 !important; }
-a[href]:active, a[href]:hover { color: #ff0000; }
-a:hover { color: #ff0000; }
+a[href]:active, a[href]:hover { color: red; }
+a:hover { color: red; }
blockquote { margin: 1em; font-style: italic; }
@@ -130,7 +132,7 @@
#toplinks {
font-size: .9em;
font-weight: bold;
- line-height: 2.4em;
+ line-height: 2.6em;
padding-left: 1em;
margin-bottom: .2em;
background-color: #c9cccf;
@@ -138,7 +140,7 @@
#toplinks a, #toplinks a:visited {
color: #222 !important; text-decoration: none;
}
-#toplinks a:hover { color: #ff0000 !important; }
+#toplinks a:hover { color: red !important; }
/* Highlight the link to the FSF mission statement */
#toplinks span.fsf {
font-size: 1.1em;
@@ -146,14 +148,13 @@
}
#toplinks span.fsf a, #toplinks span.fsf a:visited { color: #750000
!important; }
#toplinks span.fsf a:hover {
- color: #ff0000 !important;
+ color: red !important;
}
#searcher {
float: right; width: 22em;
text-align: right;
font-weight: bold;
- line-height: 2.4em;
padding-right: 1em;
color: white;
background-color: #c9cccf;
@@ -174,7 +175,7 @@
#translations a, #translations a:visited {
color: #222 !important; text-decoration: none;
}
-#translations a:hover { color: #ff0000 !important; }
+#translations a:hover { color: red !important; }
#translations p { margin-bottom: 0.3em; }
/* Highlight the link to the original page */
#translations span.original {
@@ -183,7 +184,7 @@
}
#translations span.original a, #translations span.original a:visited { color:
#750000 !important; }
#translations span.original a:hover {
- color: #ff0000 !important;
+ color: red !important;
}
@@ -206,7 +207,7 @@
padding-top: 1em;
}
#fundraiserbanner2013-14 .text a:visited { color: #334683 !important }
-#fundraiserbanner2013-14 .text a:hover { color: #ff0000 !important }
+#fundraiserbanner2013-14 .text a:hover { color: red !important }
#fundraiserbanner2013-14 p { margin: .3em; }
/* End fundraising banner */
@@ -250,25 +251,30 @@
#navigation ul {
text-align: center;
font-size: 0.9em;
- line-height: 2.4em;
+ line-height: 2.6em;
margin: 0em;
background-color: #c9cccf;
}
-#navigation li { display: inline; }
+#navigation li {
+ display: inline;
+ padding: 0 .2em;
+}
#navigation li a, #navigation li a:visited {
font-weight: bold;
- padding: .3em .8em;
+ padding: .2em .4em;
color: white !important; text-decoration: none;
background-color: #971611;
- border: 1px solid #971611;
+ border: .2em solid #971611;
}
#navigation li.active a {
- color: #971611 !important;
+ color: #333 !important;
background-color: white;
+ border: .2em solid #971611;
}
#navigation li a:hover {
- color: #810606 !important;
- background-color: #ff6;
+ color: black !important;
+ background-color: #ff3;
+ border: .2em solid #ff3;
}
@@ -307,21 +313,24 @@
#fsf-links ul {
text-align: center;
- font-size: .9em; font-weight: bold;
- line-height: 2.4em;
+ font-size: .9em;
+ line-height: 2.6em;
margin: 0;
background-color: #c9cccf;
}
-#fsf-links ul li {
+#fsf-links li {
display: inline-block;
list-style: none;
- padding: 0 .6em;
+ padding: 0 .2em;
}
#fsf-links li a, #fsf-links li a:visited {
- color: #222 !important; text-decoration: none;
+ font-weight: bold;
+ padding: .4em;
+ color: #333 !important; text-decoration: none;
}
#fsf-links li a:hover {
- color: #ff0000 !important;
+ color: black !important;
+ background-color: #ff3 !important;
}
@@ -340,10 +349,10 @@
}
#join-fsf a, #join-fsf a:visited {
font-weight: bold;
- color: #b11107 !important; text-decoration: none;
+ color: #971611 !important; text-decoration: none;
}
#join-fsf a:hover {
- color: #ff0000 !important; text-decoration: underline;
+ color: red !important; text-decoration: underline;
}
#join-fsf img {
height: 1.8em;
@@ -357,7 +366,7 @@
line-height: 1.2em;
padding: 1em .5em .5em .5em;
margin: .2em 1em 1em 0;
- border: .23em solid #b11107;
+ border: .23em solid #971611;
}
#fsf-sisters { text-align: center; }
@@ -367,7 +376,7 @@
margin: 2em 0 2em 0;
}
#backtotop a, #backtotop a:visited { color: #334683 !important; }
-#backtotop a:hover { color: #ff0000 !important; }
+#backtotop a:hover { color: red !important; }
/*** FOOTER ***/
@@ -403,7 +412,7 @@
-khtml-border-radius: 0.4em;*/
}
.button a { color: #971611; text-decoration: none; }
-.button a:hover { color: #ff0000; }
+.button a:hover { color: red; }
.large { font-size: 2em; background-color: #e7e9eb }
.small { font-size: 1.6em; background-color: #e7e9eb }
@@ -427,7 +436,7 @@
.highlight, .highlight-para {
margin-top: 1em; margin-bottom: 1em;
background: #ffc;
- border: .2em solid #b11107;
+ border: .2em solid #971611;
}
.highlight-para { padding: 1em; padding-bottom: .2em; }
@@ -443,15 +452,16 @@
at the fsf */
#urgent {
text-align: center;
- font-size: 0.9em;
- line-height: 3em;
+ font-size: .9em; font-weight: bold;
+ line-height: 2.6em;
+ color: black;
background-color:#ff3;
- border-bottom: .5em solid #333;
+ border-bottom: .3em solid #333;
}
#urgent a, #urgent a:visited {
- color: blue; text-decoration: underline !important;
+ color: blue; text-decoration: underline;
}
-#urgent a:hover { background-color: red; }
+#urgent a:hover { color: red; }
/*** TRANSLATED PAGES ***/
@@ -465,14 +475,14 @@
margin: 0; margin-top: 1em;
}
#trans-disclaimer a, #trans-disclaimer a:visited { color: #333 !important; }
-#trans-disclaimer a:hover { color: #ff0000 !important; }
+#trans-disclaimer a:hover { color: red !important; }
/* For outdated translations */
#outdated {
padding: .5em;
margin: 1em 0 2em 0;
background: #ffc;
- border: .2em solid #b11107;
+ border: .2em solid #971611;
}
#outdated p { margin: 0.2em; }
/* In the out-of-date notice, we use <br> elements to separate
@@ -486,29 +496,32 @@
and breadcrumbs for education */
ul#edu-navigation {
text-align: center;
- font-size: .9em; font-weight: bold;
- line-height: 2.4em;
+ font-size: .95em; font-weight: bold;
+ line-height: 2.6em;
margin: 0em -1.15em;
background-color: #e7e9eb;
}
#edu-navigation li {
display: inline-block;
list-style-type: none;
+ padding: 0 .2em;
}
#edu-navigation li a, #edu-navigation li a:visited {
- padding: .3em .6em;
- color: #222 !important; text-decoration: none;
- border: 1px solid #971611;
+ padding: .2em .4em;
+ color: #333 !important; text-decoration: none;
+ border: .2em solid #e7e9eb;
+}
+#edu-navigation li a:hover, #edu-navigation li.active a:hover {
+ color: black !important;
+ background-color: #ff3 !important;
+ border: .2em solid #ff3;
}
#edu-navigation li.active a {
- color: #971611 !important;
- background-color: white;
-}
-#edu-navigation li a:hover {
- color: #810606 !important;
- background-color: #ff6;
+ background-color: white !important;
+ border: .2em solid #971611;
}
+
p.edu-breadcrumb { text-align: center; padding: .5em; }
p.edu-breadcrumb a {
@@ -516,14 +529,15 @@
color: #971611 !important; text-decoration: none
}
p.edu-breadcrumb a:hover {
- color: #ff0000 !important; text-decoration: underline; }
+ color: #ee0800 !important;
+ text-decoration: underline;
}
/* styles for subsections of /education "Case Studies" */
div.edu-cases {
border-top: .5em ridge #171d33;
border-bottom: .5em ridge #171d33;
- margin: 0 4em 1em 4em;
+ margin: 0 3em 1em 3em;
}
/* make h3 for edu-cases look like h4 for other pages */
@@ -540,12 +554,12 @@
img.ambedkar {
float: right;
width: 26em; max-width: 100%;
- margin: 2.4em 0px 2.4em 2.4em;
+ margin: 2.4em 0 2.4em 2.4em;
}
#back { text-align: right; font-weight: bold; }
#back a, #back a:visited { color: #334683 !important; }
-#back a:hover { color: #ff0000 !important; }
+#back a:hover { color: #ee0800 !important; }
/* End items specific to education */
@@ -696,7 +710,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: #ff0000; }
+#fpnav li a:hover { background-color: red; }
#takeactionhomepage {
background-color: #fb4;
Index: home.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test8/home.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- home.html 29 Dec 2013 18:33:52 -0000 1.11
+++ home.html 30 Dec 2013 13:57:16 -0000 1.12
@@ -93,6 +93,10 @@
<img class="imgleft" src="/graphics/heckert_gnu.small.png" alt=" [A GNU head]
" /> <strong>GNU</strong> Operating System</a></p>
</div><!-- /logo -->
+<div id="urgent">
+WATCH OUT, the big mouse is eating your cereals! For more information, check
<a href="http://computer-rodents.org/";>http://computer-rodents.org/</a>.
+</div>
+
</div><!-- /header -->
<div id="navigation">
@@ -401,7 +405,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/12/29 18:33:52 $
+$Date: 2013/12/30 13:57:16 $
<!-- timestamp end -->
</p>
Index: philosophy.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test8/philosophy.fr.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy.fr.html 29 Dec 2013 18:33:52 -0000 1.12
+++ philosophy.fr.html 30 Dec 2013 13:57:16 -0000 1.13
@@ -121,6 +121,10 @@
<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 id="urgent">
+ATTENTION, la grosse souris est en train de manger ta tartine ! Pour plus de
renseignements, va voir <a
href="http://computer-rodents.org/";>http://computer-rodents.org/</a>.
+</div>
+
</div><!-- /header -->
<div id="navigation">
@@ -370,7 +374,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/12/29 18:33:52 $
+$Date: 2013/12/30 13:57:16 $
<!-- timestamp end -->
</p>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/server/staging/nav-bar/test8 layout.css hom...,
Therese Godefroy <=