diff --git a/.gitignore b/.gitignore index 2b8ee31c0d..247e2b53ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ _site/ -.sass-cache/ \ No newline at end of file +.sass-cache/ +.jekyll-cache/ \ No newline at end of file diff --git a/README.md b/README.md index 99d2d44506..0d06567b07 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,23 @@ For more details, see the [project page](http://elipapa.github.io/markdown-cv), *** +Extended version: +- added multiple CV support, now INDEX.md defines the navigation hub. To edit CV look at **_includes/cv_content.md** +- added **legal** variable that generates additional info personalized for your employer in one paragraf + +this README.md file was edited by me to accomodate those changes. + +...Jacek + +*** + ## Customization Simply [fork the markdown-cv repo](https://github.com/elipapa/markdown-cv) ![](https://help.github.com/assets/images/help/repository/fork_button.jpg) -and edit the `index.md` file [directly in Github](https://help.github.com/articles/editing-files-in-your-repository/) +and edit the `_includes/cv_content.md` file [directly in Github](https://help.github.com/articles/editing-files-in-your-repository/) ![](https://help.github.com/assets/images/help/repository/edit-file-edit-button.png) @@ -20,46 +30,56 @@ adding your skills, jobs and education. ![](https://help.github.com/assets/images/help/repository/edit-readme-light.png) -## Distribution - -To transform your plain text CV into a beautiful and shareable HTML page, you have two options: +after that you can create multiple cvs, via adding them in __posts using `YEAR-MONTH-DAY-name-.md`. All created cvs should appear at index.html page. They include **legal** variable, and content of file will be appear on the middle (below cv_content.md and above legal variable) of your cv page. -### I. Use Github Pages to publish it online - -1. Delete the existing `gh-pages` branch from your fork. It will only contain this webpage. You can either use git or [the Github web interface](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/#deleting-a-branch). -2. Create a new branch called `gh-pages`. -3. Head to *yourusername*.github.io/markdown-cv to see your CV live. +## Distribution -Any change you want to make to your CV from then on would have to be done on the `gh-pages` branch and will be immediately rendered by Github Pages. +To transform your plain text CV into a beautiful and shareable HTML page, you have two options below. With this extended version I highly suggest using local build and printing. -### II. Build it locally and print a PDF +### I. Build it locally and print a PDF 1. To [install jekyll](https://jekyllrb.com/docs/installation/), run `gem install bundler jekyll` from the command line. 3. [Clone](https://help.github.com/en/articles/cloning-a-repository) your fork of markdown-cv to your local machine. 3. Type `jekyll serve` to render your CV at http://localhost:4000. 4. You can edit the `index.md` file and see the changes live in your browser. 5. To print a PDF, press ⌘ + p. Print and web CSS media queries should take care of the styling. + +### II. Use Github Pages to publish it online + +1. Delete the existing `gh-pages` branch from your fork. It will only contain this webpage. You can either use git or [the Github web interface](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/#deleting-a-branch). +2. Create a new branch called `gh-pages`. +3. Head to *yourusername*.github.io/markdown-cv to see your CV live. + +Any change you want to make to your CV from then on would have to be done on the `gh-pages` branch and will be immediately rendered by Github Pages. ## Styling -The included CSS will render your CV in two styles: -s +The included CSS will render your CV in three styles: + 1. `kjhealy` the original default, inspired by [kjhealy's vita template](https://github.com/kjhealy/kjh-vita). 2. `davewhipp` is a tweaked version of `kjhealy`, with bigger fonts and dates right aligned. +3. `jacekwozniak` is extended version of those two before mentioned. + +In addition all styles got new `hide-print` class. To change the default style, simply change the variable in the `_config.yml` file. -Any other styling is possible. More CSS style contributions and forks are welcome! +Any other styling is possible. More CSS style contributions and forks are welcome! ### Author Eliseo Papa ([Twitter](http://twitter.com/elipapa)/[Github](http://github.com/elipapa)/[Website](https://elipapa.github.io)). + ![Eliseo Papa](https://s.gravatar.com/avatar/eae1f0c01afda2bed9ce9cb88f6873f6?s=100) + +Extended by Jacek Woźniak [Website](https://jacekwozniak12.github.io/) + + ### License [MIT License](https://github.com/elipapa/markdown-cv/blob/master/LICENSE) diff --git a/_includes/cv_content.md b/_includes/cv_content.md new file mode 100644 index 0000000000..e172969013 --- /dev/null +++ b/_includes/cv_content.md @@ -0,0 +1,89 @@ + + +# Isaac Newton +Physicist, Mathematician, Cambridge professor. + +
+isaac@applesdofall.org +| My wikipedia page +
+ + +## Currently + +Standing on the shoulders of giants + +### Specialized in + +Laws of motion, gravitation, minting coins, disliking [Robert Hooke](http://en.wikipedia.org/wiki/Robert_Hooke) + + +### Research interests + +Cooling, power series, optics, alchemy, planetary motions, apples. + + +## Education + +`1654-1660` +__The King's School, Grantham.__ + +`June 1661 - now` +__Trinity College, Cambridge__ + +- Sizar + +`1667 - death` +__Trinity College, Cambridge__ + +- Fellow + + + +## Awards + +`2012` +President, *Royal Society*, London, UK + +Associate, *French Academy of Science*, Paris, France + + + +## Publications + + + +### Journals + +`1669` +Newton Sir I, De analysi per æquationes numero terminorum infinitas. + +`1669` +Lectiones opticæ. + +etc. etc. etc. + +### Patents + +`2012` +Infinitesimal calculus for solutions to physics problems, [SMBC](http://www.techdirt.com/articles/20121011/09312820678/if-patents-had-been-around-time-newton.shtml) patent 001 + + +## Occupation + +`1600` +__Royal Mint__, London + +- Warden +- Minted coins + +`1600` +__Lucasian professor of Mathematics__, Cambridge University + + + + + + diff --git a/_layouts/cv.html b/_layouts/cv.html index 991939d51b..c10fc6eb40 100644 --- a/_layouts/cv.html +++ b/_layouts/cv.html @@ -1,16 +1,39 @@ - + + {% if page.title %} {{ page.title }} | {% endif %} CV - - + + + + Return to cvs +
+
- {{ content }} + {% capture index %} + {% include cv_content.md %} + {% endcapture%} + + {{ index | markdownify}} + + + {{ content }} + + {% if page.legal %} +

+ Legal +

+

+ {{page.legal}} +

+ {% endif %} +
+ \ No newline at end of file diff --git a/_layouts/nav.html b/_layouts/nav.html new file mode 100644 index 0000000000..cc70b1b06d --- /dev/null +++ b/_layouts/nav.html @@ -0,0 +1,26 @@ + + + + + + + + cvs + + + + + +
+

CVs rendered

+ +
+ + + \ No newline at end of file diff --git a/_posts/2022-04-27-einstein.md b/_posts/2022-04-27-einstein.md new file mode 100644 index 0000000000..1ef7f61fd2 --- /dev/null +++ b/_posts/2022-04-27-einstein.md @@ -0,0 +1,4 @@ +--- +layout: cv +legal: einstein +--- \ No newline at end of file diff --git a/_posts/2022-04-27-newton.md b/_posts/2022-04-27-newton.md new file mode 100644 index 0000000000..ebb0a0ffd3 --- /dev/null +++ b/_posts/2022-04-27-newton.md @@ -0,0 +1,4 @@ +--- +layout: cv +legal: newton +--- \ No newline at end of file diff --git a/index.md b/index.md index aa6c0cb838..5bae4e0d3c 100644 --- a/index.md +++ b/index.md @@ -1,91 +1,3 @@ --- -layout: cv -title: Isaac Newtons's CV ---- -# Isaac Newton -Physicist, Mathematician, Cambridge professor. - -
-isaac@applesdofall.org -| My wikipedia page -
- - -## Currently - -Standing on the shoulders of giants - -### Specialized in - -Laws of motion, gravitation, minting coins, disliking [Robert Hooke](http://en.wikipedia.org/wiki/Robert_Hooke) - - -### Research interests - -Cooling, power series, optics, alchemy, planetary motions, apples. - - -## Education - -`1654-1660` -__The King's School, Grantham.__ - -`June 1661 - now` -__Trinity College, Cambridge__ - -- Sizar - -`1667 - death` -__Trinity College, Cambridge__ - -- Fellow - - - -## Awards - -`2012` -President, *Royal Society*, London, UK - -Associate, *French Academy of Science*, Paris, France - - - -## Publications - - - -### Journals - -`1669` -Newton Sir I, De analysi per æquationes numero terminorum infinitas. - -`1669` -Lectiones opticæ. - -etc. etc. etc. - -### Patents - -`2012` -Infinitesimal calculus for solutions to physics problems, [SMBC](http://www.techdirt.com/articles/20121011/09312820678/if-patents-had-been-around-time-newton.shtml) patent 001 - - -## Occupation - -`1600` -__Royal Mint__, London - -- Warden -- Minted coins - -`1600` -__Lucasian professor of Mathematics__, Cambridge University - - - - - - +layout: nav +--- \ No newline at end of file diff --git a/media/davewhipp-print.css b/media/davewhipp-print.css index 79b3dddd84..403aa1f6c3 100644 --- a/media/davewhipp-print.css +++ b/media/davewhipp-print.css @@ -190,5 +190,8 @@ strong { visibility: hidden; } - +.hide-print +{ + display: none; +} diff --git a/media/jacekwozniak-print.css b/media/jacekwozniak-print.css new file mode 100644 index 0000000000..1e02d2f8b4 --- /dev/null +++ b/media/jacekwozniak-print.css @@ -0,0 +1,290 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, +body, +div, +span, +applet, +object, +iframe, +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +a, +abbr, +acronym, +address, +big, +cite, +code, +del, +dfn, +em, +img, +ins, +kbd, +q, +s, +samp, +small, +strike, +strong, +sub, +sup, +tt, +var, +b, +u, +i, +center, +dl, +dt, +dd, +ol, +ul, +li, +fieldset, +form, +label, +legend, +table, +caption, +tbody, +tfoot, +thead, +tr, +th, +td, +article, +aside, +canvas, +details, +embed, +figure, +figcaption, +footer, +header, +hgroup, +menu, +nav, +output, +ruby, +section, +summary, +time, +mark, +audio, +video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} + +/* HTML5 display-role reset for older browsers */ +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +menu, +nav, +section { + display: block; +} + +body { + line-height: 1; +} + +ol, +ul { + list-style: none; +} + +blockquote, +q { + quotes: none; +} + +blockquote:before, +blockquote:after, +q:before, +q:after { + content: ''; + content: none; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +/* end of reset */ + +body { + font-size: 14px; + line-height: 1.5em; + font-family: Verdana, sans-serif; +} + +p { + position: relative; + left: 28%; + margin-bottom: 0.2em; + margin-right: 0; + width: 70%; +} + +code { + font: normal normal; + font-size: 60%; + /*line-height: 1em;*/ + font-family: Menlo, monospace, sans-serif; + text-align: right; + color: #ccc; +} + +p code { + position: absolute; + left: -13%; +} + + +ul { + position: relative; + left: 28%; + width: 65%; + margin-bottom: 1em; + /*margin-top: -0.5em;*/ +} + +ul { + list-style-type: disc; + position: relative; + left: 33%; + width: 66%; + margin-bottom: 1.5em; + margin-top: -0.5em; +} + +li { + /*second line indent*/ + padding-left: 1.25em; + text-indent: -1.25em; + /*color: #777;*/ +} + +li ul { + position: relative; + left: 0; + width: 100%; + margin-top: 0.25em; +} + +h1, +h2, +h3, +h4 { + font-weight: 400; + font-family: Cousine, Verdana, sans-serif; + width: 65%; +} + +h1 { + text-align: left; + font-size: 3em; + line-height: 1em; + position: relative; + left: 28%; +} + +h1+p { + /*subtitle*/ + font-style: italic; + font-size: 110%; +} + +h2 { + font-size: 1.1em; + color: #a00; + margin-top: 2em; + position: relative; + top: 1.2em; + text-align: right; + width: 18%; +} + + +h3 { + font-size: 1em; + line-height: 2em; + color: #ccc; + position: relative; + top: 1.6em; + text-align: right; + width: 18%; +} + +h4 { + font-size: 0.55em; + position: relative; + top: 3em; + text-align: right; + width: 18%; +} + +a { + color: inherit; + text-decoration: none +} + +a:hover { + color: #39f +} + +#webaddress { + margin-top: 1em; + position: relative; + left: 28%; + color: #a00; + font-family: Menlo, monospace, sans-serif; + font-size: 80%; +} + +#webaddress a { + text-decoration: none; +} + +em { + font-style: normal; + color: #2d4e5e +} + +strong { + font-weight: bold; +} + +#ghbutton { + display: none; + visibility: hidden; +} + +.hide-print +{ + display: none; +} \ No newline at end of file diff --git a/media/jacekwozniak-screen.css b/media/jacekwozniak-screen.css new file mode 100644 index 0000000000..9da28e8b8a --- /dev/null +++ b/media/jacekwozniak-screen.css @@ -0,0 +1,291 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, +body, +div, +span, +applet, +object, +iframe, +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +a, +abbr, +acronym, +address, +big, +cite, +code, +del, +dfn, +em, +img, +ins, +kbd, +q, +s, +samp, +small, +strike, +strong, +sub, +sup, +tt, +var, +b, +u, +i, +center, +dl, +dt, +dd, +ol, +ul, +li, +fieldset, +form, +label, +legend, +table, +caption, +tbody, +tfoot, +thead, +tr, +th, +td, +article, +aside, +canvas, +details, +embed, +figure, +figcaption, +footer, +header, +hgroup, +menu, +nav, +output, +ruby, +section, +summary, +time, +mark, +audio, +video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} + +/* HTML5 display-role reset for older browsers */ +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +menu, +nav, +section { + display: block; +} + +body { + line-height: 1; +} + +ol, +ul { + list-style: none; +} + +blockquote, +q { + quotes: none; +} + +blockquote:before, +blockquote:after, +q:before, +q:after { + content: ''; + content: none; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +/* end of reset */ + + + +body { + font-size: 14px; + font-family: Verdana, sans-serif; + line-height: 1.5em; + /*also written as... font: normal normal 400 100%/1.5em;*/ + margin-top: 1em; + margin-left: 1em; +} + +p { + position: relative; + left: 33%; + margin-bottom: 0.7em; + margin-right: 0; + width: 65%; +} + +code { + font: normal normal; + font-size: 75%; + /*line-height: 1em;*/ + font-family: Menlo, monospace, sans-serif; + text-align: right; + color: #aaa; +} + +p code { + position: absolute; + left: -14%; +} + + +ul { + list-style-type: disc; + position: relative; + left: 37%; + width: 65%; + margin-bottom: 1.5em; + margin-top: -0.5em; +} + + +li { + /*second line indent*/ + padding-left: 1.25em; + text-indent: -1.25em; + /*color: #777;*/ +} + +li ul { + position: relative; + left: 0; + width: 100%; + margin-top: 0.25em; +} + +h1, +h2, +h3, +h4 { + font-weight: 400; + font-family: Cousine, Verdana, sans-serif; + width: 65%; +} + +h1 { + text-align: left; + font-size: 3em; + line-height: 1em; + position: relative; + left: 33%; +} + +h1+p { + /*subtitle*/ + font-style: italic; + font-size: 110%; +} + +h2 { + font-size: 1.1em; + color: #a00; + margin-top: 3em; + position: relative; + top: 1.4em; + text-align: right; + width: 20%; +} + +h3 { + font-size: 1em; + line-height: 2em; + position: relative; + top: 1.7em; + text-align: right; + width: 20%; +} + +h4 { + font-size: 0.55em; + position: relative; + top: 3em; + text-align: right; + width: 20%; +} + +a { + color: inherit; + /*text-decoration:none*/ +} + +#webaddress>a { + color: #a00; +} + +a:hover { + color: #39f +} + +#webaddress { + margin-top: 1em; + position: relative; + left: 33%; + color: #aaa; + font-family: Menlo, monospace, sans-serif; + font-size: 80%; +} + +#webaddress a { + text-decoration: none; +} + +em { + font-weight: bold; + font-style: italic; +} + +strong { + font-weight: bold; +} + +#address { + display: none; +} + + + +/* +@media only screen and (max-width: 480px) { + make one column somehow... +}*/ \ No newline at end of file diff --git a/media/kjhealy-print.css b/media/kjhealy-print.css index 1996e09a58..17b62024b9 100644 --- a/media/kjhealy-print.css +++ b/media/kjhealy-print.css @@ -189,6 +189,9 @@ strong { visibility: hidden; } - +.hide-print +{ + display: none; +} diff --git a/media/nav.css b/media/nav.css new file mode 100644 index 0000000000..5146fa5b36 --- /dev/null +++ b/media/nav.css @@ -0,0 +1,26 @@ +h1 +{ + text-align: center; + margin-top: 30vh; +} +.nav { + margin: 0 auto; + width: 640px; +} + +.nav>ul>li { + text-align: center; + font-size: 32px; + margin: 10px; +} + +.nav>ul { + padding-inline-start: 0; + position: relative; + display: flex; + overflow-x: auto; + justify-content: center; + align-items: center; + flex-direction: row; + list-style-type: none; +} \ No newline at end of file