From 3b03fe190934f82f444aec9109609686c8d11347 Mon Sep 17 00:00:00 2001 From: jonasbul Date: Mon, 2 Oct 2023 11:43:57 +0200 Subject: [PATCH] feat: init of modals and checkboxtiles --- frontend/src/App.vue | 9 -- frontend/src/assets/main.css | 51 ++++++++++- frontend/src/assets/svgs/Close_Button.svg | 3 + .../svgs/checkboxtile/check-checked.svg | 4 + .../assets/svgs/checkboxtile/check-naked.svg | 5 ++ .../src/assets/svgs/content-layers-show.svg | 3 + frontend/src/assets/svgs/location-map.svg | 3 + .../src/components/checkbox/CheckboxTile.vue | 80 +++++++++++++++++ .../src/components/graph/KnowledgeGraph.vue | 2 +- .../src/components/headers/GlobalHeader.vue | 4 - frontend/src/components/map/LeafletMap.vue | 64 ++++++++++++-- frontend/src/components/modal/Layers.vue | 39 +++++++++ frontend/src/components/modal/MapButtons.vue | 85 +++++++++++++++++++ frontend/src/components/modal/Modal.vue | 11 +++ frontend/src/components/slider/Slider.vue | 16 ++-- 15 files changed, 349 insertions(+), 30 deletions(-) create mode 100644 frontend/src/assets/svgs/Close_Button.svg create mode 100644 frontend/src/assets/svgs/checkboxtile/check-checked.svg create mode 100644 frontend/src/assets/svgs/checkboxtile/check-naked.svg create mode 100644 frontend/src/assets/svgs/content-layers-show.svg create mode 100644 frontend/src/assets/svgs/location-map.svg create mode 100644 frontend/src/components/checkbox/CheckboxTile.vue create mode 100644 frontend/src/components/modal/Layers.vue create mode 100644 frontend/src/components/modal/MapButtons.vue create mode 100644 frontend/src/components/modal/Modal.vue diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 85cbe19..8545bd3 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -44,13 +44,4 @@ import GlobalHeader from "@/components/headers/GlobalHeader.vue"; margin-bottom: 24px; } -.body-large-regular b { - color: #333332; - font-family: Flanders Art Sans Regular, sans-serif; - font-size: 20px; - font-style: normal; - font-weight: 700; - line-height: 30px - -} \ No newline at end of file diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css index 71d5e13..ee819f6 100644 --- a/frontend/src/assets/main.css +++ b/frontend/src/assets/main.css @@ -24,6 +24,26 @@ body { flex-grow: 1; } +.primary-btn { + width: fit-content; + padding: 5px 20px 5px 20px; + align-items: center; + border: none; + border-radius: 3px; + background: #0055CC; + + color: #ffffff; + font-family: Flanders Art Sans, sans-serif; + font-size: 16px; + font-style: normal; + font-weight: 500; + line-height: 24px; /* 150% */ +} + +.primary-btn:hover { + background-color: #003bb0; +} + .secondary-btn { width: 116px; height: 38px; @@ -32,7 +52,6 @@ body { border: none; border-radius: 3px; background: #fff; - box-shadow: 0 2px 12px 0 rgba(106, 118, 134, 0.35); color: #0055CC; font-family: Flanders Art Sans, sans-serif; @@ -51,6 +70,14 @@ body { line-height: 24px; /* 150% */ } +.secondary-btn.active, .secondary-btn:hover { + border: 1px solid #0055CC; +} + +.shadow-medium { + box-shadow: 0 2px 12px 0 rgba(106, 118, 134, 0.35); +} + .header1 { color: #333332; font-family: Flanders Art Sans, sans-serif; @@ -60,6 +87,16 @@ body { line-height: 52px; } +.header2 { + color: #333332; + font-family: Flanders Art Sans, sans-serif; + font-size: 32px; + font-style: normal; + font-weight: 500; + line-height: 41px; /* 128.125% */ + +} + .header5 { color: #333332; font-family: Flanders Art Sans, sans-serif; @@ -76,7 +113,19 @@ body { font-style: normal; font-weight: 400; line-height: 30px; /* 150% */ +} + +.body-medium-regular { + color: #333332; + font-family: Flanders Art Sans Regular, sans-serif; + font-size: 18px; + font-style: normal; + font-weight: 400; + line-height: 27px; /* 150% */ +} +b { + font-weight: 700; } .small-regular { diff --git a/frontend/src/assets/svgs/Close_Button.svg b/frontend/src/assets/svgs/Close_Button.svg new file mode 100644 index 0000000..14034e1 --- /dev/null +++ b/frontend/src/assets/svgs/Close_Button.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/assets/svgs/checkboxtile/check-checked.svg b/frontend/src/assets/svgs/checkboxtile/check-checked.svg new file mode 100644 index 0000000..5855f88 --- /dev/null +++ b/frontend/src/assets/svgs/checkboxtile/check-checked.svg @@ -0,0 +1,4 @@ + + + + diff --git a/frontend/src/assets/svgs/checkboxtile/check-naked.svg b/frontend/src/assets/svgs/checkboxtile/check-naked.svg new file mode 100644 index 0000000..898a0a4 --- /dev/null +++ b/frontend/src/assets/svgs/checkboxtile/check-naked.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/frontend/src/assets/svgs/content-layers-show.svg b/frontend/src/assets/svgs/content-layers-show.svg new file mode 100644 index 0000000..1a40914 --- /dev/null +++ b/frontend/src/assets/svgs/content-layers-show.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/assets/svgs/location-map.svg b/frontend/src/assets/svgs/location-map.svg new file mode 100644 index 0000000..3cc5765 --- /dev/null +++ b/frontend/src/assets/svgs/location-map.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/components/checkbox/CheckboxTile.vue b/frontend/src/components/checkbox/CheckboxTile.vue new file mode 100644 index 0000000..d0bbb33 --- /dev/null +++ b/frontend/src/components/checkbox/CheckboxTile.vue @@ -0,0 +1,80 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/graph/KnowledgeGraph.vue b/frontend/src/components/graph/KnowledgeGraph.vue index 3758f5a..91158c6 100644 --- a/frontend/src/components/graph/KnowledgeGraph.vue +++ b/frontend/src/components/graph/KnowledgeGraph.vue @@ -58,7 +58,7 @@ marker { border-bottom: 0.5px solid #CFD5DD; border-left: 0; - height: 500px; + height: 350px; min-width: 600px; width: 100%; } diff --git a/frontend/src/components/headers/GlobalHeader.vue b/frontend/src/components/headers/GlobalHeader.vue index bd71f0a..ed95486 100644 --- a/frontend/src/components/headers/GlobalHeader.vue +++ b/frontend/src/components/headers/GlobalHeader.vue @@ -1,7 +1,3 @@ - -