This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
from 4e87b4745 Merge pull request #481 from
spyhunter99/feature/JSPWIKI-1198-followup
add 2af4c5809 JSPWIKI-1265 turns out that jspwiki has a "skins" feature
that is supported by haddock but there are no themes out of the box. We also
have this dark mode theme like mechanism that should have been a "skin". So
this change moves the dark mode css to a skin, then adds a number of other
skins inspired by MIT licensed bootswatch
add 63089c160 JSPWIKI-1265 build fix
add 13c94129e Merge pull request #480 from spyhunter99/feature/JSPWIKI-1265
No new revisions were added by this update.
Summary of changes:
.../org/apache/wiki/preferences/Preferences.java | 2 +-
.../src/main/resources/ini/jspwiki.properties | 2 +-
jspwiki-war/pom.xml | 3 +
jspwiki-war/src/main/scripts/wiki/Prefs.js | 2 +-
.../webapp/templates/default/PreferencesTab.jsp | 10 --
.../main/webapp/templates/default/commonheader.jsp | 4 -
.../templates/default/skins/black-n-gold/skin.css} | 137 ++++++++++----------
.../templates/default/skins/black-n-gold/skin.js | 14 +-
.../templates/default/skins/bootstrap/skin.css} | 132 +++++++++----------
.../templates/default/skins/bootstrap/skin.js | 14 +-
.../templates/default/skins/cyborg/skin.css} | 130 ++++++++-----------
.../webapp/templates/default/skins/cyborg/skin.js | 14 +-
.../templates/default/skins/dark/skin.css} | 6 +-
.../webapp/templates/default/skins/dark/skin.js | 0
.../templates/default/skins/darkly/skin.css} | 130 ++++++++-----------
.../webapp/templates/default/skins/darkly/skin.js | 14 +-
.../templates/default/skins/default/skin.css | 15 +++
.../webapp/templates/default/skins/default/skin.js | 14 +-
.../templates/default/skins/materia/skin.css} | 131 +++++++++----------
.../webapp/templates/default/skins/materia/skin.js | 14 +-
.../templates/default/skins/slate/skin.css} | 132 +++++++++----------
.../webapp/templates/default/skins/slate/skin.js | 14 +-
.../templates/default/skins/uswds/skin.css} | 141 ++++++++++-----------
.../webapp/templates/default/skins/uswds/skin.js | 14 +-
.../templates/default/skins/vapor/skin.css} | 127 ++++++++-----------
.../webapp/templates/default/skins/vapor/skin.js | 14 +-
26 files changed, 552 insertions(+), 678 deletions(-)
copy jspwiki-war/src/main/{styles/static/templates/default/haddock-dark.css =>
webapp/templates/default/skins/black-n-gold/skin.css} (86%)
copy jspwiki-main/src/test/config/hsql-userdb-teardown.ddl =>
jspwiki-war/src/main/webapp/templates/default/skins/black-n-gold/skin.js (72%)
copy jspwiki-war/src/main/{styles/static/templates/default/haddock-dark.css =>
webapp/templates/default/skins/bootstrap/skin.css} (86%)
copy jspwiki-main/src/test/config/hsql-userdb-teardown.ddl =>
jspwiki-war/src/main/webapp/templates/default/skins/bootstrap/skin.js (72%)
copy jspwiki-war/src/main/{styles/static/templates/default/haddock-dark.css =>
webapp/templates/default/skins/cyborg/skin.css} (86%)
copy jspwiki-main/src/test/config/hsql-userdb-teardown.ddl =>
jspwiki-war/src/main/webapp/templates/default/skins/cyborg/skin.js (72%)
copy jspwiki-war/src/main/{styles/static/templates/default/haddock-dark.css =>
webapp/templates/default/skins/dark/skin.css} (99%)
create mode 100644
jspwiki-war/src/main/webapp/templates/default/skins/dark/skin.js
copy jspwiki-war/src/main/{styles/static/templates/default/haddock-dark.css =>
webapp/templates/default/skins/darkly/skin.css} (86%)
copy jspwiki-main/src/test/config/hsql-userdb-teardown.ddl =>
jspwiki-war/src/main/webapp/templates/default/skins/darkly/skin.js (72%)
create mode 100644
jspwiki-war/src/main/webapp/templates/default/skins/default/skin.css
copy jspwiki-main/src/test/config/hsql-userdb-teardown.ddl =>
jspwiki-war/src/main/webapp/templates/default/skins/default/skin.js (72%)
copy jspwiki-war/src/main/{styles/static/templates/default/haddock-dark.css =>
webapp/templates/default/skins/materia/skin.css} (86%)
copy jspwiki-main/src/test/config/hsql-userdb-teardown.ddl =>
jspwiki-war/src/main/webapp/templates/default/skins/materia/skin.js (72%)
copy jspwiki-war/src/main/{styles/static/templates/default/haddock-dark.css =>
webapp/templates/default/skins/slate/skin.css} (86%)
copy jspwiki-main/src/test/config/hsql-userdb-teardown.ddl =>
jspwiki-war/src/main/webapp/templates/default/skins/slate/skin.js (72%)
copy jspwiki-war/src/main/{styles/static/templates/default/haddock-dark.css =>
webapp/templates/default/skins/uswds/skin.css} (86%)
copy jspwiki-main/src/test/config/hsql-userdb-teardown.ddl =>
jspwiki-war/src/main/webapp/templates/default/skins/uswds/skin.js (72%)
rename jspwiki-war/src/main/{styles/static/templates/default/haddock-dark.css
=> webapp/templates/default/skins/vapor/skin.css} (86%)
copy jspwiki-main/src/test/config/hsql-userdb-teardown.ddl =>
jspwiki-war/src/main/webapp/templates/default/skins/vapor/skin.js (72%)
