>From d985557b662c7dd3eaade1c9ef0d29a35218ae77 Mon Sep 17 00:00:00 2001 From: Patrick McCarty
Date: Tue, 30 Sep 2008 21:48:08 -0700 Subject: [PATCH] Docs: Update stylesheets and index pages Signed-off-by: Patrick McCarty --- Documentation/de/index.html.in | 44 +++++------- Documentation/devel.html.in | 33 ++++----- Documentation/es/index.html.in | 43 +++++------ Documentation/fr/index.html.in | 45 +++++------- Documentation/index.html.in | 40 +++++------ Documentation/lilypond-ie-fixes.css | 40 ++++++++++- Documentation/lilypond-mccarty.css | 133 ++++++++++++++++++++--------------- Documentation/lilypond.css | 12 +++ 8 files changed, 217 insertions(+), 173 deletions(-) diff --git a/Documentation/de/index.html.in b/Documentation/de/index.html.in index 7254368..8faf9f8 100644 --- a/Documentation/de/index.html.in +++ b/Documentation/de/index.html.in @@ -16,11 +16,11 @@ -
Version @TOPLEVEL_VERSION@
@@ -34,7 +34,7 @@
@@ -43,96 +43,90 @@
Handbuch zum Lernen (LM)
(auf einer großen Seite ~ 1.5 MB,
als PDF)
- (Für den ersten Anfang.) + (Für den ersten Anfang.) (Übersetzung von musikalischen Begriffen aus dem Englischen in andere Sprachen.) + (Übersetzung von musikalischen Begriffen aus dem Englischen in andere Sprachen.) |
|
|||||||||||||||||||||||||||||
-
|
-
|
|||||||||||||||||||||||||||||
-
|
-
|
|||||||||||||||||||||||||||||
-
|
-
|
diff --git a/Documentation/devel.html.in b/Documentation/devel.html.in
index daab2f9..703a3d7 100644
--- a/Documentation/devel.html.in
+++ b/Documentation/devel.html.in
@@ -15,11 +15,12 @@
-
@@ -36,43 +37,41 @@
href="../input/regression/collated-files.html">Regression
tests (~ 5 Mb, in PDF)
- (general tests) + (general tests) (musicxml2ly tests) + (musicxml2ly tests) |
|
|||||||
-
|
-
|
@@ -36,99 +37,93 @@
Manual de aprendizaje (también en una sola página ~ 1.5 Mb, o en PDF) - (comience por aquí) + (comience por aquí) (también en una sola página ~ 500 Kb, o en PDF) - (para usuarios de habla no inglesa) + (para usuarios de habla no inglesa) |
||||||||
-
|
-
|
|||||||
-
|
-
|
|||||||
-
|
-
|
@@ -39,26 +39,25 @@
(partiellement traduit, aussi en page unique en anglais ~ 1,5 Mo, ou au format PDF) - — commencer ici + — commencer ici (aussi en page unique ~ 500 ko, ou au format PDF) - — vocabulaire théorique de la musique + — vocabulaire théorique de la musique |
|
|||||||
-
|
-
|
|||||||
-
|
-
|
|||||||
-
|
-
|
|||||||
-
|
diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index c5c6af4..99ec9d8 100644
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -16,10 +16,10 @@
@@ -37,101 +37,95 @@
href="user/lilypond-learning/index.html">Learning Manual
(in one big page ~ 1.5 MB,
in PDF)
- (start here) + (start here) (for non-English users) + (for non-English users) |
|
-
|
-
|
-
|
-
|
-
|
-
|
diff --git a/Documentation/lilypond-ie-fixes.css b/Documentation/lilypond-ie-fixes.css
index 6587e18..9bdc69a 100644
--- a/Documentation/lilypond-ie-fixes.css
+++ b/Documentation/lilypond-ie-fixes.css
@@ -1,10 +1,12 @@
/***********************************************************/
-/* TOC SIDEBAR */
+/* BASE STYLES */
/***********************************************************/
+
body {
height: 100%;
font-size: 100%;
min-height: 0;
+ text-align: center;
}
/***********************************************************/
@@ -18,6 +20,19 @@ div#main {
overflow-x: auto;
}
+table.menu {
+ margin-left: 1em;
+}
+
+.nav_table {
+ width: 100%;
+}
+
+blockquote {
+ width: 100%;
+ margin: 1em 1%;
+}
+
/***********************************************************/
/* TOC SIDEBAR */
/***********************************************************/
@@ -26,3 +41,26 @@ div#tocframe {
height: 100%;
width: 27%;
}
+
+/***********************************************************/
+/* NAVIGATION */
+/***********************************************************/
+
+table#navigation {
+ margin: 1em auto;
+}
+
+
+/***********************************************************/
+/* IE CENTERING FIXES */
+/***********************************************************/
+
+table#navigation, div#tocframe, div#main,
+p, .footer, #languages {
+ text-align: left;
+}
+
+div.subheader p {
+ text-align: center;
+}
+
diff --git a/Documentation/lilypond-mccarty.css b/Documentation/lilypond-mccarty.css
index b960c40..177cf8f 100644
--- a/Documentation/lilypond-mccarty.css
+++ b/Documentation/lilypond-mccarty.css
@@ -21,39 +21,42 @@ body {
/* HEADERS */
/***********************************************************/
-.chapter, .section, .subsection,
+.chapter, .section, .subsection, .subsubsection,
.appendix, .appendixsec, .appendixsubsec,
-.unnumberedsubsubsec, .subsubheading {
- color: #248;
+.unnumbered, .unnumberedsec, .unnumberedsubsubsec,
+.subheading, .subsubheading {
+ line-height: 1.125em;
+ color: #204a87;
border-bottom: 1px dashed black;
- padding-bottom: 0.3em;
- margin-top: 1em;
+ padding-bottom: 0.15em;
+ margin-top: 0.6em;
margin-bottom: 1em;
}
.settitle {
- background-color: #be6;
+ background: #b1d281;
font-size: 2em;
+ line-height: 1.125em;
text-align: center;
margin: 0;
- padding: 0.75em;
- border: 1px solid #7a2;
+ padding: 0.4em 0.5em;
+ border: 1px solid #7b925a;
border-width: 0 0 1px 0;
}
-.chapter {
+.chapter, .appendix, .unnumbered {
font-size: 1.8em;
}
-.section {
+.section, .appendixsec, .unnumberedsec {
font-size: 1.6em;
}
-.subsection {
+.subsection, .appendixsubsec {
font-size: 1.4em;
}
-.unnumberedsubsubsec {
+.subheading, .subsubsection, .unnumberedsubsubsec {
font-size: 1.25em;
}
@@ -62,24 +65,31 @@ body {
font-weight: bold;
}
+.chapheading {
+ text-indent: -999em;
+ height: 0;
+ padding: 0;
+ margin: 0;
+}
+
/***********************************************************/
/* LINKS */
/***********************************************************/
a:link {
- color: #344;
+ color: #3465a4;
}
a:visited {
- color: #850;
+ color: #8f5902;
}
a:active {
- color: #7d1;
+ color: #73d216;
}
a:hover {
- color: #c71;
+ color: #ce5c00;
}
/***********************************************************/
@@ -89,8 +99,8 @@ a:hover {
blockquote {
width: 96%;
padding: 0;
- border: 1px solid #7a2;
- border-left: 5px solid #9c4;
+ border: 1px solid #7b925a;
+ border-left: 5px solid #a3ca6d;
margin: 1em auto;
}
@@ -103,7 +113,7 @@ blockquote blockquote {
border: none;
}
-.verbatim, .example .example {
+.verbatim, .example .example, .lisp {
font-size: 1em;
padding: 1em;
margin: 0;
@@ -114,19 +124,19 @@ blockquote blockquote {
margin: 0;
}
-hr {
+#main hr {
height: 0;
padding: 0;
border: 0;
- margin: 1em 0 0 0;
+ margin: 0;
text-indent: -999em;
}
table.cartouche {
- background: #eee;
+ background: #f5f5dc; /* beige */
width: 85%;
padding: 0 0.5em;
- border: 2px solid #8e3;
+ border: 2px solid #8f5902;
margin: 0 auto 1em;
}
@@ -155,7 +165,12 @@ div#main {
}
div#main li {
- padding-right: 1em;
+ padding: 0 1em 0.5em 0;
+}
+
+div#main ul {
+ margin: 0;
+ padding-left: 3em;
}
h1, h2, h3, h4, p, table, address, dt {
@@ -163,8 +178,14 @@ h1, h2, h3, h4, p, table, address, dt {
padding-right: 1em;
}
+p {
+ margin: 1em 0;
+}
+
#languages {
- padding: 1em;
+ background-color: #f5f5dc; /* beige */
+ padding: 0.5em 1em;
+ border-top: 1px solid #7b925a;
margin: 0;
}
@@ -175,6 +196,14 @@ pre.menu-comment {
margin: 0;
}
+#main .contents li {
+ padding-bottom: 0;
+}
+
+#main .contents > ul {
+ margin-bottom: 1em;
+}
+
/***********************************************************/
/* TOC SIDEBAR */
/***********************************************************/
@@ -188,7 +217,7 @@ div#tocframe {
padding: 0;
margin: 0;
overflow: auto;
- background-color: #eee;
+ background-color: #f5f5dc; /* beige */
z-index: 100;
list-style-type: none;
font-size: 0.83em;
@@ -201,29 +230,12 @@ div#tocframe {
}
}
-/* This is an interesting debate.
- * In div#main, I think links should be
- * underlined, but it would be safe to
- * take text-decoration away from links in
- * div#tocframe. I like the hover underline
- * effect though.
- *
-#tocframe a:link, #tocframe a:visited {
- text-decoration: none;
-}
-
-#tocframe a:hover {
- text-decoration: underline;
-}
- */
-
div#tocframe h4 {
font-size: 1em;
font-weight: normal;
color: #344;
- background-color: #bbb;
+ background-color: #babdb6;
padding: 2px 0 1px 1em;
- border-top: 5px solid #677;
border-bottom: 1px solid #788;
margin: 0;
}
@@ -271,40 +283,44 @@ li.toc_current ul {
background: transparent;
}
-
/***********************************************************/
/* NAVIGATION */
/***********************************************************/
.nav_table {
width: 100%;
- background-color: #bbb;
+ background: #babdb6;
font-size: 0.8em;
padding: 0;
border: 0;
- border-top: 5px solid #677;
border-bottom: 1px solid #788;
margin: 0;
}
+.nav_table tr, .nav_table td, .nav_table a {
+ padding: 0;
+ margin: 0;
+}
+
div.header {
- background-color: #be6;
+ background: #b1d281;
text-align: center;
padding: 0.5em;
+ border-bottom: 1px solid #7b925a;
margin: 0;
height: auto;
}
div.header h1 {
- padding: 0.5em;
+ font-size: 2em;
+ line-height: 1em;
+ padding: 0.25em;
margin: 0;
}
div.subheader {
background-color: #ddd;
padding: 0;
- border-top: 5px solid #899;
- border-bottom: 1px solid #9aa;
margin: 0;
text-align: center;
}
@@ -326,7 +342,7 @@ table#navigation td {
table#navigation ul {
padding-left: 0.5em;
- margin-bottom: 1em;
+ margin: 0;
}
table .title {
@@ -334,13 +350,12 @@ table .title {
}
.footer {
- background-color: #dfa;
- border: 0;
- border-top: 1px solid #8a5;
- border-bottom: 5px solid #ac7;
- padding: 0.4em 0;
+ background: #c6e7b0;
font-size: 0.8em;
text-indent: 1em;
+ border: 0;
+ padding: 0.4em 0;
+ margin: 0;
}
.footer p {
@@ -349,6 +364,10 @@ table .title {
margin: 0 0.25em;
}
+table.menu {
+ margin: 0 0 1em;
+}
+
/***********************************************************/
/* OVERRIDES FOR PRINTING */
/***********************************************************/
diff --git a/Documentation/lilypond.css b/Documentation/lilypond.css
index 1d8542d..3ab0768 100644
--- a/Documentation/lilypond.css
+++ b/Documentation/lilypond.css
@@ -174,6 +174,14 @@ h1.header {
font-size: 220%;
}
+div.subheader {
+ text-align: center;
+}
+
+#navigation {
+ margin: 0 auto;
+}
+
.nav_table {
width: 100%;
background-color: #CCD3CC;
@@ -184,6 +192,10 @@ h1.header {
font-size: 0.8em;
}
+.title {
+ font-weight: bold;
+}
+
.footer {
background-color: #E7EFE3;
padding: 5;
--
1.6.0.2