diff --git a/.github/workflows/build_site/action.yml b/.github/workflows/build_site/action.yml new file mode 100644 index 00000000..d30b908f --- /dev/null +++ b/.github/workflows/build_site/action.yml @@ -0,0 +1,33 @@ +name: Build the site +description: Build the site using nanoc + +runs: + using: 'composite' + steps: + - name: Checkout submodule + shell: bash + run: git submodule update --init --recursive --remote + - name: Cache install Nix packages + uses: rikhuijzer/cache-install@c90964bcac3286c8571cb849f7caffb9e8b9cb37 + with: + key: nix-${{ hashFiles('packages.nix', 'gemset.nix') }} + nix_file: 'packages.nix' + - name: Cache Output + id: cache-output + uses: actions/cache@v4 + with: + path: | + ./tmp/ + ./output/ + key: build-${{ github.ref_name }} + restore-keys: | + build-master + - name: Set environment variable + shell: bash + run: "export LANG=en_US.UTF-8" + - name: Build site + shell: bash + run: "bundle exec nanoc --env=prod" + - name: Run checks + shell: bash + run: "bundle exec nanoc --env=prod check --deploy" \ No newline at end of file diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 6abf80ab..4ea446c5 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -24,29 +24,7 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 - - name: Checkout submodule - run: git submodule update --init --recursive --remote - - name: Cache install Nix packages - uses: rikhuijzer/cache-install@249745afd54c8e2be0eb99aa6032b52629239b48 - with: - key: nix-${{ hashFiles('packages.nix') }} - nix_file: 'packages.nix' - - name: Cache Output - id: cache-output - uses: actions/cache@v3 - with: - path: | - ./tmp/ - ./output/ - key: build-${{ github.ref_name }} - restore-keys: | - build-master - - name: Set environment variable - run: "export LANG=en_US.UTF-8" - - name: Build site - run: "nanoc --env=prod" - - name: Run checks - run: "nanoc --env=prod check --deploy" + - uses: ./.github/workflows/build_site - name: Add private key shell: bash env: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f4e0a3e6..e46bb40f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -22,29 +22,7 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 - - name: Checkout submodule - run: git submodule update --init --recursive --remote - - name: Cache install Nix packages - uses: rikhuijzer/cache-install@249745afd54c8e2be0eb99aa6032b52629239b48 - with: - key: nix-${{ hashFiles('packages.nix') }} - nix_file: 'packages.nix' - - name: Cache Output - id: cache-output - uses: actions/cache@v3 - with: - path: | - ./tmp/ - ./output/ - key: build-${{ github.ref_name }} - restore-keys: | - build-master - - name: Set environment variable - run: "export LANG=en_US.UTF-8" - - name: Build site - run: "nanoc --env=prod" - - name: Run checks - run: "nanoc --env=prod check --deploy" + - uses: ./.github/workflows/build_site - name: Add private key shell: bash env: diff --git a/.gitmodules b/.gitmodules index 813c9210..8b617482 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,3 +3,9 @@ #url = ssh://git@git.zeus.gent:2222/bestuur/drive.git url = https://git.zeus.gent/zeuswpi/drive.git branch = master +[submodule "content/assets/stylesheets/bulma"] + path = content/assets/stylesheets/bulma + url = https://github.com/jgthms/bulma +[submodule "content/assets/stylesheets/bulma-timeline"] + path = content/assets/stylesheets/bulma-timeline + url = https://github.com/ymkapuriya/bulma-timeline diff --git a/.ruby-version b/.ruby-version index 4a36342f..fa7adc7a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.0 +3.3.5 diff --git a/Gemfile b/Gemfile index baad1a9b..b0352037 100644 --- a/Gemfile +++ b/Gemfile @@ -26,6 +26,15 @@ gem 'tzinfo' # Take screenshots for our banner image gem 'puppeteer-ruby' +gem 'sass-embedded' + +# Silences warnings that they will be no longer part of the standard library in Ruby 3.5 +gem 'pstore' +gem 'logger' + +# Not found in Github actions +gem 'terser' + group :development do gem 'adsf' # puma instead of thin, see https://github.com/nanoc/nanoc/issues/1499 diff --git a/Gemfile.lock b/Gemfile.lock index 9134d457..414d685f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,34 +1,39 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) - adsf (1.4.7) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + adsf (1.5.0) rack (>= 1.0.0, < 4.0.0) rackup (~> 2.1) - adsf-live (1.4.7) + adsf-live (1.5.0) adsf (~> 1.3) em-websocket (~> 0.5) eventmachine (~> 1.2) listen (~> 3.0) rack-livereload (~> 0.3) - autoprefixer-rails (10.4.15.0) + autoprefixer-rails (10.4.19.0) execjs (~> 2) - builder (3.2.4) + base64 (0.2.0) + bigdecimal (3.1.8) + builder (3.3.0) coderay (1.1.3) colored (1.2) - concurrent-ruby (1.2.2) - cri (2.15.11) - ddmetrics (1.0.1) + concurrent-ruby (1.3.4) + cri (2.15.12) + ddmetrics (1.1.0) ddplugin (1.0.3) - diff-lcs (1.5.0) + diff-lcs (1.5.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) execjs (2.9.1) - ffi (1.15.5) + ffi (1.17.0) formatador (1.1.0) + google-protobuf (4.28.2) + bigdecimal + rake (>= 13) guard (2.18.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) @@ -44,16 +49,19 @@ GEM guard-compat (~> 1.0) nanoc-cli (~> 4.11, >= 4.11.14) nanoc-core (~> 4.11, >= 4.11.14) - highline (2.1.0) + highline (3.1.1) + reline htmlcompressor (0.4.0) http_parser.rb (0.8.0) - icalendar (2.9.0) + icalendar (2.10.3) ice_cube (~> 0.16) - ice_cube (0.16.4) - immutable-ruby (0.1.0) + ostruct + ice_cube (0.17.0) + immutable-ruby (0.2.0) concurrent-ruby (~> 1.1) sorted_set (~> 1.0) - json (2.6.3) + io-console (0.7.2) + json (2.7.2) json_schema (0.21.0) katex (0.10.0) execjs (~> 2.8) @@ -62,42 +70,45 @@ GEM kramdown-math-katex (1.0.1) katex (~> 0.4) kramdown (~> 2.0) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - lumberjack (1.2.9) - memo_wise (1.7.0) - method_source (1.0.0) - mime-types (3.5.1) + logger (1.6.1) + lumberjack (1.2.10) + memo_wise (1.10.0) + method_source (1.1.0) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0808) - mini_portile2 (2.8.4) - nanoc (4.12.16) + mime-types-data (3.2024.0903) + mini_portile2 (2.8.7) + nanoc (4.13.0) addressable (~> 2.5) colored (~> 1.2) nanoc-checking (~> 1.0, >= 1.0.2) - nanoc-cli (= 4.12.16) - nanoc-core (= 4.12.16) + nanoc-cli (= 4.13.0) + nanoc-core (= 4.13.0) nanoc-deploying (~> 1.0) parallel (~> 1.12) tty-command (~> 0.8) tty-which (~> 0.4) - nanoc-checking (1.0.2) - nanoc-cli (~> 4.12, >= 4.12.4) - nanoc-core (~> 4.12, >= 4.12.4) - nanoc-cli (4.12.16) + nanoc-checking (1.0.5) + nanoc-cli (~> 4.12, >= 4.12.5) + nanoc-core (~> 4.12, >= 4.12.5) + nanoc-cli (4.13.0) cri (~> 2.15) diff-lcs (~> 1.3) - nanoc-core (= 4.12.16) + nanoc-core (= 4.13.0) + pry zeitwerk (~> 2.1) - nanoc-core (4.12.16) + nanoc-core (4.13.0) + base64 (~> 0.2) concurrent-ruby (~> 1.1) ddmetrics (~> 1.0) ddplugin (~> 1.0) immutable-ruby (~> 0.1) json_schema (~> 0.19) memo_wise (~> 1.5) - psych (~> 4.0) + psych (>= 4.0, < 6.0) slow_enumerator_tools (~> 1.0) tty-platform (~> 0.2) zeitwerk (~> 2.1) @@ -105,61 +116,71 @@ GEM nanoc-checking (~> 1.0) nanoc-cli (~> 4.11, >= 4.11.15) nanoc-core (~> 4.11, >= 4.11.15) - nanoc-live (1.0.0) + nanoc-live (1.1.0) adsf-live (~> 1.4) listen (~> 3.0) nanoc-cli (~> 4.11, >= 4.11.14) nanoc-core (~> 4.11, >= 4.11.14) nenv (0.3.0) - nio4r (2.5.9) - nokogiri (1.15.4) + nio4r (2.7.3) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - pandoc-ruby (2.1.7) - parallel (1.23.0) + ostruct (0.6.0) + pandoc-ruby (2.1.10) + parallel (1.26.3) pastel (0.8.0) tty-color (~> 0.5) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - psych (4.0.6) + pstore (0.1.3) + psych (5.1.2) stringio - public_suffix (5.0.3) - puma (6.3.1) + public_suffix (6.0.1) + puma (6.4.3) nio4r (~> 2.0) - puppeteer-ruby (0.45.3) - concurrent-ruby (>= 1.1, < 1.3) + puppeteer-ruby (0.45.6) + concurrent-ruby (>= 1.1, < 1.4) mime-types (>= 3.0) websocket-driver (>= 0.6.0) - racc (1.7.1) - rack (3.0.8) + racc (1.8.1) + rack (3.1.7) rack-livereload (0.5.1) rack rackup (2.1.0) rack (>= 3) webrick (~> 1.8) rainpress (1.0.1) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rbtree (0.4.6) - rexml (3.2.6) + reline (0.5.10) + io-console (~> 0.5) + rexml (3.3.7) rubypants (0.7.1) + sass-embedded (1.79.3) + google-protobuf (~> 4.27) + rake (>= 13) sassc (2.4.0) ffi (~> 1.9) - set (1.0.1) + set (1.1.0) shellany (0.0.1) slow_enumerator_tools (1.1.0) sorted_set (1.0.3) rbtree set (~> 1.0) - stringio (3.0.8) + stringio (3.1.1) terminal-notifier (2.0.0) terminal-notifier-guard (1.7.0) - thor (1.2.2) + terser (1.2.3) + execjs (>= 0.3.0, < 3) + thor (1.3.2) tty-color (0.6.0) tty-command (0.10.1) pastel (~> 0.8) @@ -169,21 +190,21 @@ GEM rubypants tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2023.3) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uglifier (4.2.0) + uglifier (4.2.1) execjs (>= 0.3.0, < 3) w3c_validators (1.3.7) json (>= 1.8) nokogiri (~> 1.6) rexml (~> 3.2) - webrick (1.8.1) + webrick (1.8.2) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) words_counted (1.0.3) yui-compressor (0.12.0) - zeitwerk (2.6.11) + zeitwerk (2.6.18) PLATFORMS ruby @@ -198,15 +219,19 @@ DEPENDENCIES icalendar kramdown kramdown-math-katex + logger nanoc nanoc-live pandoc-ruby + pstore puma puppeteer-ruby rainpress + sass-embedded sassc terminal-notifier terminal-notifier-guard + terser typogruby tzinfo tzinfo-data @@ -216,4 +241,4 @@ DEPENDENCIES yui-compressor BUNDLED WITH - 2.3.6 + 2.5.20 diff --git a/README.md b/README.md index 0831bdca..2e244e3e 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,9 @@ These instructions will get you a copy of the project up and running on your loc ### Prerequisites -You will need Ruby (gem), yarn and pandoc (optional). Installation instructions are listed below. +You will need Ruby (gem) and pandoc (optional). Installation instructions are listed below. * [Ruby](https://www.ruby-lang.org/en/documentation/installation/) -* [yarn](yarnpkg.com/en/docs/install) * [pandoc](https://pandoc.org/installing.html) (optional, install if you want to see the reports) ### Installing @@ -28,11 +27,10 @@ If bundler is not yet installed on your system, make sure to install it using th gem install bundler ``` -In the root directory of the project, execute following commands +In the root directory of the project, execute following command ```bash bundle install -yarn install ``` You will (momentarily) also need `pandoc` and `latex` to compile the reports from the board meetings. Refer to your OS package manager to install these things. @@ -53,6 +51,14 @@ Our official meeting reports are added as a submodule so they update automatical git submodule update --init --recursive ``` +### For Nix users + +If you are using Nix, you can use the provided `shell.nix` file to get a shell with all the required dependencies. + +```bash +nix-shell +``` + ### Deploying The latest and greatest builds on master get deployed automatically using [travis](https://travis-ci.org). diff --git a/Rules b/Rules index a74b4ba7..40b9fece 100644 --- a/Rules +++ b/Rules @@ -10,6 +10,8 @@ require 'kramdown-math-katex' # Important!!! # First ignore the node_modules, we do not need any of it on the site directly. ignore '/node_modules/**/*' +ignore '/assets/stylesheets/bulma/**/*' +ignore '/assets/stylesheets/bulma-timeline/**/*' # # @@ -19,8 +21,6 @@ ignore '/node_modules/**/*' preprocess do - `yarn` - # We don't want to compile old blogposts in development ignore_old_content('blog', 'events', 'about/verslagen') if development? @@ -227,22 +227,22 @@ end # ASSETS # compile '/assets/scripts/**/*.js' do - filter :uglify_js, harmony: true if production? + filter :terser if production? end ignore '/data/**/*' - ignore '/assets/stylesheets/includes/**/*' + compile '/assets/stylesheets/**/*.scss' do # This filter is necessary for the workaround present in main.scss and deals with out of date dependencies filter :erb sass_opts = { syntax: :scss, - load_paths: ['content/assets/stylesheets'] + load_paths: ['content/assets/stylesheets'], } sass_opts[:style] = :compressed if production? - filter :sassc, sass_opts + filter :dart_sass_custom, sass_opts filter :autoprefixer if production? write ext: 'css' diff --git a/content/assets/stylesheets/bulma b/content/assets/stylesheets/bulma new file mode 160000 index 00000000..3fd2f650 --- /dev/null +++ b/content/assets/stylesheets/bulma @@ -0,0 +1 @@ +Subproject commit 3fd2f6502678c09dc39d2fe37980b88c2c5bc534 diff --git a/content/assets/stylesheets/bulma-timeline b/content/assets/stylesheets/bulma-timeline new file mode 160000 index 00000000..e01f4154 --- /dev/null +++ b/content/assets/stylesheets/bulma-timeline @@ -0,0 +1 @@ +Subproject commit e01f4154af4740be24749f618d5e1954968b731f diff --git a/content/assets/stylesheets/includes/about.scss b/content/assets/stylesheets/includes/about.scss index df954a3f..974eabd4 100644 --- a/content/assets/stylesheets/includes/about.scss +++ b/content/assets/stylesheets/includes/about.scss @@ -125,10 +125,9 @@ table.board-table { } .contact-text-link { - color: $text; + color: var(--bulma-text); border-bottom: 1px solid $secondary; margin-top: 7px; - //font-size: 1.5em; } .contact-text-link:hover { diff --git a/content/assets/stylesheets/includes/blogpost.scss b/content/assets/stylesheets/includes/blogpost.scss index 4ecdbbba..1b1dc3d6 100644 --- a/content/assets/stylesheets/includes/blogpost.scss +++ b/content/assets/stylesheets/includes/blogpost.scss @@ -12,14 +12,7 @@ .titlewrap { position: relative; margin: auto; - - .title { - @include tablet { - font-size: 4rem; - } - font-weight: bolder; - } - + .subtitle { position: absolute; diff --git a/content/assets/stylesheets/includes/eventpage.scss b/content/assets/stylesheets/includes/eventpage.scss index b3c85ee7..93774695 100644 --- a/content/assets/stylesheets/includes/eventpage.scss +++ b/content/assets/stylesheets/includes/eventpage.scss @@ -22,6 +22,7 @@ .header-text { padding: 20px; + color: var(--bulma-text-40-invert); &.light-background { background-color: rgba(0, 0, 0, 0.75); @@ -57,11 +58,11 @@ } .event-tile-image { + max-width:200px; + max-height:200px; + // For now, don't show the event tile image on mobile, takes too much space @include mobile { display: none; } - - max-width:200px; - max-height:200px; } diff --git a/content/assets/stylesheets/includes/events.scss b/content/assets/stylesheets/includes/events.scss index 251604dd..172fc276 100644 --- a/content/assets/stylesheets/includes/events.scss +++ b/content/assets/stylesheets/includes/events.scss @@ -1,3 +1,4 @@ + .box.event-preview { border-radius: 0px; display: flex; @@ -16,11 +17,7 @@ padding-top:0px; box-shadow : none; width: 60%; - //for better spacing on mobile - @include mobile { - width: 100%; - } .title { font-size: 1.7em; font-weight: 500; @@ -50,6 +47,11 @@ font-size: 1.6em; font-weight: 400; } + + //for better spacing on mobile + @include mobile { + width: 100%; + } } .main-event { diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss index eb2656cc..08feb085 100644 --- a/content/assets/stylesheets/includes/general.scss +++ b/content/assets/stylesheets/includes/general.scss @@ -18,8 +18,6 @@ pre .line-numbers { margin-bottom: 10px; transition: all 0.15s ease; - - box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11), 0 1px 3px rgba(0, 0, 0, 0.08); } a.box:hover { @@ -40,23 +38,23 @@ a.box:hover { border-bottom: none; } - &:visited:hover { - color: $link-hover; - } + // &:visited:hover { + // color: $button-link-hover; + // } } } footer .content a { &:not(.button) { - color: $text-light; + color: $text-weak; &:visited { - color: $text-light; + color: $text-weak; } - &:hover { - color: $link-hover; - } + // &:hover { + // color: $button-link-hover; + // } } } @@ -232,12 +230,12 @@ footer.footer { background-image: -webkit-linear-gradient( to right, $zeus-orange, - #ffffff + var(--bulma-body-background-color) ); /* Chrome 10-25, Safari 5.1-6 */ background-image: linear-gradient( to right, $zeus-orange, - #ffffff + var(--bulma-body-background-color) ); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ background-repeat: no-repeat; background-size: 100% 0.15em; diff --git a/content/assets/stylesheets/includes/navbar.scss b/content/assets/stylesheets/includes/navbar.scss index 0bb05e1f..119d3011 100644 --- a/content/assets/stylesheets/includes/navbar.scss +++ b/content/assets/stylesheets/includes/navbar.scss @@ -18,13 +18,6 @@ } .navbar:not(.is-transparent) #logo-link { - @include desktop { - border-bottom: 2px solid $body-background; - margin-bottom: -2px; - width: 124px; - } - - #logo { @include desktop { max-width: none; @@ -35,6 +28,12 @@ position: absolute; } } + + @include desktop { + border-bottom: 2px solid var(--bulma-body-background-color); + margin-bottom: -2px; + width: 124px; + } } .navbar-item { @@ -42,23 +41,17 @@ font-size: 1.15em; } - @include touch { - .navbar-menu { - position: absolute; - width: 100%; - } - } - .navbar:not(.is-transparent) { .navbar-item { &:not(.is-active) { - color: #7a7a7a; + color: var(--bulma-text-title-l); } &.is-active { color: $primary; border-bottom: 2px solid; margin-bottom: -2px; + background-color: transparent; } } } @@ -70,4 +63,15 @@ transform: rotate(10deg); } } + + @include touch { + .navbar-menu { + position: absolute; + width: 100%; + } + } } + +.hero-head #navbar .navbar-item { + color: var(--bulma-text-30-invert); +} \ No newline at end of file diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss index b34c3cfd..002e55bc 100644 --- a/content/assets/stylesheets/includes/tiles.scss +++ b/content/assets/stylesheets/includes/tiles.scss @@ -83,6 +83,7 @@ $top_coder_size: 80px; justify-content: center; table { + width: 100%; position: relative; tr:first-child { diff --git a/content/assets/stylesheets/includes/toc.scss b/content/assets/stylesheets/includes/toc.scss index 252f50da..a86518cd 100644 --- a/content/assets/stylesheets/includes/toc.scss +++ b/content/assets/stylesheets/includes/toc.scss @@ -1,15 +1,6 @@ // CSS related to the TOC #table-of-contents { - @include tablet { - position: absolute; - left: 100%; - } - - @include mobile { - text-align: center; - } - #markdown-toc { @extend .menu-list; @@ -18,6 +9,15 @@ list-style: none; } } + + @include tablet { + position: absolute; + left: 100%; + } + + @include mobile { + text-align: center; + } } $sel: ''; diff --git a/content/assets/stylesheets/includes/variables.scss b/content/assets/stylesheets/includes/variables.scss deleted file mode 100644 index 058be26c..00000000 --- a/content/assets/stylesheets/includes/variables.scss +++ /dev/null @@ -1,38 +0,0 @@ -// Colours -$zeus-orange: #ff7f00; -$zeus-blue: #00c4ff; - -$body-background: #fff; -$body-size: 1rem; - -$tile-orange: $zeus-orange; - -$navbar-border-color: #ccc; -$event-border-color: #ddd; - -$orange: $zeus-orange; -$blue: $zeus-blue; -$turquoise: #30d1b2; - -$link: $orange; -$link-visited: $link; - -$border-hover: $blue; - -$box-colour: #eee; -$highlighted-box-colour: $zeus-orange; -$highlighted-text-colour: #fff; -$highlighted-link-colour: #222324; - -$cammie-controls-color: rgba(0, 0, 0, .60); - -$event-padding: 10px; - -$primary: $orange; -$secondary: $zeus-blue; -$tertiary: $box-colour; - -// Let's trust the font the user chose -$family-sans-serif: sans-serif; - -$timeline-content-padding: 0.55em 0 0 2em; diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index 1e3dc90a..7df18db8 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -3,10 +3,60 @@ // <% @items.find_all('/assets/stylesheets/includes/*').each {|e| e.raw_content } %> /* KEEP THIS ^^^^ */ -@import "includes/variables"; -@import "node_modules/bulma/bulma"; -@import "node_modules/bulma-timeline/src/sass/index.sass"; +// Colours +$zeus-orange: #ff7f00; +$zeus-blue: #00c4ff; + +$body-background: #fff; +$body-size: 1rem; + +$tile-orange: $zeus-orange; + +$navbar-border-color: #ccc; +$event-border-color: #ddd; + +$orange: $zeus-orange; +$blue: $zeus-blue; +$turquoise: #30d1b2; + +$link: $orange; +$link-visited: $link; + +$border-hover: $blue; + +$box-colour: #eee; +$highlighted-box-colour: $zeus-orange; +$highlighted-text-colour: #fff; +$highlighted-link-colour: #222324; + +$cammie-controls-color: rgba(0, 0, 0, .60); + +$event-padding: 10px; + +$primary: $orange; +$secondary: $zeus-blue; +$tertiary: $box-colour; + +// Let's trust the font the user chose +$family-sans-serif: sans-serif; + +$timeline-content-padding: 0.55em 0 0 2em; + +@use "bulma/sass" with ( + $primary: $zeus-orange, + $link: $zeus-orange, +); + +a, .tabs li.is-active a { + color: $link; + border-bottom-color: $link; +} + +// @import "bulma/bulma"; +@import "bulma/sass/utilities/mixins"; +@import "bulma/sass/utilities/_index"; +@import "bulma-timeline/src/sass/index"; // Sticky footer body { diff --git a/content/contact.erb b/content/contact.erb index 09ca783d..66a86ff1 100644 --- a/content/contact.erb +++ b/content/contact.erb @@ -106,64 +106,59 @@ contact_links:
+ BE03 7340 5456 0384 +
+
+ Please use the message
+ +32 9 264 47 51
+ Internal: 4751
+
- BE03 7340 5456 0384 -
-
- Please use the message
+ You can find our hiding place, or what we call 'de kelder' at the basement level of following address: +
++ Krijgslaan 281+
+ Campus Sterre S9
+ 9000 Gent
+
The FI-number (internal UGent-ID for rooms) is 40.09.090.010
+ - - -
- +32 9 264 47 51
- Internal: 4751
-
- You can find our hiding place, or what we call 'de kelder' at the basement level of following address: -
-- Krijgslaan 281-
- Campus Sterre S9
- 9000 Gent
-
The FI-number (internal UGent-ID for rooms) is 40.09.090.010
-- Zeus WPI is the student association for Computer Science at Ghent University. - Our goal is to provide a stimulating environment for motivated students looking to expand their skills by engaging in interesting real-world projects. -
+ <% end %> +- We organize various tech related events, such as talks by experts, hands-on coding events and introductory lectures for interesting technologies. - Together we build applications for Ghent University students (Hydra), for 12urenloop and of course for ourselves. -
-+ Zeus WPI is the student association for Computer Science at Ghent University. + Our goal is to provide a stimulating environment for motivated students looking to expand their skills by engaging in interesting real-world projects. +
+ ++ We organize various tech related events, such as talks by experts, hands-on coding events and introductory lectures for interesting technologies. + Together we build applications for Ghent University students (Hydra), for 12urenloop and of course for ourselves. +
+No sponsoring members yet for this academic year. Interested? Contact the board.
+No sponsors yet for this academic year. Interested? Contact the board.
++
<%= item[:title] %> @@ -54,7 +54,7 @@
-+
<%= item[:description] %>