summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile16
-rw-r--r--script/lib/prism.js (renamed from script/prism.js)0
-rw-r--r--script/lib/prism_bash.js (renamed from script/prism_bash.js)0
-rw-r--r--style/lib/prism.css (renamed from style/prism.css)2
-rw-r--r--style/style.less2
5 files changed, 13 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index b2d0adc..c3f5d79 100644
--- a/Makefile
+++ b/Makefile
@@ -21,15 +21,20 @@ all: script/ousia.js style/style.css $(TARGET_XML) $(TARGET_HTML)
# On Fedora you can install lessc using the following commands (as root):
# yum install nodejs npm
# npm install -g less less-plugin-clean-css
-style/style.css: style/*.less
- lessc style/style.less style/style.css --clean-css="--s1"
+style/style.css: style/*.less style/lib/*.css
+ lessc \
+ style/style.less \
+ style/style.css --clean-css="--s1"
# Build the JavaScript using uglifyjs
# On Fedora you can install uglifyjs using the following commands (as root):
# yum install nodejs npm
# npm install -g uglifyjs
-script/ousia.js: script/prism.js script/prism_bash.js script/highlight.js
- uglifyjs script/prism.js script/prism_bash.js script/highlight.js > script/ousia.js
+script/ousia.js: script/lib/*.js
+ uglifyjs \
+ script/lib/prism.js \
+ script/lib/prism_bash.js \
+ script/highlight.js > script/ousia.js
# Compile all osml files to xml
%.xml: %.osml ontology/*.osml
@@ -42,6 +47,7 @@ script/ousia.js: script/prism.js script/prism_bash.js script/highlight.js
# Clean script, remove all target files
clean:
rm -f style/*.css
+ rm -f script/ousia.js
rm -f $(TARGET_HTML)
rm -f $(TARGET_XML)
rm -f *~ style/*~ ontology/*~ xsl/*~
@@ -57,6 +63,8 @@ webclean:
test ! -e .git
find style/ -type f -not -name "style.css" -delete
find script/ -type f -not -name "ousia.js" -delete
+ rmdir script/lib
+ rmdir style/lib
rm -f $(TARGET_XML)
rm -f $(SOURCE_OSML)
rm -rf ontology www-src
diff --git a/script/prism.js b/script/lib/prism.js
index fc62daa..fc62daa 100644
--- a/script/prism.js
+++ b/script/lib/prism.js
diff --git a/script/prism_bash.js b/script/lib/prism_bash.js
index 24d5025..24d5025 100644
--- a/script/prism_bash.js
+++ b/script/lib/prism_bash.js
diff --git a/style/prism.css b/style/lib/prism.css
index 81b7382..a04c82c 100644
--- a/style/prism.css
+++ b/style/lib/prism.css
@@ -1,4 +1,3 @@
-/* http://prismjs.com/download.html?themes=prism */
/**
* prism.js default theme for JavaScript, CSS and HTML
* Based on dabblet (http://dabblet.com)
@@ -134,4 +133,3 @@ pre[class*="language-"] {
.token.entity {
cursor: help;
}
-
diff --git a/style/style.less b/style/style.less
index 1d14d30..7ee3edb 100644
--- a/style/style.less
+++ b/style/style.less
@@ -14,7 +14,7 @@
@import "header.less";
/* Import the prism code highlighter stylesheet */
-@import (less) "prism.css";
+@import (less) "lib/prism.css";
span.ipa {
color: gray;