summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorCamil Staps2023-11-22 21:08:52 +0100
committerCamil Staps2023-11-22 21:08:52 +0100
commitbb88f0eb95b32200721041a6cfee01308e3a050d (patch)
tree96ec8a6ea9b77f42487fdec68cb9faa39a80d281
parentAdd draft of article on kī on LingBuzz (diff)
Revert "Add election modal"
This reverts commit 55018f61401c494197407f6cedc3e3a91a444b87.
-rw-r--r--gulpfile.js2
-rw-r--r--resources/pug/finals/index.pug43
-rw-r--r--resources/pug/include/layout-sidebar.pug5
-rw-r--r--resources/pug/include/layout.pug3
4 files changed, 4 insertions, 49 deletions
diff --git a/gulpfile.js b/gulpfile.js
index 927b6c6..fa322d0 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -84,9 +84,7 @@ function html() {
function js() {
var src = [
- './node_modules/bootstrap-sass/assets/javascripts/bootstrap/carousel.js',
'./node_modules/bootstrap-sass/assets/javascripts/bootstrap/collapse.js',
- './node_modules/bootstrap-sass/assets/javascripts/bootstrap/modal.js',
'./node_modules/bootstrap-sass/assets/javascripts/bootstrap/transition.js',
'./node_modules/jquery/dist/jquery.slim.min.js',
];
diff --git a/resources/pug/finals/index.pug b/resources/pug/finals/index.pug
index baf8509..fc17765 100644
--- a/resources/pug/finals/index.pug
+++ b/resources/pug/finals/index.pug
@@ -6,7 +6,7 @@ block extra_head
block titleContainer
block content
- header(style="position:relative;")
+ header
div(style="display:table-row;")
img#profile(alt="Camil Staps", style="vertical-align:bottom;", src="/assets/img/profile.jpg", width="170")
div#basicinfo(style="display:table-cell;vertical-align:bottom;")
@@ -40,50 +40,9 @@ block content
|  
a(href="https://nl.linkedin.com/in/camilstaps")
i.fab.fa-lg.fa-linkedin(title="LinkedIn")
- h1(style="top:0;right:0;position:absolute;")
- a(href="#tk2023", title="Election of the Dutch House of representatives", data-toggle="modal")
- i.fas.fa-person-booth
hr
- div.modal.fade#tk2023(tabindex="-1", role="dialog", aria-lbaelledby="tk2023-title")
- div.modal-dialog.modal-lg(role="document")
- div.modal-content
- div.modal-header
- h4.modal-title#tk2023-title Election of the Dutch House of representatives 2023
- div.modal-body
- p Informeer je en ga stemmen.
- p
- | Dit is de verwachte invloed van de plannen van de verschillende partijen op
- a(href="#tk2023-carousel", data-slide-to="0") lasten voor gezinnen
- |,
- a(href="#tk2023-carousel", data-slide-to="1") lasten voor bedrijven
- |,
- a(href="#tk2023-carousel", data-slide-to="2") koopkracht
- |,
- a(href="#tk2023-carousel", data-slide-to="3") armoede
- | en
- a(href="#tk2023-carousel", data-slide-to="4") werkloosheid
- |.
-
- div.carousel.slide#tk2023-carousel(data-ride="carousel", data-interval="false")
- div.carousel-inner(role="listbox")
- div.item.active
- img(src="https://files.camilstaps.nl/cpb/lasten-voor-gezinnen.png")
- div.item
- img(src="https://files.camilstaps.nl/cpb/lasten-voor-bedrijven.png")
- div.item
- img(src="https://files.camilstaps.nl/cpb/koopkracht.png")
- div.item
- img(src="https://files.camilstaps.nl/cpb/armoede.png")
- div.item
- img(src="https://files.camilstaps.nl/cpb/werkloosheid.png")
- div.modal-footer(style="text-align:left;")
- p
- | Het #[strong basispad] is de verwachte ontwikkeling bij ongewijzigd beleid. Bron:
- a(href="https://www.cpb.nl/keuzes-in-kaart-2025-2028") CPB
- |.
-
section
p.larger#lead
| I am a PhD candidate in linguistics.
diff --git a/resources/pug/include/layout-sidebar.pug b/resources/pug/include/layout-sidebar.pug
index bf8ce55..4244531 100644
--- a/resources/pug/include/layout-sidebar.pug
+++ b/resources/pug/include/layout-sidebar.pug
@@ -1,8 +1,9 @@
extends layout.pug
-block append js
- script(src='/assets/js/collapse.min.js')
+block prepend js
+ script(src='/assets/js/jquery.slim.min.js')
script(src='/assets/js/transition.min.js')
+ script(src='/assets/js/collapse.min.js')
block content
div.row
diff --git a/resources/pug/include/layout.pug b/resources/pug/include/layout.pug
index 71a1146..1cbf0f4 100644
--- a/resources/pug/include/layout.pug
+++ b/resources/pug/include/layout.pug
@@ -34,6 +34,3 @@ html(lang="en")
include foot.pug
block js
- script(src='/assets/js/jquery.slim.min.js')
- script(src='/assets/js/carousel.min.js')
- script(src='/assets/js/modal.min.js')