Updates and fixes for tables and such

2018-10-14 17:10:53 +02:00 · 2018-10-14 17:10:53 +02:00 · 70ad6ce17b
parent 1d99d83ca2
commit 70ad6ce17b
13 changed files with 100 additions and 99 deletions
--- a/.ruby-version
+++ b/.ruby-version
@ -1 +1 @@
-2.3.1
+2.5.0
--- a/.travis.yml
+++ b/.travis.yml
@ -4,7 +4,7 @@ bundler_args: --without development,nanoc
 cache:
  apt: true
  bundler: true
-  
+
  # Cache nanoc directories
  # NEVER MIND LOL
  # directories:
@ -31,7 +31,13 @@ before_install:
 - openssl aes-256-cbc -K $encrypted_6059a4f451fd_key -iv $encrypted_6059a4f451fd_iv
  -in id_rsa.enc -out deploy_key -d
 - echo -e "[zeus.ugent.be]:2222 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC87/Q3H8f7ghmA+iCtKGaNyk0fx3Z36Xrn+eGv8a4pD7MXeu6Uwr0aN5HnkcbRWXFtMwnAU3ptoP90vH7qu99w=\n[herbert.ugent.be]:2222 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGLnJMh2DgqpVnHxOmeV6KffvzZGEVfniq0NFHRGZoL4f7Uc8xeG9gn3cc7lCL02F9LwWZNwR4gSqhGt/RK2S54=\n" >> ~/.ssh/known_hosts
- npm install
+# Repo for newer Node.js versions
+- curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
+# Repo for Yarn
+- sudo apt-key adv --keyserver pgp.mit.edu --recv D101F7899D41F3C3
+- echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+- sudo apt-get update -qq
+- sudo apt-get install -y -qq yarn
 script:
 - bundle exec nanoc --env=prod
 - bundle exec nanoc --env=prod check --deploy
--- a/.yarnrc
+++ b/.yarnrc
@ -0,0 +1 @@
+--modules-folder content/node_modules
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -15,15 +15,15 @@ GEM
    coffee-script-source (1.12.2)
    colored (1.2)
    concurrent-ruby (1.0.5)
-    cri (2.10.1)
+    cri (2.15.1)
      colored (~> 1.2)
    ddmemoize (1.0.0)
      ddmetrics (~> 1.0)
      ref (~> 2.0)
-    ddmetrics (1.0.0)
+    ddmetrics (1.0.1)
    ddplugin (1.0.2)
    execjs (2.7.0)
-    ffi (1.9.23)
+    ffi (1.9.25)
    formatador (0.2.5)
    guard (2.14.2)
      formatador (>= 0.2.4)
@ -35,7 +35,7 @@ GEM
      shellany (~> 0.0)
      thor (>= 0.18.1)
    guard-compat (1.2.1)
-    guard-nanoc (2.1.2)
+    guard-nanoc (2.1.4)
      guard (~> 2.8)
      guard-compat (~> 1.0)
      nanoc (>= 4.3.8, < 5.0)
@ -45,6 +45,7 @@ GEM
    htmlcompressor (0.4.0)
    icalendar (2.4.1)
    json (2.1.0)
+    json_schema (0.19.1)
    kramdown (1.16.2)
    libv8 (3.16.14.19)
    listen (3.1.5)
@ -54,13 +55,14 @@ GEM
    lumberjack (1.0.13)
    method_source (0.9.0)
    mini_portile2 (2.3.0)
-    nanoc (4.9.2)
+    nanoc (4.10.0)
      addressable (~> 2.5)
-      cri (~> 2.8)
+      cri (~> 2.15)
      ddmemoize (~> 1.0)
      ddmetrics (~> 1.0)
      ddplugin (~> 1.0)
      hamster (~> 3.0)
+      json_schema (~> 0.19)
      parallel (~> 1.12)
      ref (~> 2.0)
      slow_enumerator_tools (~> 1.0)
@ -76,7 +78,7 @@ GEM
    pry (0.11.3)
      coderay (~> 1.1.0)
      method_source (~> 0.9.0)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
    rack (2.0.5)
    rainpress (1.0.1)
    rb-fsevent (0.10.3)
