[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/ghm2016 body-include-2.html ...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/ghm2016 body-include-2.html ... |
|
Date: |
Thu, 16 Jun 2016 17:28:07 +0000 (UTC) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 16/06/16 17:28:07
Modified files:
server/staging/ghm2016: body-include-2.html home-ghm.html
layout.css
Added files:
server/staging/ghm2016: fs-gang-definitions.transp.html
Log message:
Add a version of the fs-gang definitions without red background.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/body-include-2.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/home-ghm.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/layout.css?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/fs-gang-definitions.transp.html?cvsroot=www&rev=1.1
Patches:
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/body-include-2.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- body-include-2.html 13 Jun 2016 13:43:53 -0000 1.3
+++ body-include-2.html 16 Jun 2016 17:27:14 -0000 1.4
@@ -1,6 +1,6 @@
<!-- start of server/body-include-2 -->
-<p class="c" style="font-size:1.1em; margin: 0; padding: .2em; background:
#ececec;
+<p class="c" style="font-size:1.2em; margin: 0; padding: .2em; background:
#ececec;
border-top: .2em solid #e74c3c ; border-bottom: .2em solid #e74c3c">
The <strong><a
href="/ghm/upcoming.html">9th HACKERS MEETING</a></strong>
@@ -34,7 +34,7 @@
<img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] "
/><strong>GNU</strong> Operating System</a>
</div><!-- /gnu-banner -->
-<!-- <p id="fsf-support">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>-->
+<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>
</div><!-- /header -->
<div id="navigation">
Index: home-ghm.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/home-ghm.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- home-ghm.html 12 Jun 2016 23:26:39 -0000 1.1
+++ home-ghm.html 16 Jun 2016 17:27:14 -0000 1.2
@@ -7,7 +7,7 @@
<meta http-equiv="Description" content="Since 1983, developing the free Unix
style operating system GNU, so that computer users can have the freedom to
share and improve the software they use." />
<link rel="alternate" title="Planet GNU"
href="http://planet.gnu.org/rss20.xml"; type="application/rss+xml" />
-<style type="text/css" media="screen">
+<style type="text/css" media="print,screen">
<!--
#home:after {
clear: both; content: ""; display: block;
@@ -15,51 +15,57 @@
}
#home h2 {
color: #333; text-shadow: none;
- margin-top: .9em; margin-bottom: .6em;
+ margin-bottom: .6em;
}
#home .button.large {
font-size: 1.5em;
font-family: "FreeSans", sans-serif;
- margin: 1.5em 0;
+ float: right;
+ position: relative; top: .5em;
}
#home .button a, #home .button a:visited {
- color: #e74c3c;
+ color: #e74c3c; color: white;
+ background: white; background: #e74c3c;
+ border: .2em solid white;
}
-#home .button a:hover { color: #777; }
#gnu-linux {
- width: 27em; max-width: 100%;
- text-align: center; margin: 1.5em auto;
+ width: 30em; max-width: 100%;
+ padding-top: .3em;
+ margin: 0 auto 2em;
+}
+#gnu-linux p { margin: 0; }
+#gnu-linux img { width: 93%; }
+#home .button a:hover { color: #777; color: #bbb; }
+#home .first-column p.back { margin: 1em 0; }
+#home .second-column h4 img { height: .75em; width: .75em; }
+#home .emph-box, #Action, #home .highlight-para {
+ margin: 2.3em 0 1em;
}
-#gnu-linux img { width: 100%; }
-#home p.back { margin-bottom: 0; }
-.second-column h4 img { height: .75em; width: .75em; }
-#home .emph-box { margin-top: 2.2em; background: white; }
-#Flashes { padding-bottom: 1em; }
#home .emph-box h4 {
text-align: center;
font-size: 1.5em;
- margin-top: .5em;
+ margin-top: 0;
}
-#home .emph-box p { font-size: .9em; }
-#home .emph-box p small { font-size: 1em; }
-#blurb {
- padding-bottom: 1.5em;
- margin-top: 2.5em;
+#home .emph-box {
+ background: white;
}
#Action {
+ text-align: left;
padding: 0 1em;
- margin: 2.5em 0;
border-left: .3em dotted #f49943;
border-right: .3em dotted #f49943;
}
#Action h2 {
text-align: center;
+ margin-bottom: .9em;
}
#Action li { margin-bottom: .7em; }
-#home .highlight-para { border: .1em solid #f49943; }
+#home .highlight-para {
+ border: .1em solid #f49943;
+}
p#backtotop { float: right; margin-top: 2.5em; }
-#sisters { font-size: .9em; margin: 0 3% 2em 3%; }
address@hidden (min-width: 52em) {
+#sisters { font-size: .9em; margin: 0 3% 1.5em 3%; }
address@hidden (min-width: 55em) {
#home .first-column {
width: 60%;
float: left;
@@ -73,7 +79,7 @@
<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
<!--
p#backtotop { float: left; }
address@hidden (min-width: 52em) {
address@hidden (min-width: 55em) {
#home .first-column {
width: 60%;
float: right;
@@ -86,6 +92,7 @@
-->
<!--#endif -->
</style>
+<!--#include virtual="/server/staging/ghm2016/fs-gang-definitions.transp.html"
-->
<!--#include virtual="/po/home.translist" -->
<!--#include virtual="/server/staging/ghm2016/banner.html" -->
@@ -191,30 +198,20 @@
<p class="back"><a href="/gnu/gnu.html">More information</a>.</p>
</div><!-- /first-column -->
-
<div class="second-column">
<div id="Flashes" class="emph-box">
+
<h4><a href="http://planet.gnu.org/";>Planet GNU</a>
<a href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png"
alt="RSS Feed" /></a></h4>
<!--#include virtual="/planetfeeds.html" -->
<p>For more news, see <a href="http://planet.gnu.org/";>Planet GNU</a>
and the list of <a href="/software/recent-releases.html">recent GNU
releases</a>.</p>
-</div><!-- class="emph-box" -->
-
-<div id="blurb" class="emph-box">
-<!--#include virtual="/server/home-pkgselect.html" -->
-<!--#include virtual="/server/home-pkgblurbs.html" -->
-<p class="back"><small><a href="/manual/blurbs.html">Short descriptions for
all GNU
-packages.</a></small></p>
-</div><!-- id="software" -->
+</div>
<div id="Action">
-
-<!-- BEGIN TakeAction -->
<h2>Take Action</h2>
-
<ul>
<li><strong><a href="http://www.fsf.org/campaigns";>Support current FSF
campaigns</a></strong>.</li>
@@ -251,12 +248,9 @@
</ul>
<p class="back"><a href="/server/takeaction.html">More action items.</a></p>
-
-<!-- END TakeAction -->
-</div><!-- /Action -->
+</div>
<div class="highlight-para">
-
<p><strong>Can you contribute to any of
these <a href="http://www.fsf.org/campaigns/priority-projects/";>High
Priority Projects</a>?</strong> Gnash, coreboot, free distributions of
@@ -281,12 +275,20 @@
<a href="/software/metaexchange/">metaexchange</a>,
<a href="/software/powerguru/">powerguru</a><span class="gnun-split"></span>.
See the package web pages for more information.</p>
+</div>
+
+<div id="blurb" class="emph-box">
+<!--#include virtual="/server/home-pkgselect.html" -->
+<!--#include virtual="/server/home-pkgblurbs.html" -->
+<p class="back"><small><a href="/manual/blurbs.html">Short descriptions for
all GNU
+packages.</a></small></p>
+</div>
-</div><!-- /highlight-para -->
</div><!-- /second-column -->
</div><!-- /home -->
</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/fs-gang.html" -->
<!--#include virtual="/server/footer.html" -->
<p id="sisters">The <a href="http://www.fsf.org/";>FSF</a> also has sister
@@ -351,7 +353,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/12 23:26:39 $
+$Date: 2016/06/16 17:27:14 $
<!-- timestamp end -->
</p>
</div>
Index: layout.css
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/layout.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- layout.css 12 Jun 2016 23:26:39 -0000 1.1
+++ layout.css 16 Jun 2016 17:27:14 -0000 1.2
@@ -38,40 +38,41 @@
/*
Text
black normal text, hover on #555
- white #navigation
#222, #333, #404040, #555: special items
#777 medium gray: hover special links
+ white #navigation
+
#005090 greenish blue: normal links
#100070 purplish blue: normal visited links, normal hover
blue #urgent links
- #a42e2b GNU banner, #join-fsf, #outdated, active links in edu-navbar
+ #a42e2b GNU banner, #outdated, active links in edu-navbar
Backgrounds
- white #inner, navbar li.active
+ #999 hr
+ #d4d4d4 #fsf-links, #searcher
+ #e4e4e4 html
+ #eee #edu-navigation, submit
#f3f3f3 #translations, #footer, #outdated, .emph-box, .toc,
.lyrics, .listing
- #eee #edu-navigation, submit
- #e4e4e4 html
- #ddd #gpl-compat-matrix
- #d4d4d4 #fsf-links, #searcher
- #ccffcc light green: #gpl-compat-matrix
- #e4ffcc light yellowish green: #gpl-compat-matrix
- #fff5d4 very light orange: .highlight-para, p.highlight, table headers
- #fff1c0 light orange: .highlight
- #ff3 yellow: #urgent
+ white body, buttons
+
#a42e2b red: #navigation
- #700000 dark red: active link in #navigation
+ #ff3 yellow: #urgent
+ #fff1c0 light orange: .highlight
+ #fff5d4 very light orange: .highlight-para, p.highlight, table headers
Borders
black, #111, #333, #666: tables
- #bbb body, #Action, emph-box, lyrics
- #ccc unfocused inputs
- #d4d4d4 #translations, #outdated, ul#edu-navigation
- #999 buttons, hr
- #333 focused inputs
#222 box-shadow behind buttons
- #e74c3c .highlight-para, .announcement, .note, .big-section h3
+ #333 focused inputs
+ #999 buttons
+ #bbb body
+ #ccc unfocused inputs, emph-box, lyrics, footer
+ #d4d4d4 #translations, #outdated
+
#3465a4 .edu-cases
+ #e74c3c .announcement, .note, .big-section h3
+ #f49943 .highlight-para
*/
/*** Luminosity contrast ratio and color difference ***
@@ -165,12 +166,21 @@
#mission-statement, #footer {
padding-left: 3%; padding-right: 3%;
}
-#content ul#edu-navigation {
+ul#edu-navigation {
margin-left: -3.2%; margin-right: -3.2%;
}
/** Backgrounds **/
+#content {
+/* This extends any background all the way to the top and completes
+ the main navbar. */
+ border-top: .2em solid #a42e2b;
+/* The last element is likely to have a 1em bottom margin
+ which adds up with this padding. */
+ padding-bottom: 1.5em;
+}
+
#searcher, #fsf-links {
background-color: #d4d4d4;
}
@@ -201,12 +211,7 @@
h5 { font-size: 1.1em; margin: 1em 0 .91em 0; }
h6 { margin: 1em 0; }
-p { margin-top: 1em; } /* In combo.css, margin-bottom:1em. */
-pre {
- margin-top: .8em; margin-bottom: .8em;
- padding-bottom: .2em;
- overflow: auto;
-}
+p, pre { margin-top: 1em; } /* In combo.css: margin-bottom:1em. */
address { margin-bottom: 1em; }
ul, ol, blockquote { margin-left: 1.5%; margin-right: 1.5%; }
@@ -215,9 +220,7 @@
ul li { margin: .5em 1em; }
ol li { margin: 1em; }
ol ul li { margin: .5em 1em; }
-ul li p, ul li pre, ul li blockquote, ul ul li {
- margin-top: .3em; margin-bottom: .3em;
-}
+ul li p, ul li pre, ul ul li { margin-top: .3em; margin-bottom: .3em; }
ul ul, ol ul, table ul { margin-top: 0; margin-bottom: 0; }
table li { margin-top: .2em; margin-bottom: .2em; }
@@ -236,6 +239,9 @@
/** Style **/
+h1, h2 {
+ font-family: "FreeSans", sans-serif;
+}
/* The default color (black) is too dark for large text in
bold font. */
h3, h4 { color: #333; }
@@ -248,13 +254,17 @@
text-decoration: none;
}
-ul li { list-style: inherit; }
-ul { list-style: square; }
-ul ul, ol ul { list-style: circle; }
+ul li { list-style: square; }
+ul ul li, ol ul li { list-style: circle; }
blockquote { font-style: italic; }
acronym, abbr { text-decoration: none; } /* border-bottom in combo.css */
-hr { color: #bbb; background-color: #bbb; }
+hr {
+ color: #999;
+ background-color: #999;
+}
+pre { overflow: auto; }
+
/*** SIMPLE CLASSES ***/
@@ -268,7 +278,7 @@
.inline-list li { display: inline }
/* Found in a few software pages and many manuals. */
-ul.no-bullet { list-style: none; }
+.no-bullet li { list-style: none; }
.netscape4, .no-display { display: none; }
@@ -280,8 +290,6 @@
display: block;
height: .3em;
margin-bottom: 1.2em;
- color: #999;
- background-color: #999;
border: none;
}
@@ -354,13 +362,16 @@
-webkit-border-radius: .4em;
-opera-border-radius: .4em;
}
+
.button a, #join-fsf a,
#fssbox input[type="submit"] {
- box-shadow: 0 .15em #222;
+/*
+ box-shadow: 0 .15em white;
-moz-box-shadow: 0 .15em #222;
-webkit-box-shadow: 0 .15em #222;
-icab-box-shadow: 0 .15em #222;
-o-box-shadow: 0 .15em #222;
+*/
border-radius: 1em;
-moz-border-radius: 1em;
-khtml-border-radius: 1em;
@@ -394,7 +405,7 @@
but could apply elsewhere. */
.big-section { margin-bottom: .5em; }
-#content .big-section h3 {
+.big-section h3 {
display: inline-block;
font-size: 1.7em;
padding: .2em 0;
@@ -404,14 +415,13 @@
border-bottom: .12em solid #e74c3c;
}
.big-subsection { margin: 1.5em 0; }
-#content .big-subsection h4 {
+.big-subsection h4 {
display: inline;
font-size: 1.5em;
margin-right: .3em;
color: black;
}
-
/*** ANCHOR ***/
/* This is used in pages of lists, such as gnu-linux.faq.html,
@@ -425,13 +435,21 @@
/*** NON-FLOATING INSETS AND HIGHLIGHTED STUFF ***/
-/* .highlight doesn't have a border. It can be applied to in-line elements,
- or next to .summary.
- .highlight-para and .emph-box have borders. They are used for blocks
- which are not adjacent to floating stuff (unless a margin keeps
- the right border away from the floating stuff). */
-
-.highlight-para, p.highlight, .emph-box { padding: .5em 1.2em; }
+/* .highlight doesn't have a border. It can be applied to in-line elements.
+ .highlight-para and .emph-box have borders. They are used for block
elements.
+ highlight-para can be used next to .note or .summary because it only has top
+ and bottom borders. */
+
+.highlight-para, .highlight, .emph-box {
+ padding: .6em 1.2em;
+}
+div.highlight-para, div.emph-box { padding: 1.5em; }
+
+/* Strip the top and bottom margins to avoid uneven spacing between text
+ and border in NetSurf. */
+div.highlight-para > *, div.emph-box > *, .lyrics > * { margin-bottom: 0; }
+div.highlight-para > *:first-child, div.emph-box > *:first-child,
+ .lyrics > *:first-child { margin-top: 0; }
.highlight { background-color: #fff1c0; }
.highlight-para, p.highlight { background-color: #fff5d4; }
@@ -441,7 +459,7 @@
}
.emph-box, .lyrics {
background-color: #f3f3f3;
- border: .1em solid #bbb;
+ border: .1em solid #ccc;
}
.lyrics {
@@ -452,14 +470,14 @@
}
/* Announcements */
-.announcement {
+div.announcement {
font-size: 1.1em; font-weight: bold;
padding: 0 1em;
margin: 1.5em 0;
color: #333;
border-left: .5em solid #e74c3c;
}
-.announcement blockquote {
+div.announcement blockquote {
margin-left: 0; margin-right: 0;
}
@@ -488,7 +506,7 @@
font-weight: bold;
font-style: italic;
margin-bottom: 0;
- margin-top: 1.2em;
+ margin-top: 1em;
}
.trans-disclaimer a,
.trans-disclaimer a:visited { color: #333; }
@@ -498,111 +516,109 @@
#outdated {
text-align: center;
padding: .7em 3%;
- margin: .5em -3.2%;
+ margin: .3em -3.2%;
color: #a42e2b;
background-color: #f3f3f3;
- border-bottom: .2em solid #bbb;
+ border-bottom: .2em solid #d4d4d4;
}
#outdated p {
margin: 0.2em 0;
}
#outdated a:visited { color: #005090; }
+#outdated a:hover { color: #777; }
/* For translators notes */
.translators-notes { font-size: .9em; }
.translators-notes hr { margin-top: 1.65em; }
-.translators-notes ol li { margin: .5em 1.1em; }
+.translators-notes ol li { margin: .5em 1.1em 0; }
+
+/*** FLOATING INSETS ***/
-/*** FLOATING NOTES ***/
+/** Notes **/
.note {
text-align: center;
font-style: normal;
max-width: 20em;
- padding: 0;
+ padding: .5em;
margin: 1em auto;
+ background: white;
border: .2em dotted #e74c3c;
}
.note p {
font-size: 1.1em;
line-height: 1.4em;
- padding: 0 1em ;
+/* For NetSurf: replace margin with padding. */
+ padding: .5em;
+ margin: 0;
}
.note strong { font-size: 1.2em; }
address@hidden (min-width: 48em) {
- .note {
- clear: right;
- float: right;
- margin: .2em 0 1em 1.5em;
- }
-}
-
-/*** TABLES OF CONTENTS ***/
+/** Tables of contents **/
/* Common definitions */
-div.summary, div.toc {
+.summary, .toc {
padding: 1.5em;
margin: 2.5em auto 2em auto;
background: #f3f3f3;
}
-div.summary h3, div.toc h3 {
+.summary h3, .toc h3 {
font-size: 1.3em;
}
-div.summary h4, div.toc h4 {
+.summary h4, .toc h4 {
font-size: 1.1em;
}
-div.summary > ul, div.summary > ol, div.toc > ul, div.toc > ol {
- margin-top: 0; margin-bottom: 0;
-}
-div.summary li, div.toc li {
+/* Spacing between items is given by the top margin of li. */
+.summary > ul > li, .summary > ol > li
+ .toc > ul > li, .toc > ol > li {
margin-top: .5em; margin-bottom: 0;
}
-div.summary > * > li:first-child, div.summary > *:first-child {
+.summary > ul, .summary > ol, .toc > ul, .toc > ol {
+ margin-top: 0; margin-bottom: 0;
+}
+/* For NetSurf:
+ Strip the top margin of the first element. */
+.summary > *:first-child, .summary > * > li:first-child,
+ .toc > *:first-child, .toc > * > li:first-child {
margin-top: 0;
}
/* Big tables of contents */
-div.toc {
+.toc {
max-width: 45em;
}
-div.toc h3, div.toc h4 {
+.toc h3, .toc h4 {
text-align: center;
}
-/* Small tables of contents */
-div.summary.white {
- padding: 0;
- background: white;
-}
+
+/** For wide screens **/
+
@media (min-width: 48em) {
- div.summary {
+ .summary {
+ width: 20em; max-width: 40%;
+ }
+ .note, .summary {
clear: right;
float: right;
- width: 20em; max-width: 45%;
- margin: .3em 0 1em 0;
- border-left: 1.5em solid white;
- }
- div.summary li {
- margin-right: 0;
- }
- div.summary.white {
- padding-left: 1.5em;
- margin: .2em 0 1em 1.5em;
- border-left: .2em solid #bbb;
- }
- div.summary.white ul, div.summary.white ol {
- margin-left: 0;
+ margin: .2em 0 1em 2em;
+/* This keeps an adjacent background (e.g. highlight-para)
+ from touching the note or the summary. */
+ box-shadow: 0 0 0 1em white;
+ -moz-box-shadow: 0 0 0 1em white;
+ -webkit-box-shadow: 0 0 0 1em white;
+ -icab-box-shadow: 0 0 0 1em white;
+ -o-box-shadow: 0 0 0 1em white;
}
}
/*** IMAGES ***/
-.imgright { float: right; margin: .3em 0 1em 1.5em; }
-.imgleft { float: left; margin: .3em 1.5em 1em 0; }
+.imgright { float: right; margin: .2em 0 1em 1.5em; }
+.imgleft { float: left; margin: .2em 1.5em 1em 0; }
/* For pictures with/without legend. */
.narrow { width: 15em; }
@@ -618,17 +634,17 @@
@media (min-width: 43em) {
.pict.narrow {
- float:right; margin: .3em 0 1em 1.5em;
+ float:right; margin: .2em 0 1em 1.5em;
}
}
@media (min-width: 48em) {
.pict.medium {
- float:right; margin: .3em 0 1em 1.5em;
+ float:right; margin: .2em 0 1em 1.5em;
}
}
@media (min-width: 55em) {
.pict.wide {
- float:right; margin: .3em 0 1em 1.5em;
+ float:right; margin: .2em 0 1em 1.5em;
}
}
@@ -637,7 +653,7 @@
.photo {
float: right;
width: 30em; max-width: 100%;
- margin: .3em 0 1em 0;
+ margin: .2em 0 1em 0;
}
.photo img, .photo p {
width: 94%;
@@ -751,6 +767,7 @@
clear: both;
font-size: .9em;
text-align: left;
+/* border-bottom: .2em solid #d4d4d4; */
}
#translations p {
line-height: 1.2em;
@@ -771,7 +788,7 @@
}
#translations span.original a,
#translations span.original a:visited {
- color: #334683;
+ color: #005090
}
#translations a:hover,
#translations span.original a:hover {
@@ -779,9 +796,6 @@
}
/* Still used in s/emacs/tour/index.html
- s/cssc/cssc.html
- s/cssc/early-history.html
- s/stalkerfs/index.html
*/
#translations h3, #translations h4, #translations ul {
display: none;
@@ -795,7 +809,7 @@
height: 0px; visibility: hidden; width: 0px;
}
-/** Narrow screens and CSS-1 browsers **/
+/* Narrow screens and CSS-1 browsers */
#fsf-support, #fssbox { display: none; }
/* GNU banner */
@@ -834,41 +848,19 @@
#fsf-frame p { margin: 0; }
#fsf-frame hr { display: none; }
-/* join-fsf */
+/* Join FSF */
#join-fsf a, #join-fsf a:visited {
- color: #005090;
- background: white;
+ color: #005090; color: white;
+ background: #0093a0;
+ border-color: #0093a0;
}
-#join-fsf a:hover { color: #777; }
+#join-fsf a:hover { color: #777; color: #ddd; }
@media (min-width: 45em) {
#gnu-banner {
clear: none;
- padding: 1.2em 0;
- }
-}
-
-/** Medium-size screens **/
address@hidden (min-width: 55em) {
- #join-fsf { float: right; }
-
- /* fssbox */
- #fssbox {
- display: block;
- clear: right;
- float: right;
- padding: 1em 0 0;
}
- #fssbox form p { margin-top: .1em; }
- #fssbox form input { font-weight: bold }
- #fssbox form input[type="submit"] {
- color: #333;
- background: white;
- }
- #fssbox a, #fssbox a:visited { color: #005090; }
- #fssbox a:hover { color: #777; }
-
- /* fsf-support */
+/*FSF support */
#fsf-support { display: block; }
#fsf-support {
font-size: .9em;
@@ -882,14 +874,26 @@
}
#fsf-support a:hover { color: black; }
}
-
-/** Wide screens **/
address@hidden (min-width: 67em) {
address@hidden (min-width: 55em) {
+ #join-fsf { float: left; }
+ #fsf-frame { width: 40%; }
+/* Free Software Supporter */
#fssbox {
- clear: none;
- float: left;
- margin-top: 2em;
+ display: block;
+ clear: left;
+ float: right;
+ text-align: center;
+ padding: 1em 0 0;
}
+ #fssbox form p { margin-top: .1em; }
+ #fssbox form input { font-weight: bold }
+ #fssbox form input[type="submit"] {
+ color: white;
+ background: #166fb4;
+ border-color: #166fb4;
+ }
+ #fssbox a, #fssbox a:visited { color: #005090; }
+ #fssbox a:hover { color: #777; }
}
@@ -899,59 +903,58 @@
clear: both;
}
-#fsf-links { margin-top: 2.5em; }
-
+/* line-height is defined here for NetSurf 1.2.
+ No effect in NetSurf 2.9 or Firefox. */
#navigation ul, #fsf-links ul, ul#edu-navigation {
- font-size: 0.9em;
text-align: center;
- text-transform: uppercase;
- font-weight: bold;
- font-family: "FreeCondensed", "FreeSans", sans-serif;
- padding-left: 3%; padding-right: 3%;
+ font-size: 0.9em;
+ line-height: 1.7em;
+}
+#navigation ul, #fsf-links ul {
+ padding: .2em .5em 0;
+ margin: 0;
}
-#navigation ul, #fsf-links ul { margin: 0; }
ul#edu-navigation {
+ padding: .2em .5em;
margin-top: 0; margin-bottom: 0;
- border-top: .2em solid #d4d4d4;
}
-/* line-height is defined in ul for NetSurf 1.2.
- No effect in NetSurf 2.9 or Firefox. */
-#navigation ul, #fsf-links ul,
- #navigation li, #fsf-links li { line-height: 1.9em; }
-ul#edu-navigation, ul#edu-navigation li { line-height: 1.7em; }
-
#navigation li, ul#edu-navigation li, #fsf-links li {
white-space: nowrap;
display: inline;
display: inline-block;
- padding: .2em .4em 0;
- margin: 0;
+ line-height: 1.6em;
+ font-family: "FreeCondensed", "FreeSans", sans-serif;
+ text-transform: uppercase;
+ font-weight: bold;
+ margin: .2em .4em 0 .4em;
}
+/* Mock border to avoid size change when a link becomes active */
+#navigation li { border-bottom: .15em solid #a42e2b; }
+ul#edu-navigation li { border-bottom: .15em solid #eee; }
+#fsf-links li { padding-bottom: .15em; }
-/* For Firefox (can't set line-height when "a" is displayed inline) */
+ /* For Firefox (can't set line-height when "a" is displayed inline) */
#navigation a, ul#edu-navigation a, #fsf-links a {
display: inline-block;
}
-#navigation a, #navigation a:visited { color: white; }
-#edu-navigation a, ul#edu-navigation a:visited,
- #fsf-links a, #fsf-links a:visited { color: #404040; }
-
-#navigation li.active { background: #700000; }
-ul#edu-navigation li.current,
- ul#edu-navigation li.active {
- background: white;
+#navigation, #navigation a, #navigation a:visited { color: white; }
+#edu-navigation, #edu-navigation a, ul#edu-navigation a:visited,
+ #fsf-links a, #fsf-links li a:visited { color: #222; }
+
+#navigation li.active {
+ font-style: italic;
+ border-bottom: .15em solid white;
}
-ul#edu-navigation li.active a,
- ul#edu-navigation li.active a:visited {
- color: #a42e2b;
+ul#edu-navigation li.active,
+ ul#edu-navigation li.current {
+ font-style: italic;
+ border-bottom: .15em solid #a42e2b;
}
-
#navigation li a, ul#edu-navigation li a, #fsf-links li a,
#navigation li.active a:hover,
ul#edu-navigation li.active a:hover {
- line-height: 1.7em;
text-decoration: none;
}
#navigation a:hover, ul#edu-navigation a:hover,
@@ -982,7 +985,7 @@
font-size: .9em;
padding-top: 1.2em; padding-bottom: .5em;
color: #333;
- border-top: 1px solid #c9cccf;
+ border-top: 1px solid #ccc;
}
#footer p { margin: 0; }
@@ -1006,7 +1009,7 @@
}
.edu-breadcrumb a,
.edu-breadcrumb a:visited {
- color: #334683;
+ color: #005090;
text-decoration: none;
}
.edu-breadcrumb a:hover {
Index: fs-gang-definitions.transp.html
===================================================================
RCS file: fs-gang-definitions.transp.html
diff -N fs-gang-definitions.transp.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fs-gang-definitions.transp.html 16 Jun 2016 17:27:14 -0000 1.1
@@ -0,0 +1,39 @@
+<!-- start of fs-gang-definitions.html -->
+
+<style type="text/css" media="print,screen">
+/* Common clauses for the Free Software Gang banner. */
+#fs-gang .img-container {
+ text-align: left;
+ padding-top: .5em;
+ height: 100%; width: 40em; max-width: 100%; margin: auto;
+}
+#fs-gang .img-container a {
+ font-size: 1.3em;
+ font-weight: bold;
+ margin-left: .5em;
+ color: white; text-decoration: none; color: #888;
+}
+#fs-gang .img-container img {
+ width: 100%;
+ padding: .3em 0 0 0;
+ margin: 0;
+}
+</style>
+
+<style type="text/css" media="screen">
+/* screen-specific fs-gang-definitions */
+#fs-gang {
+ clear: both;
+ margin: 0;
+/* background-color: #a50606; */ /* Fallback from gradient */
+/* background: -moz-linear-gradient(#820202, #f71111); */ /* FF 3.6+ */
+/* background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #820202), color-stop(100%, #f71111));/* /* Safari 4+, Chrome 2+
*/
+/* background: -webkit-linear-gradient(#820202, #f71111); */ /* Safari 5.1+,
Chrome 10+ */
+/* background: -o-linear-gradient(#820202, #f71111); */ /* Opera 11.10 */
+/* filter:
progid:DXImageTransform.Microsoft.gradient(startColorstr='#820202',
endColorstr='#f71111'); */ /* IE6 & IE7 */
+/* -ms-filter:
"progid:DXImageTransform.Microsoft.gradient(startColorstr='#820202',
endColorstr='#f71111')"; */ /* IE8+ */
+/* background: linear-gradient(#820202, #f71111); */ /* the standard */
+}
+</style>
+
+<!-- end of fs-gang-definitions.html -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/server/staging/ghm2016 body-include-2.html ...,
Therese Godefroy <=