diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f1699a..e1350b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,30 @@ -# This file is a template, and might need editing before it works on your project. -# Full project: https://gitlab.com/pages/plain-html +# taken from https://gitlab.com/rverchere/marp-gitpod-demo +# by Rémi Verchèr -> as describde in https://medium.com/linkbynet/making-slides-from-anywhere-for-anyone-using-marp-gitlab-pages-and-gitpod-35001daf1c93 -image: busybox +stages: + - build + - deploy + +generate-deck: + stage: build + image: + name: marpteam/marp-cli + entrypoint: [""] + script : + - mkdir build/ + - export MARP_USER="$(id -u):$(id -g)" + - /home/marp/.cli/docker-entrypoint -I . -o build/ + artifacts: + paths: + - "build/" pages: stage: deploy script: - - echo "The site will be deployed to $CI_PAGES_URL" + # Nothing to do, as we just need to publish the build/ dir + - mv build public artifacts: paths: - public - rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + dependencies: + - generate-deck diff --git a/README.md b/README.md deleted file mode 100644 index 7b38b22..0000000 --- a/README.md +++ /dev/null @@ -1,64 +0,0 @@ -Example plain HTML site using GitLab Pages. - -Learn more about GitLab Pages at https://pages.gitlab.io and the official -documentation https://docs.gitlab.com/ce/user/project/pages/. - ---- - - - -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - -- [GitLab CI](#gitlab-ci) -- [GitLab User or Group Pages](#gitlab-user-or-group-pages) -- [Did you fork this project?](#did-you-fork-this-project) -- [Troubleshooting](#troubleshooting) - - - -## GitLab CI - -This project's static Pages are built by [GitLab CI][ci], following the steps -defined in [`.gitlab-ci.yml`](.gitlab-ci.yml): - -``` -image: busybox - -pages: - stage: deploy - script: - - echo 'Nothing to do...' - artifacts: - paths: - - public - expire_in: 1 day - rules: - - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH -``` - -The above example expects to put all your HTML files in the `public/` directory. - -## GitLab User or Group Pages - -To use this project as your user/group website, you will need one additional -step: just rename your project to `namespace.gitlab.io`, where `namespace` is -your `username` or `groupname`. This can be done by navigating to your -project's **Settings**. - -Read more about [user/group Pages][userpages] and [project Pages][projpages]. - -## Did you fork this project? - -If you forked this project for your own use, please go to your project's -**Settings** and remove the forking relationship, which won't be necessary -unless you want to contribute back to the upstream project. - -## Troubleshooting - -1. CSS is missing! That means that you have wrongly set up the CSS URL in your - HTML files. Have a look at the [index.html] for an example. - -[ci]: https://about.gitlab.com/gitlab-ci/ -[index.html]: https://gitlab.com/pages/plain-html/blob/master/public/index.html -[userpages]: https://docs.gitlab.com/ce/user/project/pages/introduction.html#user-or-group-pages -[projpages]: https://docs.gitlab.com/ce/user/project/pages/introduction.html#project-pages diff --git a/aim.md b/aim.md new file mode 100644 index 0000000..f07c747 --- /dev/null +++ b/aim.md @@ -0,0 +1,34 @@ +--- +theme: gaia +_class: lead + +backgroundColor: #000000 + +--- + +# **Towards a universal button grid interface** +And it's open implementation + + +![bg right:42%](images/monome-gridlab.jpg) +![bg](images/deluge-slider-2.jpg) + +--- + +# A rich history + +--- + +# State of the art + +--- + +# Problem + +* Plenty of closed source, propriatery hardware. +* Sevral open source libraries, with diferent aproaches +* Both lmany incompatibilites and many overlapping features + +--- + +# The issue of menus diff --git a/images/deluge-slider-2.jpg b/images/deluge-slider-2.jpg new file mode 100644 index 0000000..a583cf3 Binary files /dev/null and b/images/deluge-slider-2.jpg differ diff --git a/images/monome-gridlab.jpg b/images/monome-gridlab.jpg new file mode 100644 index 0000000..f7dc631 Binary files /dev/null and b/images/monome-gridlab.jpg differ diff --git a/public/index.html b/public/index.html deleted file mode 100644 index 6652c7d..0000000 --- a/public/index.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - Plain HTML site using GitLab Pages - - - - - -

Hello World!

- -

- This is a simple plain-HTML website on GitLab Pages, without any fancy static site generator. -

- - - diff --git a/public/style.css b/public/style.css deleted file mode 100644 index 3eae408..0000000 --- a/public/style.css +++ /dev/null @@ -1,24 +0,0 @@ -body { - font-family: sans-serif; - margin: auto; - max-width: 1280px; -} - -.navbar { - background-color: #313236; - border-radius: 2px; - max-width: 800px; -} - -.navbar a { - color: #aaa; - display: inline-block; - font-size: 15px; - padding: 10px; - text-decoration: none; -} - -.navbar a:hover { - color: #ffffff; -} -