@ -98,7 +100,7 @@ GEM
      libv8 (~> 3.16.14.15)
      ref
    thor (0.20.0)
-    tomlrb (1.2.6)
+    tomlrb (1.2.7)
    typogruby (1.0.18)
      rubypants
    uglifier (4.1.10)
@ -136,4 +138,4 @@ DEPENDENCIES
  yui-compressor

 BUNDLED WITH
-   1.14.6
+   1.16.4
--- a/README.md
+++ b/README.md
@ -14,10 +14,11 @@ These instructions will get you a copy of the project up and running on your loc

 ### Prerequisites

-You will need Ruby (gem) and Node.js (npm). Installation instructions are listed below.
+You will need Ruby (gem), yarn and pandoc. Installation instructions are listed below.

 * [Ruby](https://www.ruby-lang.org/en/documentation/installation/)
-* [Node.js](https://nodejs.org/en/download/package-manager/)
+* [yarn](yarnpkg.com/en/docs/install)
+* [pandoc](https://pandoc.org/installing.html)

 ### Installing

--- a/13
+++ b/13
@ -11,7 +11,7 @@ require 'icalendar'
 #

 preprocess do
-  `npm install`
+  `yarn`

  # We don't want to compile old blogposts in development
  ignore_old_content('blog', 'events', 'about/verslagen') if development?
@ -46,7 +46,7 @@ compile '/blog/*' do
  layout '/default.*'
  filter :erb

-  filter :html_press
+  filter :html_press if production?
 end

 #
@ -60,7 +60,7 @@ compile '/events/*' do
  layout '/default.*'
  filter :erb

-  filter :html_press
+  filter :html_press if production?
 end

 compile '/events/*/*' do
@ -71,7 +71,7 @@ compile '/events/*/*' do
  layout '/default.*'
  filter :erb

-  filter :html_press
+  filter :html_press if production?
 end

 compile '/events/*/*', rep: :text do
@ -98,7 +98,7 @@ compile '/blog/*/*.md' do
  layout '/default.*'
  filter :erb

-  filter :html_press
+  filter :html_press if production?
 end

 compile '/blog/*/*.md', rep: :text do
@ -149,7 +149,7 @@ compile '/**/*.erb' do
  layout '/generic.*'
  layout '/default.*'

-  filter :html_press
+  filter :html_press if production?
 end

 compile '/**/*.md' do
@ -175,6 +175,7 @@ end

 ignore '/assets/stylesheets/includes/**/*'
 ignore '/data/**/*'
+ignore '/node_modules/**/*'

 compile '/assets/stylesheets/**/*.scss' do
  filter :sass, syntax: :scss, style: :compressed
--- a/content/about/about.erb
+++ b/content/about/about.erb
@ -33,8 +33,8 @@ narrow_page: true
  <blockquote>
    Mail us all at: <a href='mailto:bestuur@zeus.ugent.be'>bestuur@zeus.ugent.be</a>
  </blockquote>
-  
-  <table class="table">
+
+  <table class="table board-table">
    <thead>
      <tr>
        <th>Function</th>
--- a/content/assets/stylesheets/includes/about.scss
+++ b/content/assets/stylesheets/includes/about.scss
@ -1,64 +1,56 @@
-@media only screen and (max-width: 425px) {
-  table {
+@include mobile {
+  table.board-table {
    border-collapse: inherit;
-  }
-  thead {
-    > tr {
-      visibility: collapse;
+    thead {
+      > tr {
+        visibility: collapse;
+      }
    }
-  }
-  tbody {
-    > tr {
-      display: grid;
-      border-top: 1px solid $box-colour;
-      grid-template-columns: auto auto;
-      grid-template-areas:
+    tbody {
+      > tr {
+        display: grid;
+        border-top: 1px solid $box-colour;
+        grid-template-columns: auto auto;
+        grid-template-areas:
        "func func"
        "name name"
        "email link";

-      width: 87vw;
-    }
-    > tr > td:nth-child(3) {
-      grid-area: email;
-      border: none;
-    }
-    > tr > td:nth-child(2) {
-      grid-area: name;
-      border: none;
-    }
-    > tr > td:nth-child(4) {
-      display: grid;
-      justify-items: end;
-      grid-area: link;
-      border: none;
-    }
-    > tr > td:nth-child(1) {
-      grid-area: func;
-      border: none;
-    }
-  }
-  tbody {
-    > tr > td:nth-child(3):before {
-      content: "E-mail: ";
-      font-weight: bold;
-    }
-  }
-  tbody {
-    > tr > td:nth-child(2):before {
-      content: "Name: ";
-      font-weight: bold;
-    }
-  }
-  tbody {
-    > tr > td:nth-child(1):before {
-      content: "Function: ";
-      font-weight: bold;
-    }
-  }
-  tbody {
-    > tr > td:nth-child(4):before {
-      grid-area: link;
+        width: 87vw;
+      }
+      > tr > td:nth-child(3) {
+        grid-area: email;
+        border: none;
+      }
+      > tr > td:nth-child(2) {
+        grid-area: name;
+        border: none;
+      }
+      > tr > td:nth-child(4) {
+        display: grid;
+        justify-items: end;
+        grid-area: link;
+        border: none;
+      }
+      > tr > td:nth-child(1) {
+        grid-area: func;
+        border: none;
+      }
+      > tr > td:nth-child(3):before {
+        content: "E-mail: ";
+        font-weight: bold;
+      }
+      > tr > td:nth-child(2):before {
+        content: "Name: ";
+        font-weight: bold;
+      }
+      > tr > td:nth-child(1):before {
+        content: "Function: ";
+        font-weight: bold;
+      }
+      > tr > td:nth-child(4):before {
+        grid-area: link;
+      }
    }
  }
 }
--- a/content/assets/stylesheets/includes/navbar.scss
+++ b/content/assets/stylesheets/includes/navbar.scss
@ -64,6 +64,9 @@

    #ledenformulier {
        color: $zeus-orange;
-        transform: rotate(10deg);
+
+        @include desktop {
+            transform: rotate(10deg);
+        }
    }
 }
--- a/content/assets/stylesheets/main.scss
+++ b/content/assets/stylesheets/main.scss
@ -1,7 +1,7 @@
@import "includes/variables";

-@import "../../../node_modules/bulma/bulma";
-@import "../../../node_modules/bulma-divider/divider";
+@import "../../node_modules/bulma/bulma";
+@import "../../node_modules/bulma-divider/divider";

 .nav-right {
  flex: none;
--- a/package-lock.json
+++ b/package-lock.json
@ -1,18 +0,0 @@
-{
-  "name": "zeus.ugent.be",
-  "version": "0.0.1",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "bulma": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.7.1.tgz",
-      "integrity": "sha512-wRSO2LXB+qI9Pyz2id+uZr4quz5aftSN7Ay1ysr1+krzVp3utD+Ci4CeKuZdrYGc800t65b7heXBL6qw2Wo/lQ=="
-    },
-    "bulma-divider": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/bulma-divider/-/bulma-divider-0.0.1.tgz",
-      "integrity": "sha1-qcW1TwzgKg6FjTOPTlggN4dRKks="
-    }
-  }
-}
--- a/package.json
+++ b/package.json
@ -7,7 +7,7 @@
  "license": "MIT",
  "repository": "https://github.com/ZeusWPI/zeus.ugent.be",
  "dependencies": {
-    "bulma": "0.7.1",
+    "bulma": "0.7.2",
    "bulma-divider": "~0.0.1"
  }
 }
--- a/yarn.lock
+++ b/yarn.lock
@ -0,0 +1,13 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+bulma-divider@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/bulma-divider/-/bulma-divider-0.0.2.tgz#435e34f27217ebb938cf0ee9ff1b68f66d539dc6"
+  integrity sha1-Q1408nIX67k4zw7p/xto9m1TncY=
+
+bulma@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.7.2.tgz#8e944377b74c7926558830d38d8e19eaf49f5fb6"
+  integrity sha512-6JHEu8U/1xsyOst/El5ImLcZIiE2JFXgvrz8GGWbnDLwTNRPJzdAM0aoUM1Ns0avALcVb6KZz9NhzmU53dGDcQ==
 @ -1 +1 @@
 .3.1
 .5.0