Skip to content
Snippets Groups Projects
Unverified Commit 88bf3455 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Migrate to Bulma 1.0

parent f6602a92
No related branches found
No related tags found
No related merge requests found
Pipeline #177219 passed
Stage: deploy
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 180 additions and 61 deletions
package.json
+ 1
− 1
View file @ 88bf3455
{
"dependencies": {
"bulma": "^0.9.4",
"bulma": "^1.0.0",
"@fortawesome/fontawesome-free": "^6.5.1"
}
}
sass/_menu.scss
+ 6
− 5
View file @ 88bf3455
// https://codepen.io/Nikitoss334/details/KLxaJK
// FIXME clarify license
@use "../node_modules/bulma/sass/utilities/mixins";
@use "./_teckids.scss";
.navbar-toggle {
display: none;
}
......@@ -47,7 +50,7 @@
}
#main-navbar {
background-color: $teckids-orange;
background-color: teckids.$orange;
}
#main-navbar .navbar-brand > a {
......@@ -55,14 +58,14 @@
font-weight: bold;
}
@include desktop {
@include mixins.desktop {
#main-menu > div > .navbar-item > a {
color: white;
font-weight: bold;
}
#main-menu > div > .navbar-item > a:hover {
color: $teckids-orange;
color: teckids.$orange;
}
}
......@@ -71,5 +74,3 @@
filter: saturate(0) brightness(0) invert(1);
}
}
$navbar-burger-color: white;
sass/_teckids.scss
+ 11
− 14
View file @ 88bf3455
This diff is collapsed.
sass/style.scss
+ 16
− 13
View file @ 88bf3455
@charset "utf-8";
$family-sans-serif: "Roboto", sans-serif;
$title-color: inherit;
@use "../node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss";
@use "../node_modules/@fortawesome/fontawesome-free/scss/brands.scss";
@use "../node_modules/@fortawesome/fontawesome-free/scss/solid.scss";
@import "./_teckids.scss";
$footer-background-color: $teckids-blue-light;
$primary: $teckids-orange;
@use "./_teckids.scss";
@import "../node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss";
@import "../node_modules/@fortawesome/fontawesome-free/scss/brands.scss";
@import "../node_modules/@fortawesome/fontawesome-free/scss/solid.scss";
@use "../node_modules/bulma/sass" with (
$family-sans-serif: '"Roboto", sans-serif',
$title-color: inherit,
$scheme-main-bis: teckids.$blue-light,
$primary: teckids.$orange,
$info: teckids.$blue,
$link: teckids.$blue,
$navbar-burger-color: white,
);
@import "../node_modules/bulma/bulma.sass";
@import "./_menu.scss";
@import "./_content.scss";
@import "./_utils.scss";
@use "./_menu.scss";
@use "./_content.scss";
@use "./_utils.scss";
templates/blog/post.html
+ 1
− 1
View file @ 88bf3455
......@@ -2,7 +2,7 @@
{% block content %}
{% set post = page -%}
<div class="columns">
<div class="columns mt-4">
<div class="column is-three-quarters">
<div class="content">
{{ page.content | safe }}
......
templates/frontpage/blog.html
+ 1
− 1
View file @ 88bf3455
......@@ -2,7 +2,7 @@
<section class="section">
<div class="container">
<h2 class="title is-2">{{ title | default(value="Aus dem Teckids-Blog") }}</h2>
<div class="columns is-multiline is-same-height">
<div class="columns is-multiline is-same-height mt-4">
{% for post in blog_section.pages | slice(end=4) %}
<div class="column is-one-third">
{% include "blog/card.html" %}
......
templates/frontpage/claim.html
+ 4
− 4
View file @ 88bf3455
......@@ -5,19 +5,19 @@
<div class="hero-body">
<div class="container">
<p class="title is-1 has-text-centered">{{ section.extra.headlines.claims }}</p>
<div class="columns ">
<div class="columns is-same-height mt-4">
{% for claim in section.extra.claims %}
<div class="column is-one-third">
<div class="frontpage-claim-box">
<div class="box frontpage-claim-box">
<div class="columns is-vcentered">
<div class="colum">
<div class="column">
<img src="/{{ claim.image }}" alt="image">
</div>
<div class="column is-four-fifths">
<h1 class="title is-3">{{ claim.title }}</h1>
</div>
</div>
<p > {{ claim.content }}</p>
<p>{{ claim.content }}</p>
</div>
</div>
{% endfor %}
......
templates/frontpage/projects.html
+ 12
− 17
View file @ 88bf3455
......@@ -3,32 +3,27 @@
<section class="section">
<div class="container">
<h2 class="title is-2">{{ section.extra.headlines.projects }}</h2>
<div class="columns">
<div class="columns is-same-height mt-4">
{% for project_section_path in projects_section.subsections %}
{% set project_section = get_section(path=project_section_path) %}
<div class="column">
<div class="column is-one-third">
<div class="card is-shadowless">
<div class="columns is-centered">
<div class="card-image">
<figure class="image is-70p">
<a href="{{ project_section.permalink }}"><img src="{{ project_section.extra.title_icon }}" alt="Logo {{ project_section.title }}" /></a>
</figure>
</div>
</div>
<div class="card-content">
<div class="media">
<div class="media-content">
<a href="{{ project_section.permalink }}"><h3 class="title is-3">{{ project_section.title }}</h3></a>
<div class="card-content">
<a href="{{ project_section.permalink }}"><h3 class="title is-3">{{ project_section.title }}</h3></a>
<div class="content">
{{ project_section.description }}
<ul>
{% for thesis in project_section.extra.theses %}
<li>{{ thesis }}</li>
{% endfor %}
</ul>
</div>
</div>
<div class="content">
{{ project_section.description }}
<ul>
{% for thesis in project_section.extra.theses %}
<li>{{ thesis }}</li>
{% endfor %}
</ul>
</div>
</div>
</div>
{% endfor %}
......
templates/page.html
+ 1
− 1
View file @ 88bf3455
......@@ -5,7 +5,7 @@
<div class="container">
<h1 class="title is-1">{{ page.title }}</h1>
{% block content %}
<div class="content">
<div class="content mt-4">
{{ page.content | safe }}
</div>
{% endblock content %}
......
yarn.lock
+ 127
− 4
View file @ 88bf3455
......@@ -7,7 +7,130 @@
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz#55cc8410abf1003b726324661ce5b0d1c10de258"
integrity sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==
bulma@^0.9.4:
version "0.9.4"
resolved "https://registry.npmjs.org/bulma/-/bulma-0.9.4.tgz"
integrity sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==
anymatch@~3.1.2:
version "3.1.3"
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
dependencies:
normalize-path "^3.0.0"
picomatch "^2.0.4"
binary-extensions@^2.0.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
braces@~3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
dependencies:
fill-range "^7.0.1"
bulma@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/bulma/-/bulma-1.0.0.tgz#95e8ffa4feb8d64aa1c54a4f0ac6da08e0260672"
integrity sha512-7n49v/gdHXaHcU9fVobqGXO2OguiCoMh6CLbeX7jq00XrZ5vOSE4LNS0S/0Q6rlBbckY6kk6W7LwqxS0nu4bug==
dependencies:
sass "^1.71.1"
"chokidar@>=3.0.0 <4.0.0":
version "3.6.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
dependencies:
anymatch "~3.1.2"
braces "~3.0.2"
glob-parent "~5.1.2"
is-binary-path "~2.1.0"
is-glob "~4.0.1"
normalize-path "~3.0.0"
readdirp "~3.6.0"
optionalDependencies:
fsevents "~2.3.2"
fill-range@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
dependencies:
to-regex-range "^5.0.1"
fsevents@~2.3.2:
version "2.3.3"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
glob-parent@~5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
dependencies:
is-glob "^4.0.1"
immutable@^4.0.0:
version "4.3.5"
resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.5.tgz#f8b436e66d59f99760dc577f5c99a4fd2a5cc5a0"
integrity sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==
is-binary-path@~2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
dependencies:
binary-extensions "^2.0.0"
is-extglob@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
is-glob@^4.0.1, is-glob@~4.0.1:
version "4.0.3"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
dependencies:
is-extglob "^2.1.1"
is-number@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
normalize-path@^3.0.0, normalize-path@~3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
picomatch@^2.0.4, picomatch@^2.2.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
readdirp@~3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
dependencies:
picomatch "^2.2.1"
sass@^1.71.1:
version "1.72.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.72.0.tgz#5b9978943fcfb32b25a6a5acb102fc9dabbbf41c"
integrity sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
source-map-js ">=0.6.2 <2.0.0"
"source-map-js@>=0.6.2 <2.0.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
to-regex-range@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
dependencies:
is-number "^7.0.0"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment