[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 layout7.css st...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 layout7.css st... |
|
Date: |
Sun, 11 Oct 2015 20:34:25 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 15/10/11 20:34:25
Modified files:
server/staging/nav-bar/test9: layout7.css style.rtl.css
edu-software-tuxpaint.html
edu-software-gcompris.html
edu-cases-india-irimpanam.html
edu-cases-india-ambedkar.html
Log message:
Define .portrait and .landscape with different transition widths.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.108&r2=1.109
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/style.rtl.css?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gcompris.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-cases-india-irimpanam.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-cases-india-ambedkar.html?cvsroot=www&r1=1.19&r2=1.20
Patches:
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- layout7.css 11 Oct 2015 12:26:40 -0000 1.108
+++ layout7.css 11 Oct 2015 20:34:23 -0000 1.109
@@ -186,7 +186,6 @@
#content ul#edu-navigation {
margin-left: -3.2%; margin-right: -3.2%;
}
-
@media (min-width: 60em) {
#content { padding-left: 10%; padding-right: 10%; }
#content ul#edu-navigation {
@@ -194,7 +193,6 @@
}
}
-
/* Backgrounds */
#searcher, #edu-navigation, #fsf-links {
@@ -577,16 +575,19 @@
/*** IMAGES ***/
-/* For wide rectangular images */
-#content .photo {
- float: right;
- width: 27em; max-width: 100%;
+/* For photo-like images */
+#content .portrait, #content .landscape {
+ float: right; max-width: 100%;
margin: .3em 0 1em 1.5em;
}
-#content .photo img { width: 100%; }
-
address@hidden (max-width: 50em) {
- #content .photo { float: none; margin: auto; }
+.portrait img, .landscape img { width: 100%; }
+.portrait { width: 22em; }
address@hidden (max-width: 46em) {
+ #content .portrait { float: none; margin: auto; }
+}
+.landscape { width: 27em; }
address@hidden (max-width: 51em) {
+ #content .landscape { float: none; margin: auto; }
}
/* Still used in /s/cgicc/. */
Index: style.rtl.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/style.rtl.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- style.rtl.css 8 Oct 2015 17:42:44 -0000 1.7
+++ style.rtl.css 11 Oct 2015 20:34:23 -0000 1.8
@@ -54,19 +54,20 @@
border-left: 0;
border-right: .5em solid #b9bcbf;
}
-#content .note, #content div.summary, #content div.photo {
+#content .note, #content .summary,
+ #content .portrait, #content .landscape {
clear: left;
float: left;
margin: .3em 1.5em 1em 0;
}
address@hidden (max-width: 55em) {
- #content .note { float: none; margin: auto; }
- #content div.summary {
address@hidden (max-width: 46em) {
+ #content .note, #content .portrait { float: none; margin: auto; }
+ #content .summary {
float: none; max-width: 25em;
margin: auto; margin-top: 2.5em;
}
}
address@hidden (max-width: 62em) {
- #content .photo { float: none; margin: auto; }
address@hidden (max-width: 51em) {
+ #content .landscape { float: none; margin: auto; }
}
Index: edu-software-tuxpaint.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- edu-software-tuxpaint.html 9 Oct 2015 12:05:02 -0000 1.19
+++ edu-software-tuxpaint.html 11 Oct 2015 20:34:23 -0000 1.20
@@ -58,7 +58,7 @@
<h3>Description</h3>
-<div class="photo">
+<div class="landscape">
<!-- GNUN: localize URL /education/misc/tuxpaint-start-sm.png,
/education/misc/tuxpaint-start.png -->
@@ -102,7 +102,7 @@
<h3>Who's Using It and How</h3>
-<div class="photo">
+<div class="landscape">
<a href="/education/misc/tuxpaint-stamps.jpg">
<img src="/education/misc/tuxpaint-stamps-sm.jpg"
@@ -247,17 +247,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/09 12:05:02 $
+$Date: 2015/10/11 20:34:23 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software-gcompris.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-gcompris.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- edu-software-gcompris.html 11 Oct 2015 12:26:41 -0000 1.20
+++ edu-software-gcompris.html 11 Oct 2015 20:34:24 -0000 1.21
@@ -6,13 +6,6 @@
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/education/po/edu-software-gcompris.translist" -->
-<style type="text/css" media="screen,print">
-<!--
address@hidden (max-width: 50em) {
- #content div.photo { margin-top: 1.6em; }
-}
--->
-</style>
<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
<div id="education-content">
@@ -47,7 +40,7 @@
<h3>Description</h3>
-<div class="photo">
+<div class="landscape">
<a href="/education/misc/gcompris.jpg">
<img src="/education/misc/gcompris-sm.jpg"
@@ -160,17 +153,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/11 12:26:41 $
+$Date: 2015/10/11 20:34:24 $
<!-- timestamp end -->
</p>
</div>
Index: edu-cases-india-irimpanam.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-cases-india-irimpanam.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- edu-cases-india-irimpanam.html 7 Oct 2015 10:55:29 -0000 1.18
+++ edu-cases-india-irimpanam.html 11 Oct 2015 20:34:24 -0000 1.19
@@ -77,7 +77,7 @@
started in 2001, involved several thousand schools in Kerala and in 2006
it switched completely to Free Software.</p>
-<div class="photo">
+<div class="landscape">
<a href="/education/misc/irimpanam-school.jpg">
<img src="/education/misc/irimpanam-school-sm.jpg"
@@ -85,7 +85,7 @@
<p class="c">Students at a Free Software event organized by SSK VHSS
Irimpanam.</p>
-</div> <!-- /photo -->
+</div> <!-- /landscape -->
<p>Training courses for teachers were implemented by the government to
teach us the basics of the new Free Operating System and how to
@@ -141,7 +141,7 @@
<h3>Results</h3>
-<div class="photo">
+<div class="landscape">
<a href="/education/misc/tuxpaint.jpg">
<img src="/education/misc/tuxpaint-sm.jpg"
@@ -151,7 +151,7 @@
<p class="c"><a href="/education/misc/adeenia.ogg">Listen</a> to a student
pronounce the name of the Adeenia flower in Malayalam.</p>
-</div> <!-- /photo -->
+</div> <!-- /landscape -->
<p>Education in the State of Kerala has become "IT-enabled", meaning
that students are getting first hand technology knowledge while learning
@@ -252,17 +252,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/07 10:55:29 $
+$Date: 2015/10/11 20:34:24 $
<!-- timestamp end -->
</p>
</div>
Index: edu-cases-india-ambedkar.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-cases-india-ambedkar.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- edu-cases-india-ambedkar.html 7 Oct 2015 10:55:29 -0000 1.19
+++ edu-cases-india-ambedkar.html 11 Oct 2015 20:34:24 -0000 1.20
@@ -72,7 +72,7 @@
<h3>How We Did It</h3>
-<div class="photo" style="width:22em">
+<div class="portrait">
<a href="/education/misc/ambedkar.jpg">
<img src="/education/misc/ambedkar-sm.jpg" alt="Image of a student handing
@@ -163,17 +163,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/07 10:55:29 $
+$Date: 2015/10/11 20:34:24 $
<!-- timestamp end -->
</p>
</div>