Merge branch 'jsBookmark' into 'master' (5bc6ae5b) · Commits · pagedjs / parametricPagedJs · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

parametricPagedJs
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

5bc6ae5b

Commit 5bc6ae5b authored 4 years ago by

julientaq

Downloads
- Plain Diff

Merge branch 'jsBookmark' into 'master'

add support for config!

See merge request julientaq/hybrid!1

parents 7ab4a989 462ffc38

No related branches found

No related tags found

No related merge requests found

Changes 14

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 1 deletion

.gitignore
css/pagedMaker.css 0 additions, 0 deletions

css/pagedMaker.css
css/pagedtest.css 3 additions, 0 deletions

css/pagedtest.css
dist/pagedMaker.js 411 additions, 0 deletions

dist/pagedMaker.js
index.html 33 additions, 25 deletions

index.html
js/backup.js 96 additions, 0 deletions

js/backup.js
js/main.js 50 additions, 18 deletions

js/main.js
js/modules/baseStylesheet.js 11 additions, 4 deletions

js/modules/baseStylesheet.js
js/modules/config.js 18 additions, 0 deletions

js/modules/config.js
js/modules/pagedmakerCSS.js 89 additions, 0 deletions

js/modules/pagedmakerCSS.js
js/modules/ui.js 52 additions, 26 deletions

js/modules/ui.js
js/modules/uicss.js 82 additions, 0 deletions

js/modules/uicss.js
out.js 202 additions, 0 deletions

out.js
package-lock.json 11 additions, 0 deletions

package-lock.json

with 1060 additions and 74 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment