[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/ghm2016 layout-rsd.css home-...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/ghm2016 layout-rsd.css home-... |
|
Date: |
Mon, 1 Aug 2016 22:57:11 +0000 (UTC) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 16/08/01 22:57:11
Modified files:
server/staging/ghm2016: layout-rsd.css home-ghm-rsd.html
footer-text.html body-include-1-rsd.html
body-include-2-rsd.html
fs-gang-definitions.html
Log message:
Simplified version of the home page; move #sisters to footer-text;
various fixes in layout.css.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/layout-rsd.css?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/home-ghm-rsd.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/footer-text.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/body-include-1-rsd.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/body-include-2-rsd.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/fs-gang-definitions.html?cvsroot=www&r1=1.2&r2=1.3
Patches:
Index: layout-rsd.css
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/layout-rsd.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- layout-rsd.css 25 Jul 2016 17:25:32 -0000 1.11
+++ layout-rsd.css 1 Aug 2016 22:57:10 -0000 1.12
@@ -37,45 +37,42 @@
/*
Text
- black normal text, hover on #555
+ black normal text, hover on #555 and nav-bars
+ white #navigation
+ #999 light gray: text shadow
#222, #333, #404040, #555: special items
#777 medium gray: hover special links
- white #navigation
-
- #004caa blue: normal links
+ #334683 blue from GNU banner: h1, h2
+ #005090 greenish blue: normal links
#100070 purplish blue: normal visited links, normal hover
blue #urgent links
- #a42e2b red: GNU banner, #outdated, active links in edu-navbar
+ #171d33 dark blue (from screenshot): #Action h2
+ #971611 red from GNU banner: .button link, #join-fsf
Backgrounds
- #999 hr
- #d4d4d4 #fsf-links, #searcher
- #e4e4e4 html
- #eee #edu-navigation, submit
- #f5f5f5 #translations, #footer, #outdated, .emph-box, .toc,
- .lyrics, .listing
- white body, .note
-
- #a42e2b red: #navigation
- #4080d0 blue: #join-fsf, #fssbox submit:focus
- #004caa blue: #join-fsf:hover
+ white #inner, navbar li.active
+ #f0f2f4 light bluish gray: #translations, .emph-box, #outdated,
+ .listing, #footer, .toc, lyrics
+ #e7e9eb html
+ #d1d4d7 #edu-navbar, #fsf-links, #searcher
+ #ddd gray (looks purplish): #gpl-compat-matrix
+ #ccffcc light green: #gpl-compat-matrix
+ #e4ffcc light yellowish green: #gpl-compat-matrix
+ #ffc very pale yellow: .highlight-para, p.highlight
+ #fff898 pale yellow: table headers, .highlight
#ff3 yellow: #urgent
- #fff1c0 light orange: .highlight
- #fff5d4 very light orange: .highlight-para, p.highlight, table headers
+ #a42e2b red (slightly darker than the Gnowsys logo): #navigation
Borders
black, #111, #333, #666: tables
- #222 box-shadow behind buttons
- #bbb body
- #ccc unfocused inputs, emph-box, lyrics, footer
- #d4d4d4 #translations, #outdated
-
- #6092d0 .note
- #4080d0 focused inputs
- #3465a4 .edu-cases
- #e74c3c .big-section h3
- #f49943 .highlight-para
- #fc7 .announcement
+ #999 buttons, hr, unfocused inputs
+ #b9bcbf bluish gray: body, #Action, .highlight-para, .announcement
+ #d1d4d7 bluish gray: #translations, #outdated
+ #3465a4 blue (slightly lighter than GNU banner): edu-cases ridges
+ #6092d0 note
+ #334683 focused inputs
+ #171d33 dark blue: box-shadow behind buttons
+ #6989b6 light blue: border for .big-section h3
*/
/*** Luminosity contrast ratio and color difference ***
@@ -87,35 +84,48 @@
#000 white 21.3 765
#000 #ff3 19.6 561
#222 white 15.91 663
+ #222 #c9cccf 9.87 510
#333 white 12.63 612
- #333 #eee 10.89 561
- #404040 #d4d4d4 6.99 444
+ #333 #e7e9eb 10.38 546
+ #333 #c9cccf 7.83 459
+ #404040 #d1d4d7 6.97 444
#555 white 7.46 510
Red
+ #971611 white 8.61 704
+ #971611 #e7e9eb 7.07 638
#a42e2b white 6.99 630
+Blue from GNU banner
+ #334683 white 8.96 494
+ #334683 #fff898 8.16 384
+ #334683 #e7e9eb 7.36 428
+ #334683 #777 2.0 110
+ #334683 #555 1.20 76
+ #334683 #333 1.41 118
+ #334683 black 2.34 271
+
Blue (urgent)
#00f #ff3 8.02 714
Blue links
- #004caa white 8.03 443
- #004caa #e4ffcc 7.45 365
- #004caa #fff1c0 7.11 366
- #004caa #f3f3f3 7.24 407
- #004caa #ccffcc 7.17 341
- #004caa #777 1.79 137
- #004caa #333 1.57 169
- #004caa black 2.61 322
+ #005090 white 8.23 461
+ #005090 #e4ffcc 7.64 383
+ #005090 #fff898 7.50 351
+ #005090 #f0f2f4 7.34 422
+ #005090 #ccffcc 7.35 359
+ #005090 #777 1.84 103
+ #005090 #333 1.53 151
+ #005090 black 2.55 304
Purple links
#100070 white 16.72 653
- #100070 #fff1c0 14.81 576
+ #100070 #fff898 15.23 543
#100070 #ccffcc 14.92 551
#100070 #777 3.73 245
#100070 #333 1.32 163
#100070 black 1.26 112
- #100070 #004caa 2.08 134
+ #100070 #005090 2.03 112
*/
@@ -143,7 +153,7 @@
text-decoration: none;
color: #000;
}
-html { background: #e4e4e4; }
+html { background: #e7e9eb; }
/* This specifies the basic width of our web pages. Don't change it
without discussion on www-discuss. The magic 74.92 is for
@@ -169,7 +179,7 @@
#mission-statement, #footer {
padding-left: 3%; padding-right: 3%;
}
-ul#edu-navigation {
+#content ul#edu-navigation {
margin-left: -3.2%; margin-right: -3.2%;
}
@@ -179,7 +189,9 @@
background-color: #d4d4d4;
}
#translations, #footer { background-color: #f5f5f5; }
+
#edu-navigation { background-color: #eee; }
+
#navigation { background-color: #a42e2b; }
/** Fonts **/
@@ -210,16 +222,18 @@
p, pre { margin-top: 1em; } /* In combo.css: margin-bottom:1em. */
address { margin-bottom: 1em; }
-ul, ol, blockquote { margin: 0 1.5%; }
+ul, ol, blockquote {
+ margin-left: 1.5%; margin-right: 1.5%; /* In combo.css: margin:1em. */
+}
/* Lists of underlined links are difficult to read. The top margin
gives a little more spacing between entries. */
-ol > li { margin: 1em 0 0 1em; }
-ul li { margin: .5em 0 0 1em; }
-ul li p, ul li pre, ul ul li, ul li blockquote {
+ol li { margin: 1em 0 0 1em; }
+ul li, ul ol li { margin: .5em 0 0 1em; }
+ul li p, ul li pre, ul ul li, ul li blockquote, table li {
margin-top: .3em; margin-bottom: 0;
}
-table li { margin-top: .2em; margin-bottom: .2em; }
+ul ul, ol ul, table ul { margin: 0 1.5%; }
/* Separate description lists from preceding text */
dl { margin: 1.5em 0 0 0; }
@@ -228,13 +242,9 @@
/* separate the "description" from subsequent list item
when the final <dd> child is an anonymous box */
dl dd { margin: 1em 3% 1.5em 3%; }
-/* separate anonymous box (used to be the first element in <dd>)
- from subsequent <p> */
-dd p { margin-top: 1em; }
small { font-size: .9em; }
-
/** Style **/
/* The default color (black) is too dark for large text in
@@ -258,10 +268,6 @@
em i, em cite, cite i, cite em { font-style: normal; }
acronym, abbr { text-decoration: none; } /* border-bottom in combo.css */
-hr {
- color: #999;
- background-color: #999;
-}
pre { overflow: auto; }
@@ -272,15 +278,17 @@
.underline { text-decoration: underline; }
.nounderline { text-decoration: none; }
-.big { font-size: 130%; padding: .3em 0; }
-.bold { font-weight: bold; }
+
.italic { font-style: italic; }
-.noitalic, .italic em, .italic cite, .italic i {
+.italic em, .italic cite, .italic i {
font-style: normal;
}
-.inline-list li { display: inline }
+.big { font-size: 1.3em; padding: .3em 0; }
+.bold { font-weight: bold; }
+
ul.no-bullet { list-style: none; }
+.inline-list li { display: inline; }
.no-display { display: none; }
@@ -306,11 +314,6 @@
font-family: inherit;
font-weight: bold;
border: .1em solid #ccc;
- border-radius: .4em;
- -moz-border-radius: .4em;
- -khtml-border-radius: .4em;
- -webkit-border-radius: .4em;
- -opera-border-radius: .4em;
}
form input[type="text"] {
padding: .25em;
@@ -336,7 +339,7 @@
/*** BUTTONS ***/
-.button a {
+.button a, #join-fsf a {
line-height: 1.2em;
font-weight: bold;
text-decoration: none;
@@ -344,13 +347,7 @@
/* Color and background are left out because they depend
on the environment. */
border: .1em solid #999;
- border-radius: 1em;
- -moz-border-radius: 1em;
- -khtml-border-radius: 1em;
- -webkit-border-radius: 1em;
- -opera-border-radius: 1em;
-}
-.button a {
+
/* Display the button link as block in
browsers lacking support for inline-block, */
display: block;
@@ -362,34 +359,62 @@
/* The large button is defined in home.html. */
+/*** SPECIAL BORDERS ***/
+
+#searcher input[type="text"], #searcher input[type="submit"],
+ #fssbox input[type="text"], #fssbox input[type="submit"] {
+ border-radius: .3em;
+ -moz-border-radius: .3em;
+ -khtml-border-radius: .3em;
+ -webkit-border-radius: .3em;
+ -opera-border-radius: .3em;
+}
+.button a, #join-fsf a {
+ border-radius: 1em;
+ -moz-border-radius: 1em;
+ -khtml-border-radius: 1em;
+ -webkit-border-radius: 1em;
+ -opera-border-radius: 1em;
+}
+
+
/*** RETURN LINKS ***/
-.back {
+.back, #backtotop {
text-align: right;
line-height: 1.5em;
font-weight: bold;
margin: 1.5em 2%;
}
-.back a, .back a:visited { color: #333; }
-.back a:hover { color: #777; }
+.back a, .back a:visited,
+ #backtotop a, #backtotop a:visited { color: #333; }
+.back a:hover,
+ #backtotop a:hover { color: #777; }
+#backtotop {
+ font-size: 1.1em; /* In #mission-statement, font-size is .9em. */
+ margin: 1.8em 5%;
+}
-/*** BIG SECTION HEADERS ***/
-/* Used in license-list.html and proprietary-surveillance.html,
- but could apply elsewhere. */
+/*** BIG SECTION HEADERS ***/
-.big-section { margin-bottom: .5em; }
+/* This is for browsers that don't support inline-block. */
+.big-section {
+ float: left;
+}
.big-section h3 {
display: inline-block;
font-size: 1.7em;
padding: .2em 0;
- margin-right: .3em;
+ margin: 1.2em .3em .5em 0;
color: black;
border-top: .12em solid #e74c3c;
border-bottom: .12em solid #e74c3c;
}
-.big-subsection { margin: 1.5em 0; }
+.big-subsection {
+ margin: 1.5em 0;
+}
.big-subsection h4 {
display: inline;
font-size: 1.5em;
@@ -397,6 +422,7 @@
color: black;
}
+
/*** ANCHOR ***/
/* This is used in pages of lists, such as gnu-linux.faq.html,
@@ -412,24 +438,20 @@
/** WITH BACKGROUND **/
-/* Strip the bottom margins of p and pre (NetSurf leaves the bottom margin
- of the last element outside the parent div). */
-div.highlight-para > p, div.highlight-para > pre,
- div.emph-box > p, div.emph-box > pre,
- .lyrics > p { margin-bottom: 0; }
-
-/* Strip the top margin of the first element to avoid adjusting the padding
- in each particular case. */
-div.highlight-para > *:first-child,
- div.emph-box > *:first-child,
- .lyrics > *:first-child { margin-top: 0; }
+/* NetSurf collapses the bottom border of the last element with that of its
+ parent div, even when the div has a padding or border.
+ To fix this, strip the bottom margin of <p> and <pre>. If another element
+ comes last, it may need a special clause. */
+div.highlight-para p, div.highlight-para pre, div.highlight-para ul,
+ div.emph-box p, div.emph-box pre, div.emph-box ul,
+ .lyrics p { margin-bottom: 0; }
/* .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. */
-div.highlight-para, div.emph-box { padding: 1.2em; }
+div.highlight-para, div.emph-box { padding: .2em 1.2em 1.2em; }
.highlight-para, p.highlight,
p.emph-box, pre.emph-box { padding: .6em 1.2em; }
@@ -437,8 +459,8 @@
.highlight { background-color: #fff1c0; }
.highlight-para, p.highlight { background-color: #fff5d4; }
.highlight-para {
- border-top: .1em solid #f49943;
- border-bottom: .1em solid #f49943;
+ border-top: .1em solid #fc7;
+ border-bottom: .1em solid #fc7;
}
.emph-box, .lyrics {
background-color: #f5f5f5;
@@ -447,14 +469,14 @@
.lyrics {
max-width: 25em;
font-style: italic;
- padding: 2em;
+ padding: 1em 2em 2em;
margin-left: 3%; margin-right: 3%;
}
/** WITH LEFT BORDER **/
-/* .announcement may be followed by blockquote. The only effect of is to
- switch to italic font. The "italic" class can be used instead. */
+/* div.announcement is often followed by <blockquote> which italicizes the
+ text. The "italic" class can be used instead. */
.announcement blockquote { margin: 0; }
.announcement {
@@ -463,19 +485,23 @@
margin: 1.5em 0;
border-left: .5em solid #fc7;
}
-/* Currently, p, h3 and ul are found in div.announcement. Add some padding
- so the border extends out a little bit. */
-.announcement p { margin: 0; padding: .3em 0; }
-.announcement ul { padding-bottom: .3em; }
+/* Currently, <p>, <h3> and <ul> are found in div.announcement. Add some
+ padding so the border extends out a little bit. */
+.announcement p { padding: .4em 0; margin: 0; }
+.announcement ul { padding-bottom: .4em; margin: 0; }
+.announcement ul li { margin-top: .4em; }
.announcement h3 {
font-size: 1.3em;
- padding-top: .1em;
+ padding: .2em 0 .4em;
margin: 0;
}
/** WITH NO BACKGROUND OR LEFT BORDER **/
+/* Note about Free Software Free Society */
+blockquote#fsfs p { padding: .3em 0; }
+
/* the urgent div should be enabled when we have something urgent to
appear on every page - these typically come from johns, peterb or rms
at the fsf */
@@ -492,59 +518,67 @@
}
#urgent a:hover { color: #777; }
-
/* For the note saying the page is a translation. */
-p.trans-disclaimer {
+.trans-disclaimer {
text-align: center;
font-weight: bold;
font-style: italic;
- margin: 1em 0 0;
+ margin-bottom: 0;
+ margin-top: 1.2em;
}
.trans-disclaimer a,
.trans-disclaimer a:visited { color: #333; }
.trans-disclaimer a:hover { color: #777; }
-
/* For outdated translations */
#outdated {
text-align: center;
padding: .4em 3%;
- margin: .3em -3.2%;
+ margin: .8em -3.2%;
color: #a42e2b;
border-bottom: .2em solid #d4d4d4;
}
-#outdated p {
- margin: 0.2em 0;
-}
+#outdated p { margin: 0.2em 0; }
/* For translators notes */
-.translators-notes { clear: left; font-size: .9em; margin-top: 2em; }
+.translators-notes {
+ clear: left;
+ font-size: .9em;
+ margin-top: 2em;
+}
.translators-notes hr { margin-bottom: 1em; }
-.translators-notes ol li { margin: .5em 1.1em 0; }
+.translators-notes ol li { margin: .5em 1.1em; }
-/*** FLOATING INSETS ***/
+/*** FLOATING TEXT + TOC ***/
/** NOTES (div.note p, or blockquote.note p) **/
.note {
width: 44.7em; max-width: 91%;
text-align: center;
- padding: .6em 4%;
+ padding: .8em 4% .8em;
margin: 1.5em auto;
+ background: white;
border: .15em dotted #6092d0;
}
-.note p { padding: .4em 0; margin: 0; }
+.note p {
+ padding: .4em 0 .4em;
+ margin: 0;
+}
-/** TABLES OF CONTENTS **/
+/*** TABLES OF CONTENTS ***/
.summary, .toc {
max-width: 92%;
- padding: 1.2em 4%;
+ padding: 1em 4% 1.5em;
margin: 2.5em auto 1.5em;
background: #f5f5f5;
}
+.summary ul, .toc ul {
+ margin: 0 1.5%;
+}
.summary h3, .toc h3 {
font-size: 1.3em;
margin-top: .5em;
@@ -553,12 +587,6 @@
.summary h4, .toc h4 {
font-size: 1.1em;
}
-/* After floating columns: */
-.toc hr, .summary hr {
- clear: both; visibility: hidden;
- padding-bottom: .5em; margin: 0;
-}
-
.summary { width: 30em; }
.toc { width: 45em; }
@@ -569,7 +597,7 @@
.note, .summary {
clear: right;
float: right;
- padding: 1.2em;
+ padding: 1em 1.2em 1.5em;
width: 20em;
max-width: 40%;
margin: .2em 0 1em 2em;
@@ -581,6 +609,8 @@
-icab-box-shadow: 0 0 0 1em white;
-o-box-shadow: 0 0 0 1em white;
}
+ .summary { padding: 1em 1.2em 1.5em; }
+ .note { padding: .8em 1.2em .8em; }
}
@@ -646,7 +676,7 @@
.stx table th {
background: #fff1c0;
color: black;
- font-weight: bold;
+ font-weight: bold
border: 1px solid #666666;
font-weight: normal;
padding: .7em;
@@ -655,7 +685,7 @@
.listing td a { display: block; }
.listing .top {
border-top: 1px solid #666666;
- text-align: right;
+ text-align: right
padding: 0em 0em 1em 0em;
}
@@ -664,7 +694,7 @@
background-color: transparent;
}
.listing .even {
- background-color: #f5f5f5;
+ background-color: #f0f2f4;
}
.listing .listingCheckbox {
text-align: center;
@@ -722,33 +752,13 @@
/*** SEARCHER ***/
#searcher {
+ display: block;
text-align: right;
font-size: .9em;
+ font-weight: bold;
padding-top: .3em; padding-bottom: .3em;
}
-
-/* Join FSF */
-/* Narrow screens and CSS-1 browsers */
-#join-fsf {
- display: none;
- margin-left: 1em;
-}
-#join-fsf a, #join-fsf a:visited {
- color: white;
- background-color: #4080d0;
- border-color: #4080d0;
- -webkit-transition: all .5s; /* Safari */
- transition: all .5s;
-}
-#join-fsf a:hover {
- color: white;
- background-color: #004caa;
-}
-
address@hidden (min-width: 60em) {
- #join-fsf { display: inline; }
-}
-
+#searcher #join-fsf { margin-left: 1em; }
/*** TRANSLATION LIST ***/
@@ -756,7 +766,7 @@
clear: both;
font-size: .9em;
text-align: left;
-/* border-bottom: .2em solid #d4d4d4; */
+ border-bottom: .2em solid #d4d4d4;
}
#translations p {
line-height: 1.2em;
@@ -784,19 +794,64 @@
color: #777;
}
-
/*** HEADER ***/
-#header:after {
- clear: both; content: ""; display: block;
- height: 0px; visibility: hidden; width: 0px;
-}
#header a { text-decoration: none; }
-/* Narrow screens and CSS-1 browsers */
-#fssbox, #fsf-support { display: none; }
+/** FSF frame **/
+
+#fssbox, #join-fsf { display: none; }
+
+#fsf-frame {
+ float: right;
+ font-size: .9em;
+ text-align: center;
+ line-height: 1.3em;
+ margin: .8em 0;
+}
+#fsf-frame a, #fsf-frame a:visited {
+ font-weight: bold;
+ text-decoration: none;
+}
+#fsf-frame p { margin: 0; }
+
+#join-fsf a, #join-fsf a:visited {
+ color: white;
+ background: #4080d0;
+ border-color: #4080d0;
+ -webkit-transition: all .5s; /* Safari */
+ transition: all .5s;
+}
+#join-fsf a:hover {
+ color: white;
+ background-color: #004caa;
+}
+
+#fssbox {
+ padding: 0;
+ margin-top: 1em;
+}
+#fssbox a, #fssbox a:visited {
+ color: #004caa;
+}
+#fssbox form p { margin-top: .2em; }
+#fssbox input {
+ font-weight: bold;
+}
+#fssbox form input[type="submit"] {
+ color: #004caa;
+ border: .1em solid #4080d0;
+ -webkit-transition: all 2s; /* Safari */
+ transition: all 2s;
+}
+#fssbox form input[type="text"]:focus + input[type="submit"] {
+ color: white;
+ background-color: #4080d0;
+}
+
+
+/** GNU banner **/
-/* GNU banner */
#gnu-banner {
font-size: 2em;
font-family: "FreeSans", sans-serif;
@@ -807,12 +862,15 @@
#gnu-banner img {
height: 1.7em;
vertical-align: bottom;
- position: relative; top: .15em; right: .15em;
+ position: relative; top: .15em;
+ margin-right: .15em;
}
#gnu-banner a { color: #333; }
#gnu-banner a strong { color: #a42e2b; }
/*FSF support */
+#fsf-support { display: none; }
+
#fsf-support {
font-size: .45em;
font-style: italic;
@@ -829,38 +887,6 @@
text-decoration: none;
}
-/* Free Software Supporter */
-#fssbox {
- float: right;
- text-align: center;
- font-size: .9em;
- margin-top: 2.1em;
-}
-#fssbox p { margin: 0; }
-#fssbox form p { margin-top: .4em; }
-#fssbox a { font-weight: bold; }
-#fssbox form input[type="submit"] {
- color: #004caa;
- border: .1em solid #4080d0;
- -webkit-transition: all 2s; /* Safari */
- transition: all 2s;
-}
-#fssbox form input[type="text"]:focus + input[type="submit"] {
- color: white;
- background-color: #4080d0;
-}
-
address@hidden (max-width: 22em) {
- #gnu-banner {
- font-size: 2.5em;
- padding: .35em 0 .5em;
- }
- #gnu-banner img {
- height: 1.3em;
- top: 0;
- }
- #gnu-banner a span { display: none; }
-}
@media (min-width: 40em) {
#fsf-support { display: block; }
#gnu-banner { padding-bottom: .5em; }
@@ -868,6 +894,7 @@
@media (min-width: 60em) {
#gnu-banner { float: left; }
#fssbox { display: block; }
+ #join-fsf { display: inline; }
}
@@ -937,7 +964,7 @@
#mission-statement {
font-size: 0.9em;
- margin-top: 2em; margin-bottom: 2em;
+ margin-top: 2em;
}
#mission-statement blockquote {
font-weight: bold;
@@ -948,31 +975,26 @@
height: 2em;
margin: .3em .5em;
}
-#backtotop {
- font-size: 1.1em;
- margin-top: 1.8em;
-}
/*** FOOTER ***/
-#footer:after {
- display: block; height: 1px;
- content: "";
-}
#footer {
- clear: both;
font-size: .9em;
- padding-top: 1.5em; padding-bottom: 1em;
+ padding-top: 1.5em; padding-bottom: 1.5em;
color: #333;
border-top: 1px solid #ccc;
+ overflow: hidden;
}
#footer p { margin: 0; }
-#footer .unprintable, #footer .translators-credits {
- margin-bottom: .7em;
-}
-#bottom-notes p { margin-bottom: .7em; }
+.unprintable { margin-bottom: .7em; }
+
+#bottom-notes { margin-bottom: 0; }
+
+#generic, #footer p.unprintable { margin-top: .7em; }
+
+.translators-credits { margin: .7em 0 }
/*** EDUCATION ***/
@@ -981,14 +1003,13 @@
.edu-breadcrumb {
font-size: .9em;
font-weight: bold;
- text-align: left;
padding-top: .4em;
margin-top: 0;
color: #333;
}
.edu-breadcrumb a,
.edu-breadcrumb a:visited {
- color: #004caa;
+ color: #334683;
text-decoration: none;
}
.edu-breadcrumb a:hover {
Index: home-ghm-rsd.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/home-ghm-rsd.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- home-ghm-rsd.html 25 Jul 2016 18:33:37 -0000 1.10
+++ home-ghm-rsd.html 1 Aug 2016 22:57:10 -0000 1.11
@@ -9,15 +9,12 @@
<style type="text/css" media="print,screen">
<!--
-#content {
- margin-bottom: 0 !important;
-}
#home h2 {
color: #333;
- margin-bottom: .6em;
+ margin-bottom: .7em;
}
#home h3 {
- margin-bottom: 1em;
+ margin: .6em 0 1em;
}
#gnu-linux {
width: 28em; max-width: 100%;
@@ -47,85 +44,43 @@
color: white;
background: #b2140a;
}
-#mission-statement {
- text-align: justify;
- border-color: #e74c3c;
-}
-#fsfbanner {
- width: 18em;
- max-width: 100%;
- margin: 0 auto;
+#home .back {
+ margin-bottom: 0;
}
-#home #mission-statement img {
- float: none;
- width: 100%;
- height: auto;
- margin: .4em 0;
+.emph-box .back {
+ margin-top: 1em;
}
-.first-column p.back, .translators-notes {
- margin-bottom: 2.3em;
-}
-.emph-box p.back {
- margin: 1em 2% 0;
+.emph-box {
+ margin: 2.3em 0 0;
}
.emph-box.white {
- margin: 2.3em 0;
background: white;
}
#Flashes img {
height: 1em;
- margin: 0;
+ margin-left: .5em;
position: relative; top: .1em;
}
-#blurb {
- margin: .5em 0 1em;
-}
#blurb h4 {
- font-size: 1.5em;
+ font-size: 1.4em;
+ margin: .8em 0 1em;
}
#blurb img {
margin-right: .5em;
}
-#mission-statement, #blurb {
- border-radius: .4em;
- -moz-border-radius: .4em;
- -khtml-border-radius: .4em;
- -webkit-border-radius: .4em;
- -opera-border-radius: .4em;
-}
-#content #backtotop {
- margin-bottom: 2.3em;
-}
-#home-footer {
- font-size: .9em;
- padding: 1.5em 3% 1.7em;
- color: #333;
-}
-#home-footer p {
- margin: 0;
-}
-#home-footer div.unprintable,
- #home-footer .translators-credits {
- margin-bottom: .7em;
-}
-
-
@media (min-width: 62em) {
.first-column {
- width: 68%;
+ width: 60%;
float: left;
}
.second-column {
- width: 29%;
+ width: 37%;
float: right;
}
}
-->
<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
<!--
-#blurb img {
- margin-left: .5em;
-}
@media (min-width: 62em) {
.first-column {
float: right;
@@ -137,7 +92,6 @@
-->
<!--#endif -->
</style>
-
<!--#include virtual="/server/staging/ghm2016/fs-gang-definitions.html" -->
<!--#include virtual="/po/home.translist" -->
<meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -158,6 +112,7 @@
<div id="home">
<div class="first-column">
+
<h2>What is GNU?</h2>
<p>GNU is an operating system that
@@ -188,34 +143,6 @@
<a
href="https://www.fsf.org/blogs/rms/20140407-geneva-tedx-talk-free-software-free-society";>
the video explanation</a>.</p>
-<div id="mission-statement" class="emph-box">
-<p id="fsfbanner"><a href="http://www.fsf.org";><img
-src="logo-fsf.org.small-transp.png" alt=" [FSF logo] "/></a></p>
-
-<blockquote>
-<p><strong>“Our
-mission is to preserve, protect and promote the freedom to use, study,
-copy, modify, and redistribute computer software, and to defend the
-rights of Free Software users.”</strong></p>
-</blockquote>
-
-<p>The <a href="http://www.fsf.org";>Free Software Foundation</a> is
-the principal organizational sponsor of the GNU Operating System.
-<strong>Support GNU and the FSF</strong> by <a
-href="http://shop.fsf.org/";>buying manuals and gear</a>, <a
-href="https://my.fsf.org/associate/support_freedom?referrer=4052";>
-<strong>joining the FSF</strong></a> as an associate member, or making
-a <strong>donation</strong>, 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>
-
-<p id="sisters">The <a href="http://www.fsf.org/";>FSF</a> 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>
-</div>
-
<h2>What is Free Software?</h2>
<p><strong>Free software means the users have the freedom to run,
@@ -279,22 +206,23 @@
project.</p>
<p class="back"><a href="/gnu/gnu.html">More information</a></p>
-
</div><!-- /first-column -->
-<!-- GNUN MARKER FOR TRANSLATORS' NOTES <div id="footer"> -->
+
<div class="second-column">
-<div id="Flashes" class="emph-box white">
-<h3><a href="http://planet.gnu.org/";>Planet GNU</a>
+<div class="emph-box white">
+<h3 id="Flashes"><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></h3>
+
<!--#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>
-<div id="Action" class="emph-box white">
+<div id="Action" class="emph-box">
<h3>Take Action</h3>
+
<ul>
<li><strong><a href="http://www.fsf.org/campaigns";>Support current FSF
campaigns</a></strong>.</li>
@@ -333,8 +261,7 @@
<p class="back"><a href="/server/takeaction.html">More action items</a></p>
</div>
-<div id="unmaint" class="emph-box white">
-<h3>Help GNU</h3>
+<div class="emph-box white">
<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
@@ -343,7 +270,7 @@
free software replacements for Skype, OpenDWG libraries, and Oracle
Forms.</p>
-<p><strong>Can you take over an <a
+<p id="unmaint"><strong>Can you take over an <a
href="/server/takeaction.html#unmaint">unmaintained GNU
package</a>?</strong>
<span class="gnun-split"></span>
@@ -359,36 +286,22 @@
<a href="/software/powerguru/">powerguru</a><span class="gnun-split"></span>.
See the package web pages for more information.</p>
</div>
-<p class="back" id="backtotop"><a href="#header">BACK TO TOP</a></p>
-</div><!-- /second-column -->
-</div><!-- /home -->
-</div><!-- for id="content", starts in the include above -->
-<div id="fs-gang">
-<div class="img-container">
-<a href="http://www.fsf.org/working-together/gang";>meet the free software
-gang<img src="/graphics/fs-gang.png" alt=" [FS gang] "/></a>
-</div> <!-- /img-container -->
<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> <!-- /fs-gang -->
-<hr class="no-display" />
-<div id="fsf-links">
- <ul>
- <li><a
href="http://directory.fsf.org";>FREE SOFTWARE DIRECTORY</a></li>
- <li><a href="https://h-node.org/";>HARDWARE</a></li>
- <li><a href="/graphics/graphics.html">GNU ART</a></li>
- <li><a href="/people/people.html">GNU's WHO?</a></li>
- <li><a href="/server/sitemap.html">SITE MAP</a></li>
- </ul>
-</div><!-- /fsf-links -->
+</div><!-- /second-column -->
+</div><!-- /home -->
+<div style="clear: both"></div>
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/staging/ghm2016/footer-text.html" -->
+<!--#include virtual="/server/fs-gang.html" -->
-<div id="home-footer">
+<div id="footer">
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
@@ -433,7 +346,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1996-2016 <a
+<p>Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 <a
href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -444,7 +358,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/07/25 18:33:37 $
+$Date: 2016/08/01 22:57:10 $
<!-- timestamp end -->
</p>
</div>
Index: footer-text.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/footer-text.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- footer-text.html 22 Jul 2016 19:50:44 -0000 1.2
+++ footer-text.html 1 Aug 2016 22:57:10 -0000 1.3
@@ -2,13 +2,14 @@
<hr class="no-display" />
<div id="fsf-links">
<ul>
+ <li><a href="http://www.fsf.org/";>FSF</a></li>
<li><a
href="http://directory.fsf.org";>FREE SOFTWARE DIRECTORY</a></li>
<li><a href="https://h-node.org/";>HARDWARE</a></li>
<li><a href="/graphics/graphics.html">GNU ART</a></li>
- <li><a href="/people/people.html">GNU's WHO?</a></li>
+ <li><a href="/people/people.html">GNU'S WHO?</a></li>
<li><a href="/server/sitemap.html">SITE MAP</a></li>
</ul>
-</div>
+</div><!-- /fsf-links -->
<div id="mission-statement">
@@ -31,8 +32,14 @@
href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via
Flattr</a>.</p>
-</div>
+<!--#if expr="$REQUEST_URI = /\/(home|index)/ || $REQUEST_URI = /^\/$/" -->
+<p id="sisters">The <a href="http://www.fsf.org/";>FSF</a> 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>
+<!--#endif -->
-<p id="backtotop"><a href="#header">Back to top</a></p>
+<p id="backtotop"><a href="#header">BACK TO TOP</a></p>
+</div><!-- /mission-statement -->
<!-- end server/footer-text.html -->
Index: body-include-1-rsd.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/body-include-1-rsd.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- body-include-1-rsd.html 19 Jul 2016 16:33:15 -0000 1.5
+++ body-include-1-rsd.html 1 Aug 2016 22:57:10 -0000 1.6
@@ -19,19 +19,19 @@
<div id="searcher">
<form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi">
<div>
- <input name="phrase" id="phrase" type="text" size="21" accesskey="s"
+ <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
value="Why GNU/Linux?" onfocus="this.value=''" />
<input type="submit" value="Search" />
</div>
</form>
- <p id="join-fsf" class="button">
- <a href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
- JOIN THE FSF</a>
- </p>
+ <p id="join-fsf" class="button"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p>
</div><!-- /searcher -->
<!--#if expr="$TRANSLATION_LIST" -->
<!--#echo encoding="none" var="TRANSLATION_LIST" -->
-<!--#else -->
+<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
+<!-- if initial translation list isn't included before banner.html,
+ then the file may use an old boilerplate that contains
+ div#translations in its body, and we mustn't duplicate it here. -->
<!--#include virtual="/server/gnun/initial-translations-list.html" -->
<!--#endif -->
<!-- end of server/body-include-1.html -->
Index: body-include-2-rsd.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/body-include-2-rsd.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- body-include-2-rsd.html 19 Jul 2016 16:33:15 -0000 1.4
+++ body-include-2-rsd.html 1 Aug 2016 22:57:10 -0000 1.5
@@ -8,6 +8,7 @@
</p>
<div id="header">
+<div id="fsf-frame">
<div id="fssbox">
<p><a href="http://www.fsf.org/fss";>Free Software Supporter</a></p>
<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
method="post">
@@ -18,21 +19,20 @@
<input name="_qf_default" type="hidden" value="Edit:cancel" />
</div>
<p>
- <input type="text" id="frmEmail" name="email-Primary" size="21"
maxlength="80"
+ <input type="text" id="frmEmail" name="email-Primary" size="18"
maxlength="80"
value="email address" onfocus="this.value=''"/>
<input type="submit" name="_qf_Edit_next" value="Sign up" />
</p>
</form>
-</div>
+</div><!-- /fssbox -->
+</div><!-- /fsf-frame -->
<div id="gnu-banner">
<a href="/">
- <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] " />
- <strong>GNU</strong> <span>Operating System</span></a>
- <p id="fsf-support">
- Sponsored by the <a href="#mission-statement">Free Software Foundation</a>
- </p>
-</div>
+ <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] "
/><strong>GNU</strong> Operating System</a>
+
+<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>
+</div><!-- /gnu-banner -->
</div><!-- /header -->
<div id="navigation">
Index: fs-gang-definitions.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/fs-gang-definitions.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fs-gang-definitions.html 19 Jul 2016 16:33:15 -0000 1.2
+++ fs-gang-definitions.html 1 Aug 2016 22:57:10 -0000 1.3
@@ -26,15 +26,15 @@
/* screen-specific fs-gang-definitions */
#fs-gang {
clear: both;
- margin: 0; padding: .5em 3%;
- background-color: #b2140a; /* Fallback from gradient */
- background: -moz-linear-gradient(#b2140a, #e74c3c); /* FF 3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,
#aa1000), color-stop(100%, #e74c3c)); /* Safari 4+, Chrome 2+ */
- background: -webkit-linear-gradient(#aa1000, #e74c3c); /* Safari 5.1+,
Chrome 10+ */
- background: -o-linear-gradient(#aa1000, #e74c3c); /* Opera 11.10 */
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#aa1000',
endColorstr='#e74c3c'); /* IE6 & IE7 */
- -ms-filter:
"progid:DXImageTransform.Microsoft.gradient(startColorstr='#aa1000',
endColorstr='#e74c3c')"; /* IE8+ */
- background: linear-gradient(#aa1000, #e74c3c); /* the standard */
+ margin: 0;
+ background-color: #a50606; /* Fallback from gradient */
+ background: -moz-linear-gradient(#910606, #e74c3c); /* FF 3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,
#910606), color-stop(100%, #e74c3c)); /* Safari 4+, Chrome 2+ */
+ background: -webkit-linear-gradient(#910606, #e74c3c); /* Safari 5.1+,
Chrome 10+ */
+ background: -o-linear-gradient(#910606, #e74c3c); /* Opera 11.10 */
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#910606',
endColorstr='#e74c3c'); /* IE6 & IE7 */
+ -ms-filter:
"progid:DXImageTransform.Microsoft.gradient(startColorstr='#910606',
endColorstr='#e74c3c')"; /* IE8+ */
+ background: linear-gradient(#910606, #e74c3c); /* the standard */
}
</style>
- www/server/staging/ghm2016 layout-rsd.css home-...,
Therese Godefroy <=