[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 banner.html la...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 banner.html la... |
|
Date: |
Sat, 22 Aug 2015 20:47:33 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 15/08/22 20:47:32
Modified files:
server/staging/nav-bar/test9: banner.html layout7.css
body-include-2.html
Log message:
Add a selector for css-unaware browsers (Ineiev on www-discuss).
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/banner.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.75&r2=1.76
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.18&r2=1.19
Patches:
Index: banner.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/banner.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- banner.html 21 Aug 2015 18:43:40 -0000 1.3
+++ banner.html 22 Aug 2015 20:47:32 -0000 1.4
@@ -3,7 +3,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/combo.css" media="screen" />
<link rel="stylesheet" href="/mini.css" media="handheld" />
-<link rel="stylesheet" href="/layout.min.css" media="screen" />
+<link rel="stylesheet" href="layout7.css" media="screen" />
<link rel="stylesheet" href="/print.min.css" media="print" />
<!-- end of head-include-2.html -->
</head>
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- layout7.css 17 May 2014 22:12:45 -0000 1.75
+++ layout7.css 22 Aug 2015 20:47:32 -0000 1.76
@@ -1,8 +1,8 @@
-/*
+/*!
layout.css -- css stylesheet used on www.gnu.org
Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011,
- 2013, 2014 Free Software Foundation
+ 2013, 2014, 2015 Free Software Foundation
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -18,9 +18,19 @@
included in all copies or substantial portions of the Software.
*/
-/* NOTE: Changes to this file will affect the entire site, often in
-unexpected ways. Please mail patches to address@hidden rather
-than commit changes directly. */
+/*
+ NOTE: Changes to this file will affect the entire site, often in
+ unexpected ways. Please mail patches to address@hidden rather
+ than commit changes directly.
+
+ NOTE: After modifying this file, please generate the corresponding minified
+ version, otherwise the changes won't be visible.
+
+ To generate the minified version of this file, we currently use a free
+ program called YUI Compressor and run this command:
+
+ yuicompressor layout.css > layout.min.css
+*/
/*** COLORS ***/
@@ -130,18 +140,7 @@
text-decoration: none;
color: #000;
}
-html {
- background: #e7e9eb;
- /* Source: http://www.impressivewebs.com/css3-linear-gradient-syntax/ */
-/* background: -moz-linear-gradient(#5b6a96, #c9cccf); /* FF 3.6+ */
-/* background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #5b6a96), color-stop(100%, #c9cccf)); /* Safari 4+, Chrome 2+ */
-/* background: -webkit-linear-gradient(#5b6a96, #c9cccf); /* Safari 5.1+,
Chrome 10+ */
-/* background: -o-linear-gradient(#5b6a96, #c9cccf); /* Opera 11.10 */
-/* filter:
progid:DXImageTransform.Microsoft.gradient(startColorstr='#5b6a96',
endColorstr='#c9cccf'); /* IE6 & IE7 */
-/* -ms-filter:
"progid:DXImageTransform.Microsoft.gradient(startColorstr='#5b6a96',
endColorstr='#c9cccf')"; /* IE8+ */
-/* background: linear-gradient(#5b6a96, #c9cccf); /* the standard */
-/* background-attachment: fixed;*/
-}
+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
@@ -201,7 +200,7 @@
.inline-list li { display: inline }
.netscape4 { display: none !important; }
-
+.hidden { visibility: hidden; }
/*** TOP OF THE PAGE ***/
@@ -214,7 +213,11 @@
margin: 0;
}
#toplinks a, #toplinks a:visited {
+ white-space: nowrap;
+ /* the next line is a workaround for Midori 0.5.8 */
+ display: inline-block;
color: #404040; text-decoration: none;
+ margin-right: 1em;
}
#toplinks a:hover { color: #777; }
@@ -368,11 +371,11 @@
-khtml-border-radius: 1em;
-webkit-border-radius: 1em;
-opera-border-radius: 1em;
- box-shadow: .15em .15em #171d33;
- -moz-box-shadow: .15em .15em #171d33;
- -webkit-box-shadow: .15em .15em #171d33;
- -icab-box-shadow: .15em .15em #171d33;
- -o-box-shadow: .15em .15em #171d33;
+ box-shadow: 0 .15em #171d33;
+ -moz-box-shadow: 0 .15em #171d33;
+ -webkit-box-shadow: 0 .15em #171d33;
+ -icab-box-shadow: 0 .15em #171d33;
+ -o-box-shadow: 0 .15em #171d33;
}
#fssbox {
@@ -410,11 +413,11 @@
-khtml-border-radius: 1em;
-webkit-border-radius: 1em;
-opera-border-radius: 1em;
- box-shadow: .15em .15em #171d33;
- -moz-box-shadow: .15em .15em #171d33;
- -webkit-box-shadow: .15em .15em #171d33;
- -icab-box-shadow: .15em .15em #171d33;
- -o-box-shadow: .15em .15em #171d33;
+ box-shadow: 0 .15em #171d33;
+ -moz-box-shadow: 0 .15em #171d33;
+ -webkit-box-shadow: 0 .15em #171d33;
+ -icab-box-shadow: 0 .15em #171d33;
+ -o-box-shadow: 0 .15em #171d33;
}
#fssbox input[type="text"]:focus {
color: #333;
@@ -429,6 +432,11 @@
#fsf-frame a:hover { color: #777; }
/* For "normal" pages */
+
address@hidden (max-width: 40em) {
+ #gnu-banner { clear: both }
+}
+
#gnu-banner {
font-size: 1.8em;
font-weight: bold;
@@ -476,6 +484,17 @@
cursor:pointer;
}
+/*** PROMOTIONAL BANNER ***/
+
+.promo-banner {
+ background-position: 99% 9%;
+ background-color: #ccc;
+ background-repeat: no-repeat;
+ font-size: large;
+ overflow: hidden;
+ padding: 1em 6em 0.25em 6em; /* size-review */
+}
+
/*** NAVIGATION BAR ***/
@@ -657,17 +676,25 @@
clear: both; content: ""; display: block;
height: 0px; visibility: hidden; width: 0px;
}
+
#home .first-column {
- clear: left;
- width: 56.1%;
+ width: 60%;
float: left;
- margin-bottom: 1em; margin-top: 0;
}
#home .second-column {
- width: 42.1%;
+ width: 38%;
float: right;
- margin-bottom: 1em;
}
address@hidden (max-width: 40em) {
+ #home .first-column, #home .second-column {
+ float: none;
+ width: 100%;
+ }
+}
+#home .first-column, #home .second-column {
+ margin-bottom: 2em; margin-top: 0;
+}
+
#home h2 {
text-shadow: none;
margin-bottom: .6em;
@@ -679,11 +706,11 @@
text-align: center;
font-weight: bold;
margin-top: .7em; margin-bottom: .8em;
- box-shadow: .15em .15em #171d33;
- -moz-box-shadow: .15em .15em #171d33;
- -webkit-box-shadow: .15em .15em #171d33;
- -icab-box-shadow: .15em .15em #171d33;
- -o-box-shadow: .15em .15em #171d33;
+ box-shadow: 0 .15em #171d33;
+ -moz-box-shadow: 0 .15em #171d33;
+ -webkit-box-shadow: 0 .15em #171d33;
+ -icab-box-shadow: 0 .15em #171d33;
+ -o-box-shadow: 0 .15em #171d33;
border-radius: 1em;
-moz-border-radius: 1em;
-khtml-border-radius: 1em;
@@ -866,6 +893,9 @@
list-style-type: none;
padding: 0;
}
+#edu-navigation li.current {
+ border-bottom: 4px solid #971611;
+}
#edu-navigation li a, #edu-navigation li a:visited {
padding: .3em .45em .35em .45em;
color: #222; text-decoration: none;
@@ -1105,4 +1135,3 @@
.pad { margin-bottom: 1em; }
.pad td { padding-left: 1em; padding-right: 1em; }
div.spacer { height: .1em; width: 100%; background-color: transparent; }
-
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- body-include-2.html 21 Aug 2015 18:43:40 -0000 1.18
+++ body-include-2.html 22 Aug 2015 20:47:32 -0000 1.19
@@ -33,38 +33,75 @@
<div id="navigation">
<ul>
-<!--#if expr="${TAGS} = /gnu/" -->
- <li id="tabAboutGNU" class="active"><a
href="/gnu/gnu.html">About GNU</a></li>
+<!--#set var="MARK_START" value=" <span class='hidden'>=</span> " -->
+<!--#set var="MARK_END" value=" <span class='hidden'>=</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="${TAGS} = /philo/" -->
- <li id="tabPhilosophy" class="active"><a
href="/philosophy/philosophy.html">Philosophy</a></li>
+<!--#if expr="$REQUEST_URI = /test9\/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="${TAGS} = /licenses/" -->
- <li id="tabLicenses" class="active"><a
href="/licenses/licenses.html">Licenses</a></li>
+<!--#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="${TAGS} = /education/" -->
- <li id="tabEducation" class="active"><a
href="/education/education.html">Education</a></li>
+<!--#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="${TAGS} = /software/" -->
- <li id="tabSoftware" class="active"><a
href="/software/software.html">Software</a></li>
+<!--#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="${TAGS} = /doc/" -->
- <li id="tabDoc" class="active"><a href="/doc/doc.html">Documentation</a></li>
+<!--#if expr="$REQUEST_URI = /^\/doc(\/|$)/" -->
+ <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="${TAG} = /help/" -->
- <li id="tabHelp" class="active"><a
href="/help/help.html">Help GNU</a></li>
+<!--#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 -->
@@ -72,3 +109,37 @@
</div><!-- /navigation -->
<!-- end of server/body-include-2 -->
+<div id="content">
+<!-- end of server/banner.html -->
+<div id="education-content">
+
+<!-- begin philosophy/philosophy-menu.html -->
+
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<!--#if expr="${TAG} = /intro/" -->
+ <li class="active"><a
href="/philosophy/philosophy.html">Introduction</a></li>
+<!--#else -->
+ <li><a href="/philosophy/philosophy.html">Introduction</a></li>
+<!--#endif -->
+ <li><a href="http://audio-video.gnu.org/";>Audio and video</a></li>
+<!--#if expr="${TAG} = /essays/" -->
+<li class="active"><a href="/philosophy/essays-and-articles.html">Essays and
articles</a></li>
+<!--#else -->
+<li><a href="/philosophy/essays-and-articles.html">Essays and articles</a></li>
+<!--#endif -->
+<!--#if expr="${TAG} = /speeches/" -->
+ <li class="active"><a
href="/philosophy/speeches-and-interview.html">Speeches and interviews</a></li>
+<!--#else -->
+ <li><a href="/philosophy/speeches-and-interview.html">Speeches and
interviews</a></li>
+<!--#endif -->
+<!--#if expr="${TAG} = /other-ideas/" -->
+ <li class="active"><a href="/philosophy/third-party-ideas.html">Third
party ideas</a></li>
+<!--#else -->
+ <li><a href="/philosophy/third-party-ideas.html">Third party
ideas</a></li>
+<!--#endif -->
+ <li><a href="/server/sitemap.html#directory-philosophy">All philosophy
articles</a></li>
+</ul>
+
+</div><!-- /navigation -->
+<!-- end of server/body-include-2 -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/server/staging/nav-bar/test9 banner.html la...,
Therese Godefroy <=