[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/ghm2016 banner.html layout.c...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/ghm2016 banner.html layout.c... |
|
Date: |
Sat, 25 Jun 2016 15:48:00 +0000 (UTC) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 16/06/25 15:48:00
Modified files:
server/staging/ghm2016: banner.html layout.css
Added files:
server/staging/ghm2016: body-include-2.html
Log message:
#join-fsf after #fssbox.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/banner.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/layout.css?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/body-include-2.html?cvsroot=www&rev=1.6
Patches:
Index: banner.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/banner.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- banner.html 21 Jun 2016 19:21:02 -0000 1.2
+++ banner.html 25 Jun 2016 15:48:00 -0000 1.3
@@ -4,6 +4,6 @@
<body>
<div class="inner">
<!--#include virtual="/server/body-include-1.html" -->
-<!--#include virtual="/server/body-include-2.html" -->
+<!--#include virtual="/server/staging/ghm2016/body-include-2.html" -->
<div id="content">
<!-- end of server/banner.html -->
Index: layout.css
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/layout.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- layout.css 23 Jun 2016 20:06:06 -0000 1.4
+++ layout.css 25 Jun 2016 15:48:00 -0000 1.5
@@ -371,9 +371,12 @@
.back { margin: 1.5em 2% 1em; }
#backtotop {
font-size: 1.1em; /* In #mission-statement, font-size is .9em. */
- margin: 1.8em 2%;
+ margin: 1.8em 5%;
+}
+#backtotop a {
+ padding: .3em .5em;
+ background: #fff1c0;
}
-
/*** BIG SECTION HEADERS ***/
@@ -815,7 +818,7 @@
float: right;
line-height: 1.3em;
font-size: .9em;
- padding: 1em 0 0;
+ padding: .8em 0 0;
}
#fsf-frame a, #fsf-frame a:visited {
font-weight: bold;
@@ -834,7 +837,7 @@
/* Free Software Supporter */
#fssbox {
display: none;
- padding: 1.2em 0 .8em;
+ padding: 0 0 1em;
}
#fssbox form p { margin-top: .1em; }
@@ -855,18 +858,15 @@
max-width: 41%;
text-align: center;
}
- #fssbox {
- display: block;
- }
+ #fssbox { display: block; }
}
@media (min-width: 62em) {
#fsf-frame {
width: 45%; max-width: 45%;
}
- #join-fsf { float: left; }
+ #join-fsf { float: right; clear: left; }
#fssbox {
- clear: left;
- float: right;
+ float: left;
}
}
Index: body-include-2.html
===================================================================
RCS file: body-include-2.html
diff -N body-include-2.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ body-include-2.html 25 Jun 2016 15:48:00 -0000 1.6
@@ -0,0 +1,117 @@
+<!-- start of server/body-include-2 -->
+
+<p class="c" style="font-size:1.2em; margin: 0; padding: .2em; background:
#ececec;
+ border-top: .2em solid #e74c3c ; border-bottom: .2em solid #e74c3c">
+<span dir="ltr">The <strong><a href="/ghm/upcoming.html">9th HACKERS
+MEETING</a></strong> will be held in Rennes (France)
+from August 18 to 20.</span>
+</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">
+ <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>
+ <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><!-- /fssbox -->
+<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p>
+</div><!-- /fsf-frame -->
+
+<div id="gnu-banner">
+ <a href="/">
+ <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>
+</div><!-- /header -->
+
+
+<div id="navigation">
+ <ul>
+<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
+<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
+<!--#if expr="$REQUEST_URI = /^\/gnu\//" -->
+ <li id="tabAboutGNU" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/gnu/gnu.html">About GNU</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabAboutGNU"><a href="/gnu/gnu.html">About GNU</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/philosophy\//" -->
+ <li id="tabPhilosophy" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/philosophy/philosophy.html">Philosophy</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabPhilosophy"><a
href="/philosophy/philosophy.html">Philosophy</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/licenses\//" -->
+ <li id="tabLicenses" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/licenses/licenses.html">Licenses</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/education\//" -->
+ <li id="tabEducation" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/education/education.html">Education</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabEducation"><a href="/education/education.html">Education</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/software\//" -->
+ <li id="tabSoftware" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/software/software.html">Software</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabSoftware"><a href="/software/software.html">Software</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/(doc|manual)\//" -->
+ <li id="tabDoc" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/doc/doc.html">Documentation</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/help\//" -->
+ <li id="tabHelp" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/help/help.html">Help GNU</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabHelp"><a href="/help/help.html">Help GNU</a></li>
+<!--#endif -->
+ </ul>
+</div><!-- /navigation -->
+
+<!-- end of server/body-include-2 -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/server/staging/ghm2016 banner.html layout.c...,
Therese Godefroy <=