Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

c3ioc.de
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7c12d6c5

Commit 7c12d6c5 authored Dec 14, 2020 by Anne-Victoria

Downloads
- Plain Diff

Merge branch 'master' into feature/switch-from-css-to-sass

parents d85ea377 db5a3c8f

No related branches found

No related tags found

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

LICENSE.txt 0 additions, 0 deletions

LICENSE.txt
public/about.html 189 additions, 0 deletions

public/about.html
public/index.html 193 additions, 125 deletions

public/index.html
public/main.js 19 additions, 3 deletions

public/main.js
public/speakersdesk.html 328 additions, 0 deletions

public/speakersdesk.html
public/styles/partials/_font-faces.scss 190 additions, 190 deletions

public/styles/partials/_font-faces.scss
public/styles/style.css 71 additions, 20 deletions

public/styles/style.css
public/styles/style.scss 65 additions, 22 deletions

public/styles/style.scss

with 1055 additions and 360 deletions

Loading

0% Loading 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

Impressum - Datenschutzerklärung