Merge branch 'develop' into taggle_user_study

# Conflicts: # src/data/soccer/index.ts # src/index.html # src/style.scss
Caleydo · Aug 22, 2018 · 237c7c3 · 237c7c3
2 parents ce83eae + f929641
commit 237c7c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
  "dependencies": {
  "@types/materialize-css": "^1.0.3",
  "@types/papaparse": "^4.5.0",
- "lineupjs": "^3.1.0",
+ "lineupjs": "^3.1.1",
  "materialize-css": "^0.100.2",
  "papaparse": "^4.5.0",
  "font-awesome": "^4.7.0",

diff --git a/src/index.html b/src/index.html
@@ -93,7 +93,7 @@
 
  <footer class="page-footer">
  <div class="footer-copyright">
- <div class="container">
+ <div>
  <a href="https://lineup.js.org" target="_blank" rel="noopener">LineUp.js</a>
  is a
  <a href="http://caleydo.org" target="_blank" rel="noopener">Caleydo</a> project that is maintained by

diff --git a/src/style.scss b/src/style.scss
@@ -234,7 +234,7 @@ section.lu-header > .lu-label {
 
  .footer-copyright {
  min-height: 30px;
- padding: 0;
+ padding: 0 1em;
  }
 }