[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: |
Tue, 2 Aug 2016 18:12:42 +0000 (UTC) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 16/08/02 18:12:42
Modified files:
server/staging/ghm2016: layout-rsd.css home-ghm-rsd.html
education.html edu-resources.html
edu-software.html
Log message:
More fixes; define .edu-note for education, edu-resources &
edu-software.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/layout-rsd.css?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/home-ghm-rsd.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/education.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/edu-resources.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/edu-software.html?cvsroot=www&r1=1.1&r2=1.2
Patches:
Index: layout-rsd.css
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/layout-rsd.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- layout-rsd.css 2 Aug 2016 10:28:43 -0000 1.13
+++ layout-rsd.css 2 Aug 2016 18:12:42 -0000 1.14
@@ -547,15 +547,17 @@
/** NOTES (div.note p, or blockquote.note p) **/
.note {
- width: 44.7em; max-width: 91%;
+ /* Align with .toc */
+ width: 44.8em; max-width: 91%;
text-align: center;
- padding: .8em 4% .8em;
+ padding: .6em 4%;
margin: 1.5em auto;
background: white;
border: .1em solid #6092d0;
}
+/* May contain several <p>'s */
.note p {
- padding: .4em 0 .4em;
+ padding: .4em 0;
margin: 0;
}
@@ -589,7 +591,6 @@
.note, .summary {
clear: right;
float: right;
- padding: 1em 1.2em 1.5em;
width: 20em;
max-width: 40%;
margin: .2em 0 1em 2em;
@@ -602,7 +603,7 @@
-o-box-shadow: 0 0 0 1em white;
}
.summary { padding: 1em 1.2em 1.5em; }
- .note { padding: .8em 1.2em .8em; }
+ .note { padding: .6em 1.2em; }
}
@@ -780,7 +781,7 @@
}
#translations span.original a,
#translations span.original a:visited {
- color: #334683;
+ color: #004caa;
}
#translations a:hover,
#translations span.original a:hover {
@@ -827,6 +828,8 @@
#fssbox a, #fssbox a:visited {
color: #004caa;
}
+#fssbox a:hover { color: #777; }
+
#fssbox form p { margin-top: .2em; }
#fssbox input {
font-weight: bold;
@@ -1002,7 +1005,7 @@
}
.edu-breadcrumb a,
.edu-breadcrumb a:visited {
- color: #334683;
+ color: #004caa;
text-decoration: none;
}
.edu-breadcrumb a:hover {
@@ -1010,7 +1013,7 @@
}
/* Subsections of /education "Case Studies" */
-div.edu-cases {
+.edu-cases {
border-top: 5px ridge #3465a4;
border-bottom: 5px ridge #3465a4;
padding: 1.5em 0;
@@ -1018,11 +1021,21 @@
}
/* make h3 for edu-cases look like h4 for other pages */
-div.edu-cases h3 {
+.edu-cases h3 {
font-size: 1.3em;
margin: 0; margin-bottom: 1em;
}
-div.edu-cases ul, div.edu-cases ol {
+.edu-cases ul, .edu-cases ol {
padding: 0 4%;
}
+/* Note about educational games */
+/* (only the style is defined here) */
+.edu-note p {
+ text-align: center;
+ font-style: italic;
+ padding: .6em 1em;
+ margin: 0;
+ color: #060;
+ border: .1em solid #7c7;
+}
Index: home-ghm-rsd.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/home-ghm-rsd.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- home-ghm-rsd.html 2 Aug 2016 10:26:24 -0000 1.12
+++ home-ghm-rsd.html 2 Aug 2016 18:12:42 -0000 1.13
@@ -63,7 +63,7 @@
}
#blurb h4 {
font-size: 1.4em;
- margin: .8em 0 1em;
+ margin: .65em 0 .9em;
}
#blurb img {
margin-right: .5em;
@@ -358,7 +358,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/08/02 10:26:24 $
+$Date: 2016/08/02 18:12:42 $
<!-- timestamp end -->
</p>
</div>
Index: education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/education.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- education.html 22 Jul 2016 19:50:44 -0000 1.3
+++ education.html 2 Aug 2016 18:12:42 -0000 1.4
@@ -9,27 +9,26 @@
<!--#include virtual="/education/po/education.translist" -->
<style type="text/css" media="screen">
<!--
-#video-container, .note-wrapper {
+#video-container, .edu-note {
width: 40em; max-width: 100%;
margin: 2em auto;
}
#video-container p { text-align: justify; }
#rms-movie { width: 100%; }
-.note-wrapper p.highlight { border: .1em solid #fc7; }
@media (min-width: 48em) {
- .note-wrapper {
+ .edu-note {
float: right;
- width: 28em; max-width: 45%;
- margin: 2.3em 0 2em 1.5em;
+ width: 25em; max-width: 45%;
+ margin: 3.2em 0 2.5em 1.5em;
}
}-->
<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
<!--
@media (min-width: 48em) {
- .note-wrapper {
+ .edu-note {
float: left;
- margin: 2.3em 1.5em 2em 0;
+ margin: 3.4em 1.5em 2.5em 0;
}
}-->
<!--#endif -->
@@ -135,13 +134,13 @@
</p></div> <!-- /.emph-box -->
</div>
-<div class="note-wrapper c"><p class="highlight italic">
+<div class="edu-note"><p>
We are looking for free educational games, or information about free games
that can be used for educational purposes. Contact
<a href="mailto:address@hidden";><address@hidden></a>.
</p></div>
-<h3>In Depth</h3>
+<h3 id="indepth">In Depth</h3>
<ul>
<li>Learn about the <a href="/education/edu-why.html">Reasons Why</a>
educational institutions should use and teach exclusively Free Software.</li>
@@ -194,7 +193,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/07/22 19:50:44 $
+$Date: 2016/08/02 18:12:42 $
<!-- timestamp end -->
</p>
</div>
Index: edu-resources.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/edu-resources.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-resources.html 22 Jul 2016 19:56:02 -0000 1.2
+++ edu-resources.html 2 Aug 2016 18:12:42 -0000 1.3
@@ -5,32 +5,26 @@
- GNU Project - Free Software Foundation</title>
<style type="text/css" media="screen">
<!--
-.note-wrapper {
- width: 40em; max-width: 100%;
- margin: 1.5em auto;
-}
-.note-wrapper p.highlight {
- padding: .5em 3%;
- background: #e4ffcc;
- border: .1em solid #ad9;
+.edu-note {
+ width: 45em; max-width: 100%;
+ margin: 1.5em auto 2em;
}
@media (min-width: 48em) {
- #text-left {
+ .text-left {
float: left; width: 55%;
margin: 0 3% 0 0;
}
- .note-wrapper { width: auto; margin-top: 1.4em; margin-left: 58%; }
+ .edu-note { width: auto; margin: 1.4em 0 1em 58%; }
}
}-->
<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
<!--
@media (min-width: 48em) {
- #text-left {
+ .text-left {
float: right;
margin: 0 0 0 3%;
}
- .note-wrapper { margin-right: 58%; }
- }
+ .edu-note { margin-right: 58%; }
}-->
<!--#endif -->
</style>
@@ -60,13 +54,13 @@
<h3>Educational Free Software</h3>
-<p id="text-left">In our <a href="/education/edu-software.html">Educational
+<p class="text-left">In our <a href="/education/edu-software.html">Educational
Free Software</a> section we present some examples of how free programs
are being used by educational institutions around the world and how they
are putting into practice the four freedoms that Free Software grants to
all users.</p>
-<div class="note-wrapper c"><p class="highlight italic">
+<div class="edu-note"><p>
We are looking for free educational games, or information about free games
that can be used for educational purposes. Contact
<a href="mailto:address@hidden";><address@hidden></a>.
@@ -208,7 +202,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/07/22 19:56:02 $
+$Date: 2016/08/02 18:12:42 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/edu-software.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-software.html 22 Jul 2016 19:50:44 -0000 1.1
+++ edu-software.html 2 Aug 2016 18:12:42 -0000 1.2
@@ -6,17 +6,12 @@
- GNU Project - Free Software Foundation</title>
<style type="text/css" media="screen">
<!--
-.note-wrapper {
- width: 40em; max-width: 100%;
+.edu-note {
+ width: 45em; max-width: 100%;
margin: 1.5em auto;
}
-.note-wrapper p.highlight {
- margin: 0;
- background-color: white;
- border: .2em dotted #e74c3c;
-}
@media (min-width: 48em) {
- .note-wrapper {
+ .edu-note {
float: right;
width: 28em; max-width: 45%;
margin: .2em 0 2.5em 1.5em;
@@ -25,9 +20,9 @@
<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
<!--
@media (min-width: 48em) {
- .note-wrapper {
+ .edu-note {
float: left;
- margin: .3em 1.5em 2em 0;
+ margin: .3em 1.5em 2.5em 0;
}
}-->
<!--#endif -->
@@ -70,7 +65,7 @@
<h3>What you will find in this section</h3>
-<p style="clear:both">
+<p>
These pages do not constitute an exhaustive listing of available
educational free programs. Our aim is to present some examples so as to
illustrate how educational institutions can put into practice and
@@ -114,7 +109,7 @@
education, from pre-elementary school to highly specialized levels,
including university and research.</p>
-<div class="note-wrapper c"><p class="highlight italic">
+<div class="edu-note"><p>
We are looking for free educational games, or information about free games
that can be used for educational purposes. Contact
<a href="mailto:address@hidden";><address@hidden></a>.
@@ -167,7 +162,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/07/22 19:50:44 $
+$Date: 2016/08/02 18:12:42 $
<!-- timestamp end -->
</p>
</div>