[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 layout4.css bo...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 layout4.css bo... |
|
Date: |
Sun, 02 Mar 2014 23:04:48 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 14/03/02 23:04:48
Modified files:
server/staging/nav-bar/test9: layout4.css body-include-1.html
body-include-2.html
Log message:
Fit the FSS goodies on top.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout4.css?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-1.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.5&r2=1.6
Patches:
Index: layout4.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout4.css,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- layout4.css 28 Feb 2014 19:45:54 -0000 1.12
+++ layout4.css 2 Mar 2014 23:04:47 -0000 1.13
@@ -6,6 +6,7 @@
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
+</div><!-- /toplinks -->
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
@@ -33,12 +34,11 @@
#f5f6f7 emph-box, footer
#e7e9eb light bluish gray: translations, button
#d1d4d7 edu-navbar, fsf-links
- #c9cccf bluish gray: top links, searcher, nav bars (main and fsf links)
- #971611 red from GNU banner: button link, navigation li background, active
- links in nav bars, normal visited links border around highlighted
- boxes, join-fsf link
- #750000 dark red: toplink to mission statement,
- "translation" link to the original
+ #c9cccf bluish gray: top links, searcher
+ #971611 red from GNU banner: button link, normal visited links, border
+ around highlighted boxes
+ #a50606 intermediate red from fs-gang gradient: fallback fs-gang
background,
+ main nav-bar, background join-fsf link
#334683 blue from GNU banner: h2, normal links
#3465a4 blue: edu-cases ridges
#171d33 dark blue (from screenshot): shade behind button
@@ -140,44 +140,37 @@
.layout-table * { border: 0; }
div.spacer { height: .1em; width: 100%; background-color: transparent; }
+/* For wide tables, e.g. in licenses/gpl-faq.html and doc/free-book.html */
+div.table { width: 100%; margin: auto; overflow: auto; }
+
/*** TOP OF THE PAGE ***/
#toplinks {
font-size: .9em;
- line-height: 2.2em;
font-weight: bold;
- padding: 0 1%;
+ padding: .5em 1%;
}
#toplinks a, a:visited {
color: #222; text-decoration: none;
}
#toplinks a:hover { color: red; }
-/* Highlight the link to the FSF mission statement */
-#toplinks span.fsf {
- font-size: 1.1em;
-}
-#toplinks span.fsf a, a:visited {
- color: #971611;
-}
-#toplinks span.fsf a:hover {
- color: red;
-}
+
#toplinks { float: left; }
#searcher {
font-size: .9em;
text-align: right;
- line-height: 2.2em;
color: white;
background-color: #c9cccf;
font-weight: bold;
- padding-right: 1%;
+ padding: .2em 1%.3em 1%;
}
-#searcher, #searcher input { color: #555; }
+#searcher input {
+ color: #666;
+ margin-bottom: 0; }
#translations {
- clear: both;
- font-size: .9em;
+ font-size: .8em;
line-height: 1.3em;
padding: 0 .7% .2em .7%;
background-color: #f0f1f2;
@@ -212,62 +205,75 @@
}
/*** HEADER ***/
+#header { font-family: "FreeSans", sans-serif; }
-#header:after {
- clear: both; content: ""; display: block;
- height: 0px; visibility: hidden; width: 0px;
-}
-#fssbox {
+#header .top-right {
float: right;
- width: auto;
font-size: .9em;
text-align: center;
- line-height: 1.2em;
- padding: .5em .5em .4em .5em;
- border: 1px dashed #971611;
- margin: .5em 1% .5em 0;
+ line-height: 1.3em;
+ width: auto;
+ background: white;
+ padding: .6em .7% .4em .7%;
+ margin: .5em 1%;
+ border: 1px dashed #334683;
}
-#fssbox p, h4 { margin-top: 0em; margin-bottom: .1em; }
-#fssbox input { font-weight: bold; color: #555; margin-bottom: .4em; }
+#header .top-right p { color: #444; }
+#header .top-right a { font-weight: bold; }
+#join-fsf {
+ margin: 0;
+}
+#join-fsf a, a:visited {
+ padding: .1em;
+ color: #334683; text-decoration: none;
+ border: 1px solid #334683;
+}
+
+#fssbox p, input {
+ font-family: "FreeSans", sans-serif;
+ margin-bottom:.2em;
+}
+#fssbox input {
+ font-weight: bold;
+ color: #666;
+}
+#fssbox a, a:visited {
+ font-weight: bold;
+ color: #334683;
+}
+#fssbox a:hover, #join-fsf a:hover {
+ color: red;
+}
+
+/* For "normal" pages */
#gnu-banner table {
float: left;
width: auto;
- font-family: "FreeSans", sans-serif;
-
- font-size: 2em;
- margin: .45em 2%;
+ font-size: 1.8em;
+ font-weight: bold; margin: .35em 2%;
}
#gnu-banner td {
- line-height: .7em;
- text-align: center;
- vertical-align: bottom;
- padding: 0; margin: 0;
+ line-height: 1em;
+ text-align: left;
+ vertical-align: middle;
+ padding: 0;
+ margin: 0;
border: none;
}
#gnu-banner strong {
- font-size: 2em;
- font-weight: normal;
+ font-size: 1.4em;
color: #971611;
}
#gnu-banner small {
- font-size: .55em; font-weight: bold;
+ font-size: .9em;
color: #334683;
}
#gnu-banner img {
- height: 2.7em; padding-right: .1em;
-}
-
-#fsf-support {
- float: left;
- font-style: italic;
- color: #666;
- margin: .15em 1% 0 1%;
+ height: 2.5em; padding-right: .1em;
+ position: relative; bottom: .1em;
}
-#fsf-support a, a:visited { color: #444; }
-#fsf-support a:hover { color: red; }
-
-/* For the pages outside www.gnu.org still using style.css */
+/* For the pages still using style.css */
#logo {
background:url(/graphics/topbanner.png) no-repeat;
float: left;
@@ -296,10 +302,6 @@
background-color: #a50606;
}
-#navigation:after {
- clear: both; content: ""; display: block;
- height: 0px; visibility: hidden; width: 0px;
-}
#navigation ul {
text-align: center;
font-size: 0.9em;
@@ -314,7 +316,7 @@
}
#navigation li a, #navigation li a:visited {
font-weight: bold;
- padding: .2em .5em;
+ padding: .25em .5em;
color: white; text-decoration: none;
}
#navigation li.active a {
@@ -364,7 +366,7 @@
}
#transnotes { font-size: .9em; }
-
+#content small { font-size: .9em; }
/*** ADDITIONAL LINKS ***/
@@ -387,7 +389,7 @@
}
#fsf-links li a, a:visited {
font-weight: bold;
- padding: .2em .5em;
+ padding: .25em .5em;
color: #222; text-decoration: none;
}
#fsf-links li a:hover {
@@ -419,20 +421,6 @@
margin: auto;
}
-#join-fsf {
- float: right;
- margin: .5em 0 1em 1em;
-}
-#join-fsf a, a:visited {
- font-size: 1em;
- padding: .25em; padding-top: .3em;
- background-color: #e7e9eb;
-}
-#join-fsf a:hover {
- color: black;
- background-color: #ff3;
-}
-
#backtotop a {
clear: both;
float: right;
@@ -471,7 +459,7 @@
}
#fs-gang .img-container img { width: 100%; padding: 0; margin: 0; }
-#sisters { font-size: .9em; margin: 1%; }
+#sisters { font-size: .9em; margin: 0 1% 1.5em 1%; }
/*** FOOTER ***/
@@ -482,7 +470,7 @@
background-color: #f5f6f7;
border-top: 1px solid #c9cccf;
}
-#footer p { margin-bottom: 0; }
+#footer p { margin-bottom: .3em; }
#footer .footer-unit, #footer .translators-credits {
margin: .5em 0;
@@ -646,7 +634,6 @@
/* definitions for /education-specific navigation bar
and breadcrumbs for education */
#edu-navigation {
- clear: both;
background-color: #d1d4d7;
}
ul#edu-navigation {
@@ -711,7 +698,7 @@
}
.back { text-align: right; font-weight: bold; }
-.back a, a:visited { color: #333; }
+.back a, a:visited { color: #334683; }
.back a:hover { color: red; }
/* End items specific to education */
Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-1.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- body-include-1.html 28 Feb 2014 19:57:12 -0000 1.4
+++ body-include-1.html 2 Mar 2014 23:04:47 -0000 1.5
@@ -6,6 +6,25 @@
<a href="/accessibility/">Accessibility</a>
</div> <!-- /toplinks -->
+<div class="top-right">
+<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a><br
/>GNU's main sponsor<br />+++</p>
+
+<div id="fssbox">
+<h4><a href="http://www.fsf.org/fss";>Newsletter</a></h4>
+<form
action="https://crm.fsf.org/civicrm/profile/create&reset=1&gid=31";
method="post">
+<div>
+ <input name="postURL" type="hidden" value="" />
+ <input type="hidden" name="group[25]" value="1" /> <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></label>
+<input type="text" id="frmEmail" name="email-Primary" size="18" maxlength="80"
value="email address"/>
+<input type="submit" name="_qf_Edit_next" value="Sign in" /></p>
+</form>
+</div><!-- /fssbox -->
+</div><!-- /top-right -->
+
<div id="searcher">
<form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
<div><label class="netscape4" for="phrase">Search:</label>
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- body-include-2.html 1 Mar 2014 07:57:39 -0000 1.5
+++ body-include-2.html 2 Mar 2014 23:04:47 -0000 1.6
@@ -4,33 +4,12 @@
<div id="gnu-banner">
<table><tr>
- <td><img src="/graphics/heckert_gnu.small.png" alt="[GNU logo]"></td>
- <td><strong>GNU</strong><br />
- <small>Operating System</small></td>
+ <td><img src="heckert_gnu.small.png" alt="[GNU logo]"></td>
+ <td><strong>GNU</strong> <small>Operating System</small>
+ </td>
</tr></table>
</div>
-<p id="fsf-support">GNU is supported by the <a
href="#mission-statement"><strong>Free Software Foundation</strong></a></p>
-
-<div id="fssbox">
-
-<h4><a href="http://www.fsf.org/fss";>Monthly newsletter</a></h4>
-<p>(in English, Spanish or French)</p>
-<form
action="https://crm.fsf.org/civicrm/profile/create&reset=1&gid=31";
method="post">
-<div>
- <input name="postURL" type="hidden" value="" />
- <input type="hidden" name="group[25]" value="1" /> <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></label>
-<input type="text" id="frmEmail" name="email-Primary" size="18" maxlength="80"
value="email address"/>
-<input type="submit" name="_qf_Edit_next" value="Sign in" /></p>
-</form>
-<p><strong>***Â <a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
-JOINÂ THEÂ FSF!</a>Â ***</strong></p>
-</div><!-- /fssbox -->
-
</div><!-- /header -->
<div id="navigation">
- www/server/staging/nav-bar/test9 layout4.css bo...,
Therese Godefroy <=