[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 layout5.css ed...
From: |
Therese Godefroy |
Subject: |
www/server/staging/nav-bar/test9 layout5.css ed... |
Date: |
Thu, 13 Feb 2014 16:11:23 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 14/02/13 16:11:23
Modified files:
server/staging/nav-bar/test9: layout5.css edu-schools5.html
layout4.css edu-schools4.html
Log message:
Adjust logo; make navbars take up less space when wrapping.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout5.css?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-schools5.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout4.css?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-schools4.html?cvsroot=www&r1=1.1&r2=1.2
Patches:
Index: layout5.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout5.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- layout5.css 12 Feb 2014 19:48:17 -0000 1.1
+++ layout5.css 13 Feb 2014 16:11:22 -0000 1.2
@@ -144,7 +144,7 @@
font-size: .9em;
line-height: 2.0em;
font-weight: bold;
- padding: 0 1em;
+ padding: 0 1%;
background-color: #c9cccf;
border-bottom: .1em solid #c9cccf; border-top: .1em solid #c9cccf;
}
@@ -175,7 +175,7 @@
clear: both;
font-size: .9em;
line-height: 1.3em;
- padding: 0 .7em .2em .7em;
+ padding: 0 .7% .2em .7%;
background-color: #f0f1f2;
}
#translations span {
@@ -209,7 +209,7 @@
/*** HEADER ***/
-#header { margin: .7em 1em; }
+#header { margin: .5em 1%; }
#header:after {
clear: both; content: ""; display: block;
@@ -217,36 +217,37 @@
}
#fssbox {
float: right;
- width: 15em;
- max-width: 100%;
+ width: 15em; max-width: 100%;
font-size: .9em;
- font-weight: bold;
text-align: center;
line-height: 1.2em;
padding: .5em .5em .2em .5em;
- margin: 0;
+ margin-top: .4em;
border: 1px dashed #971611;
}
#fssbox p { margin-top: 0; margin-bottom: .5em; }
-#fsf-support { font-size: 1em; font-weight: bold; line-height: 1em;
padding-top: 0; }
-#fsf-support a, a:visited { color: #334683; }
-#fsf-support a:hover { color: red; }
+#logo-container {background: yellow;}
+#fsf-support { font-size: 1em; font-weight: bold; font-style: italic;
margin-top: 2em; }
+#fsf-support a, a:visited { color: #971611; }
+#fsf-support a:hover { color: red; }
#logo img {
float: left;
- height: 1.8em;
- position: relative; bottom: .2em;
- margin-right: .3em;
+ height: 3.8em;
+ padding: 0 0 .3em 0;
+ border-bottom: .9em solid #d1d4d7;
+ margin-right: .8em;
margin-left: 0;
}
-#logo p {
- font-size: 2.3em;
+#logo span {
+ font-size: 1.8em;
font-family: sans-serif;
font-weight: bold;
- line-height: 1.6em;
- padding-top: .2em;
- margin-bottom: .2em;
+ line-height: 2em;
+}
+#logo strong {
+ font-size: 1.45em;
}
#logo a {
color: #334683; text-decoration: none;
@@ -257,7 +258,11 @@
/*** NAVIGATION BAR ***/
-#navigation { clear: both; padding: 0; }
+#navigation {
+ clear: both;
+ padding: .3em;
+ background-color: #a50606;
+}
#navigation:after {
clear: both; content: ""; display: block;
@@ -266,7 +271,7 @@
#navigation ul {
text-align: center;
font-size: 0.9em;
- line-height: 2.4em;
+ line-height: 1.8em;
padding: 0;
margin: 0;
background-color: #a50606;
@@ -294,7 +299,7 @@
#content {
text-align: left;
- padding: 1em; padding-top: 0; margin-top: 0;
+ padding: 0 1% 1em 1%; margin-top: 0;
}
#content:lang(ar), #content:lang(fa), #content:lang(he) {
text-align: right;
@@ -321,7 +326,7 @@
#content dt, #content code, #content address { line-height: 1.3em; }
/* For column headers in education.html, but could apply elsewhere. */
-#content .yui-gc h2 {
+#content h2.yui-gc {
text-shadow: none;
margin-bottom: .7em;
}
@@ -331,10 +336,15 @@
/*** ADDITIONAL LINKS ***/
+#fsf-links {
+ clear: both;
+ padding: .3em;
+ background-color: #d1d4d7;
+}
#fsf-links ul {
text-align: center;
font-size: .9em;
- line-height: 2.4em;
+ line-height: 1.8em;
margin: 0;
background-color: #d1d4d7;
}
@@ -358,9 +368,10 @@
#mission-statement {
font-size: 0.9em;
- margin: 2em 1.11em 1em 1.11em;
+ margin: 2em 1% 1em 1%;
}
#mission-statement blockquote {
+ font-weight: bold;
margin: 1em 0;
}
#mission-statement img {
@@ -383,17 +394,11 @@
background-color: #ff3;
}
-#sisters {
- font-size: .9em;
- margin-bottom: 1em;
- margin-left: 1.11em;
-}
-
#backtotop {
clear: both;
text-align: right;
font-weight: bold;
- margin: 0 1em 1.5em 0;
+ margin-bottom: 1.5em;
}
#backtotop a, a:visited { color: #334683; }
#backtotop a:hover { color: red; }
@@ -425,7 +430,7 @@
#footer {
font-size: .9em;
- padding: 1.11em;
+ padding: 1.11em 1%;
background-color: #f5f6f7;
border-top: 1px solid #c9cccf;
}
@@ -460,7 +465,7 @@
margin-bottom: .7em;
}
#home .first-column img { width: 80%; margin: .5em 0 1em 0; }
-#Flashes img { height: .75em; width: .75em; }
+#home .second-column img.feed { height: .75em; width: .75em; }
.button {
margin-top: .8em !important;
@@ -592,13 +597,15 @@
/* definitions for /education-specific navigation bar
and breadcrumbs for education */
+#edu-navigation {
+ clear: both;
+ background-color: #d1d4d7;
+}
ul#edu-navigation {
text-align: center;
font-size: .9em; font-weight: bold;
- line-height: 2.4em;
- padding: 0;
+ line-height: 1.8em;
margin: 0em -1.15em;
- background-color: #d1d4d7;
}
#edu-navigation li {
display: inline-block;
Index: edu-schools5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-schools5.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-schools5.html 12 Feb 2014 20:29:25 -0000 1.2
+++ edu-schools5.html 13 Feb 2014 16:11:22 -0000 1.3
@@ -92,8 +92,8 @@
</div><!-- /fssbox -->
<div id="logo">
- <p><a href="/">
- <img src="/graphics/heckert_gnu.small.png" alt=" [Une tête de GNU] "
/><strong>GNU</strong> Operating System</a></p>
+ <a href="/">
+ <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] "
/><span><strong>GNU</strong> operating system</a></span>
</div><!-- /logo -->
<span id="fsf-support">supported by the <a href="#mission-statement">Free
Software Foundation</a></span>
@@ -306,7 +306,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2014/02/12 20:29:25 $
+$Date: 2014/02/13 16:11:22 $
<!-- timestamp end -->
</p>
Index: layout4.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout4.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- layout4.css 12 Feb 2014 19:47:06 -0000 1.1
+++ layout4.css 13 Feb 2014 16:11:22 -0000 1.2
@@ -144,7 +144,7 @@
font-size: .9em;
line-height: 2.0em;
font-weight: bold;
- padding: 0 1em;
+ padding: 0 1%;
background-color: #c9cccf;
border-bottom: .1em solid #c9cccf; border-top: .1em solid #c9cccf;
}
@@ -175,7 +175,7 @@
clear: both;
font-size: .9em;
line-height: 1.3em;
- padding: 0 .7em .2em .7em;
+ padding: 0 .7% .2em .7%;
background-color: #f0f1f2;
}
#translations span {
@@ -209,7 +209,7 @@
/*** HEADER ***/
-#header { margin: .7em 1em; }
+#header { margin: .5em 1%; }
#header:after {
clear: both; content: ""; display: block;
@@ -222,19 +222,15 @@
text-align: center;
line-height: 1.2em;
padding: .5em .5em .2em .5em;
- margin: 0 .7em;
+ margin: 0;
border: 1px dashed #971611;
}
#fssbox p { margin-top: 0; margin-bottom: .5em; }
-#logo { clear: left; }
-#header:after {
- clear: both; content: ""; display: block;
- height: 0px; visibility: hidden; width: 0px;
-}
-#fsf-support { font-size: 1em; font-weight: bold; margin-bottom: .4em; }
-#fsf-support a, a:visited { color: #334683; }
+#logo-container {background: yellow;}
+#fsf-support { font-size: 1em; font-weight: bold; font-style: italic; }
+#fsf-support a, a:visited { color: #971611; }
#fsf-support a:hover { color: red; }
#logo {
@@ -242,22 +238,24 @@
font-family: sans-serif;
font-weight: bold;
line-height: 1em;
- padding: 0 0 1em 0 ;
+ padding: 0 0 .8em 0 ;
}
#logo img {
float: left;
- height: 3em;
- padding: 0 .3em 0 0;
+ height: 3.8em;
+ padding: 0 0 .8em 0;
+ border-bottom: .9em solid #d1d4d7;
+ margin-right: .8em;
}
-#logo p {
- font-size: 1.35em;
- padding: 0;
+#logo span {
+ font-size: 1.3em;
margin-bottom: 0;
}
#logo strong {
- font-size: 2em;
+ font-size: 1.9em;
line-height: 1em;
color: #971611;
+ position: relative; top: .1em;
}
#logo a, #logo a:visited {
@@ -268,7 +266,11 @@
/*** NAVIGATION BAR ***/
-#navigation { clear: both; padding: 0; }
+#navigation {
+ clear: both;
+ padding: .3em;
+ background-color: #a50606;
+}
#navigation:after {
clear: both; content: ""; display: block;
@@ -277,7 +279,7 @@
#navigation ul {
text-align: center;
font-size: 0.9em;
- line-height: 2.4em;
+ line-height: 1.8em;
padding: 0;
margin: 0;
background-color: #a50606;
@@ -305,7 +307,7 @@
#content {
text-align: left;
- padding: 1em; padding-top: 0; margin-top: 0;
+ padding: 0 1% 1em 1%; margin-top: 0;
}
#content:lang(ar), #content:lang(fa), #content:lang(he) {
text-align: right;
@@ -342,10 +344,15 @@
/*** ADDITIONAL LINKS ***/
+#fsf-links {
+ clear: both;
+ padding: .3em;
+ background-color: #d1d4d7;
+}
#fsf-links ul {
text-align: center;
font-size: .9em;
- line-height: 2.4em;
+ line-height: 1.8em;
margin: 0;
background-color: #d1d4d7;
}
@@ -369,7 +376,7 @@
#mission-statement {
font-size: 0.9em;
- margin: 2em 1.11em 1em 1.11em;
+ margin: 2em 1% 1em 1%;
}
#mission-statement blockquote {
font-weight: bold;
@@ -394,13 +401,12 @@
color: black;
background-color: #ff3;
}
-#sisters { line-height: 2em; }
#backtotop {
clear: both;
text-align: right;
font-weight: bold;
- margin: 0 1em 1.5em 0;
+ margin-bottom: 1.5em;
}
#backtotop a, a:visited { color: #334683; }
#backtotop a:hover { color: red; }
@@ -432,7 +438,7 @@
#footer {
font-size: .9em;
- padding: 1.11em;
+ padding: 1.11em 1%;
background-color: #f5f6f7;
border-top: 1px solid #c9cccf;
}
@@ -599,13 +605,15 @@
/* definitions for /education-specific navigation bar
and breadcrumbs for education */
+#edu-navigation {
+ clear: both;
+ background-color: #d1d4d7;
+}
ul#edu-navigation {
text-align: center;
font-size: .9em; font-weight: bold;
- line-height: 2.4em;
- padding: 0;
+ line-height: 1.8em;
margin: 0em -1.15em;
- background-color: #d1d4d7;
}
#edu-navigation li {
display: inline-block;
Index: edu-schools4.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-schools4.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-schools4.html 12 Feb 2014 19:47:07 -0000 1.1
+++ edu-schools4.html 13 Feb 2014 16:11:23 -0000 1.2
@@ -92,10 +92,10 @@
</div><!-- /fssbox -->
<div id="logo">
- <p><a href="/">
- <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] "
/><strong>GNU</strong><br />Operating System</a></p>
+ <a href="/">
+ <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] "
/><span><strong>GNU</strong><br />operating system</a></span>
</div><!-- /logo -->
-<p id="fsf-support">supported by the <a href="#mission-statement">Free
Software Foundation</a></p>
+<span id="fsf-support">supported by the <a
href="#mission-statement">FSF</a></span>
</div><!-- /header -->
@@ -254,10 +254,16 @@
href="http://www.gnu.org/">GNU Operating System</a>. <strong>Support GNU and
the FSF</strong>
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>
</div> <!-- /support-fsf -->
+
+<p id="sisters">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>
+
</div> <!-- /mission-statement -->
- <p id="backtotop"><a href="#header">Back to Top</a></p>
- <!-- end server/footer-text.html -->
+<!-- end server/footer-text.html -->
<div id="footer">
@@ -306,7 +312,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2014/02/12 19:47:07 $
+$Date: 2014/02/13 16:11:23 $
<!-- timestamp end -->
</p>