From 1b93c13d26d7038e7b4ad0e73d79bf0abe379aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hozda?=
Date: Tue, 6 Oct 2020 06:22:08 +0200
Subject: [PATCH] video stuff
---
package-lock.json | 5 +++
package.json | 1 +
src/routes/home.html | 14 --------
src/routes/index.svelte | 4 +++
src/routes/prebiram.svelte | 8 +++++
src/routes/predseda.svelte | 44 +++++++++++------------
src/routes/zalozit-spolek.svelte | 4 +++
src/routes/zapojit-se.svelte | 61 +++++++++++++++++++++++++-------
src/template.html | 2 ++
static/glide.core.min.css | 1 +
static/glide.theme.min.css | 1 +
static/main.css | 21 +++++++----
static/main.styl | 11 +++---
13 files changed, 116 insertions(+), 61 deletions(-)
delete mode 100644 src/routes/home.html
create mode 100644 static/glide.core.min.css
create mode 100644 static/glide.theme.min.css
diff --git a/package-lock.json b/package-lock.json
index 06f21a7..8fe6299 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1068,6 +1068,11 @@
"siema": "^1.5.1"
}
},
+ "@glidejs/glide": {
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/@glidejs/glide/-/glide-3.4.1.tgz",
+ "integrity": "sha512-C34AEcK1HjSyxilRToUL54I6KAoodojUbeRlXoruobZuG0eGm8xfDL+3kgkWj7AJK4EZtunSOYfoqMp70eDtwg=="
+ },
"@polka/url": {
"version": "1.0.0-next.11",
"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.11.tgz",
diff --git a/package.json b/package.json
index 2d5622b..3c315cf 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
"test": "run-p --race dev cy:run"
},
"dependencies": {
+ "@glidejs/glide": "^3.4.1",
"animejs": "^3.2.0",
"compression": "^1.7.1",
"polka": "next",
diff --git a/src/routes/home.html b/src/routes/home.html
deleted file mode 100644
index bbf050b..0000000
--- a/src/routes/home.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-i
-sa
-da
-d
-da
-sd
-ads
-sd
-
-sad
-sad
-sa
-
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 2c1ab51..6102261 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -214,6 +214,10 @@
});
+
+ PedF UK Spolky |
+
+
diff --git a/src/routes/prebiram.svelte b/src/routes/prebiram.svelte
index aec5edc..a247b0e 100644
--- a/src/routes/prebiram.svelte
+++ b/src/routes/prebiram.svelte
@@ -11,6 +11,10 @@
import ZjistiBtn from '../components/zjisti-vice.svelte';
+
+ PedF UK Spolky | Přebírám spolek
+
+
@@ -250,6 +254,10 @@
Aby toho všeho nebylo málo, tady máš rady od bývalých i současných předsedů:
+
diff --git a/src/routes/predseda.svelte b/src/routes/predseda.svelte
index 5c62f68..b7a004e 100644
--- a/src/routes/predseda.svelte
+++ b/src/routes/predseda.svelte
@@ -9,8 +9,17 @@
import UpArrow from '../components/up.svelte';
import MenuBtn from '../components/menu-btn.svelte';
import ZjistiBtn from '../components/zjisti-vice.svelte';
+ import { onMount } from 'svelte';
+
+ onMount(async () => {
+ window.currentSlide(1);
+ })
+
+ PedF UK Spolky | Předseda spolku
+
+
@@ -57,12 +66,12 @@
A jak na ní?
- To ti řekne Verča
+ To ti řekne Nela
@@ -265,6 +274,7 @@ S tímhle ale přichází i nějaké povinnosti, které je potřeba dodržovat:
www.naucmese.cz nebo na
https://www.acsa.cz
+ A jak to dělají další spolky na fakultě?
@@ -276,31 +286,23 @@ S tímhle ale přichází i nějaké povinnosti, které je potřeba dodržovat:
1 / 3
-
-
Caption Text
+
2 / 3
-
-
Caption Two
-
-
-
-
3 / 3
-
-
Caption Three
-
-
-
-
3 / 3
-
-
Caption Three
+
- ❮
- ❯
+ ❮
+ ❯
@@ -308,8 +310,6 @@ S tímhle ale přichází i nějaké povinnosti, které je potřeba dodržovat:
-
-
diff --git a/src/routes/zalozit-spolek.svelte b/src/routes/zalozit-spolek.svelte
index a5cc803..dd6455e 100644
--- a/src/routes/zalozit-spolek.svelte
+++ b/src/routes/zalozit-spolek.svelte
@@ -11,6 +11,10 @@
import ZjistiBtn from '../components/zjisti-vice.svelte';
+
+ PedF UK Spolky | Založit spolek
+
+
diff --git a/src/routes/zapojit-se.svelte b/src/routes/zapojit-se.svelte
index 1f1aa2c..7b6983c 100644
--- a/src/routes/zapojit-se.svelte
+++ b/src/routes/zapojit-se.svelte
@@ -13,10 +13,19 @@
import MenuBtn from '../components/menu-btn.svelte';
import ZjistiBtn from '../components/zjisti-vice.svelte';
import Carousel from '@beyonk/svelte-carousel';
+ import { onMount } from 'svelte';
+ import Glide from '@glidejs/glide';
+
+ onMount(async () => {
+ new Glide('.glide').mount()
+ });
-
+
+ PedF UK Spolky | Chci se zapojit
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
diff --git a/src/template.html b/src/template.html
index 0b6bf8e..4c4ba13 100644
--- a/src/template.html
+++ b/src/template.html
@@ -13,6 +13,8 @@
+
+
%sapper.scripts%
diff --git a/static/glide.core.min.css b/static/glide.core.min.css
new file mode 100644
index 0000000..60a1094
--- /dev/null
+++ b/static/glide.core.min.css
@@ -0,0 +1 @@
+.glide{position:relative;width:100%;box-sizing:border-box}.glide *{box-sizing:inherit}.glide__track{overflow:hidden}.glide__slides{position:relative;width:100%;list-style:none;backface-visibility:hidden;transform-style:preserve-3d;touch-action:pan-Y;overflow:hidden;padding:0;white-space:nowrap;display:flex;flex-wrap:nowrap;will-change:transform}.glide__slides--dragging{user-select:none}.glide__slide{width:100%;height:100%;flex-shrink:0;white-space:normal;user-select:none;-webkit-touch-callout:none;-webkit-tap-highlight-color:transparent}.glide__slide a{user-select:none;-webkit-user-drag:none;-moz-user-select:none;-ms-user-select:none}.glide__arrows{-webkit-touch-callout:none;user-select:none}.glide__bullets{-webkit-touch-callout:none;user-select:none}.glide--rtl{direction:rtl}
diff --git a/static/glide.theme.min.css b/static/glide.theme.min.css
new file mode 100644
index 0000000..4dbfee5
--- /dev/null
+++ b/static/glide.theme.min.css
@@ -0,0 +1 @@
+.glide__arrow{position:absolute;display:block;top:50%;z-index:2;color:white;text-transform:uppercase;padding:9px 12px;background-color:transparent;border:2px solid rgba(255,255,255,0.5);border-radius:4px;box-shadow:0 0.25em 0.5em 0 rgba(0,0,0,0.1);text-shadow:0 0.25em 0.5em rgba(0,0,0,0.1);opacity:1;cursor:pointer;transition:opacity 150ms ease, border 300ms ease-in-out;transform:translateY(-50%);line-height:1}.glide__arrow:focus{outline:none}.glide__arrow:hover{border-color:white}.glide__arrow--left{left:2em}.glide__arrow--right{right:2em}.glide__arrow--disabled{opacity:0.33}.glide__bullets{position:absolute;z-index:2;bottom:2em;left:50%;display:inline-flex;list-style:none;transform:translateX(-50%)}.glide__bullet{background-color:rgba(255,255,255,0.5);width:9px;height:9px;padding:0;border-radius:50%;border:2px solid transparent;transition:all 300ms ease-in-out;cursor:pointer;line-height:0;box-shadow:0 0.25em 0.5em 0 rgba(0,0,0,0.1);margin:0 0.25em}.glide__bullet:focus{outline:none}.glide__bullet:hover,.glide__bullet:focus{border:2px solid white;background-color:rgba(255,255,255,0.5)}.glide__bullet--active{background-color:white}.glide--swipeable{cursor:grab;cursor:-moz-grab;cursor:-webkit-grab}.glide--dragging{cursor:grabbing;cursor:-moz-grabbing;cursor:-webkit-grabbing}
diff --git a/static/main.css b/static/main.css
index 8f54659..f0f7ee1 100644
--- a/static/main.css
+++ b/static/main.css
@@ -189,28 +189,35 @@ canvas {
margin-left: 2vw;
margin-top: 8vh;
}
-.number-thing span {
+.number-thing span,
+.number-thing .down span {
color: var(--color-primary);
font-size: calc(var(--font-size) * 2.2);
}
-.number-thing p {
- font-size: calc(var(--font-size) / 2.3);
+.number-thing p,
+.number-thing .down p {
+ font-size: calc(var(--font-size) / 2);
margin-bottom: 0;
}
-.number-thing li {
+.number-thing li,
+.number-thing .down li {
font-size: calc(var(--font-size) / 2);
text-align: justify;
}
-.number-thing ol {
+.number-thing ol,
+.number-thing .down ol {
margin-top: 0;
margin-left: 2vw;
}
-.number-thing ol li {
+.number-thing ol li,
+.number-thing .down ol li {
counter-increment: list;
list-style-type: none;
+ font-size: calc(var(--font-size) / 2);
position: relative;
}
-.number-thing ol li:before {
+.number-thing ol li:before,
+.number-thing .down ol li:before {
font-size: 110%;
font-weight: 900;
color: var(--color-primary);
diff --git a/static/main.styl b/static/main.styl
index 7ba58d6..b7302e3 100644
--- a/static/main.styl
+++ b/static/main.styl
@@ -185,21 +185,22 @@ body > canvas
margin-right: 2vw
margin-left: 2vw
margin-top: 8vh
- & span
+ & span, & .down span
color var(--color-primary)
font-size calc(var(--font-size) * 2.2)
- & p
- font-size calc(var(--font-size) / 2.3)
+ & p, & .down p
+ font-size calc(var(--font-size) / 2)
margin-bottom 0
- & li
+ & li, & .down li
font-size calc(var(--font-size) / 2)
text-align justify
- & ol
+ & ol, & .down ol
margin-top 0
margin-left 2vw
& li
counter-increment: list
list-style-type: none;
+ font-size calc(var(--font-size) / 2)
position: relative;
&:before
font-size 110%