CSS: improve colors, deploy via merged style sheets

carlosame · carlosame · commit faa4843fdc1b · 2020-11-01T18:52:11.000+01:00
diff --git a/basic-a.css b/basic-a.css
diff --git a/faq-a.css b/faq-a.css
diff --git a/faq.html b/faq.html
@@ -2,8 +2,7 @@
 <html lang="en">
 <head>
 <title>CSS4J FAQ</title>
-<link href="common.css" rel="stylesheet" type="text/css" />
-<link href="normal.css" rel="stylesheet" type="text/css" title="Normal" />
+<link href="faq-a.css" rel="stylesheet" type="text/css" />
 <script src="js/faq-a.js" type="text/javascript" charset="utf-8"></script>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/index.html b/index.html
@@ -2,8 +2,7 @@
 <html lang="en">
 <head>
 <title>CSS4J Project</title>
-<link href="common.css" rel="stylesheet" type="text/css" />
-<link href="normal.css" rel="stylesheet" type="text/css" title="Normal" />
+<link href="basic-a.css" rel="stylesheet" type="text/css" />
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="icon" href="https://css4j.github.io/favicon.png" type="image/png" />
diff --git a/maven/index.html b/maven/index.html
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<link href="../common.css" rel="stylesheet" type="text/css" />
-<link href="../normal.css" rel="stylesheet" type="text/css" title="Normal" />
+<link href="../basic-a.css" rel="stylesheet" type="text/css" />
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="copyright" content="Carlos Amengual">
 <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/normal.css b/normal.css
@@ -12,14 +12,14 @@ body
 a:link
 {
 	text-decoration: none;
-	color: #2239C9;
+	color: #045dca;
 	cursor: pointer;
 }
 
 a:visited
 {
 	text-decoration: none;
-	color: #3C3496;
+	color: #1f42ab;
 }
 
 a:active
diff --git a/src/build.sh b/src/build.sh
@@ -12,7 +12,7 @@ SITEDIR=${HOME}/www/css4j.github.io
 WORKDIR=$TMP/css4j.github
 FAQJSVER=a
 USAGEJSVER=c
-USAGECSSVER=a
+USAGECSSVER=b
 BASECSSVER=a
 # Work directory
 if [ ! -d $WORKDIR ]
@@ -28,18 +28,18 @@ fi
 #then echo "YUI not found. Exiting."
 #     exit
 #fi
-cat $SRCDIR/copyright-src.js $SRCDIR/framebreak-src.js $SRCDIR/faq-src.js > $WORKDIR/faq-a.js
-cat $SRCDIR/framebreak-src.js $SRCDIR/indexbuilder-src.js > $WORKDIR/usage-a.js
-java -jar $YUICOMP --charset utf-8 ${WORKDIR}/faq-a.js > ${SITEDIR}/js/faq-$FAQJSVER.js
+cat $SRCDIR/copyright-src.js $SRCDIR/framebreak-src.js $SRCDIR/faq-src.js > ${WORKDIR}/faq-a.js
+cat $SRCDIR/framebreak-src.js $SRCDIR/indexbuilder-src.js > ${WORKDIR}/usage-a.js
+java -jar $YUICOMP --charset utf-8 ${WORKDIR}/faq-a.js > ${SITEDIR}/js/faq-${FAQJSVER}.js
 java -jar $YUICOMP --charset utf-8 ${WORKDIR}/usage-a.js > ${WORKDIR}/usage-compressed.js
-cat $SRCDIR/copyright-prism-src.js ${WORKDIR}/usage-compressed.js ${PRISM}.js > ${SITEDIR}/js/usage-$USAGEJSVER.js
+cat $SRCDIR/copyright-prism-src.js ${WORKDIR}/usage-compressed.js ${PRISM}.js > ${SITEDIR}/js/usage-${USAGEJSVER}.js
 # CSS
-#cat $SITEDIR/common.css $SITEDIR/normal.css > $TMP/basic-a.css
-#cat $SITEDIR/common.css $SITEDIR/normal.css $CSSSRCDIR/faq.css > $TMP/faq-a.css
+cat ${SITEDIR}/common.css ${SITEDIR}/normal.css > ${WORKDIR}/basic-a.css
+cat ${SITEDIR}/common.css ${SITEDIR}/normal.css ${CSSSRCDIR}/faq.css > ${WORKDIR}/faq-a.css
 cat ${PRISM}.css ${SITEDIR}/common.css ${SITEDIR}/normal.css ${CSSSRCDIR}/usage.css > ${WORKDIR}/usage-a.css
-#java -jar $YUICOMP $WORKDIR/basic-a.css -o $SITEDIR/basic-$BASECSSVER.css --charset utf-8
-#java -jar $YUICOMP $WORKDIR/faq-a.css -o $SITEDIR/faq-$BASECSSVER.css --charset utf-8
-java -jar $YUICOMP ${WORKDIR}/usage-a.css --charset utf-8 > $SITEDIR/usage-${USAGECSSVER}.css
+java -jar $YUICOMP ${WORKDIR}/basic-a.css --charset utf-8 > ${SITEDIR}/basic-${BASECSSVER}.css
+java -jar $YUICOMP ${WORKDIR}/faq-a.css --charset utf-8 > ${SITEDIR}/faq-${BASECSSVER}.css
+java -jar $YUICOMP ${WORKDIR}/usage-a.css --charset utf-8 > ${SITEDIR}/usage-${USAGECSSVER}.css
 # Remove work directory
 if [ -r $WORKDIR ]
 then rm -r $WORKDIR
diff --git a/src/faq.css b/src/faq.css
@@ -1,4 +1,4 @@
 div.faqlist h4
 {
-	color: #2C3496;
+	color: #3d3f62;
 }
diff --git a/usage-b.css b/usage-b.css
diff --git a/usage.html b/usage.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="copyright" content="Carlos Amengual">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link href="usage-a.css" rel="stylesheet" type="text/css" />
+<link href="usage-b.css" rel="stylesheet" type="text/css" />
 <title>CSS4J Quick Start User Guide</title>
 <script src="js/usage-c.js" type="text/javascript" charset="utf-8"></script>
 </head>

Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,14 @@ body`
`12`	`12`	`a:link`
`13`	`13`	`{`
`14`	`14`	`text-decoration: none;`
`15`		`- color: #2239C9;`
	`15`	`+ color: #045dca;`
`16`	`16`	`cursor: pointer;`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`a:visited`
`20`	`20`	`{`
`21`	`21`	`text-decoration: none;`
`22`		`- color: #3C3496;`
	`22`	`+ color: #1f42ab;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`a:active`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`div.faqlist h4`
`2`	`2`	`{`
`3`		`- color: #2C3496;`
	`3`	`+ color: #3d3f62;`
`4`	`4`	`}`