diff --git a/package-lock.json b/package-lock.json
index ac8ea21..17b4cbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
"@csstools/normalize.css": "^12.0.0",
"@material-design-icons/svg": "^0.14.2",
"@mdi/font": "^7.1.96",
+ "granim": "^2.0.0",
"pinia": "^2.0.21",
"vue": "^3.2.38",
"vue-router": "^4.1.5"
@@ -1476,6 +1477,11 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/granim": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/granim/-/granim-2.0.0.tgz",
+ "integrity": "sha512-aqa79K49ndjoUBtpYzlO8sKcuVQED+5axvX0SveqTLDR+Fa2G42AGntuQ36ysCFOWGVkWCLfHowFwk+D/9rGDg=="
+ },
"node_modules/grapheme-splitter": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
@@ -3531,6 +3537,11 @@
"type-fest": "^0.20.2"
}
},
+ "granim": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/granim/-/granim-2.0.0.tgz",
+ "integrity": "sha512-aqa79K49ndjoUBtpYzlO8sKcuVQED+5axvX0SveqTLDR+Fa2G42AGntuQ36ysCFOWGVkWCLfHowFwk+D/9rGDg=="
+ },
"grapheme-splitter": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
diff --git a/package.json b/package.json
index 07c792f..7e7fa9b 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
"@csstools/normalize.css": "^12.0.0",
"@material-design-icons/svg": "^0.14.2",
"@mdi/font": "^7.1.96",
+ "granim": "^2.0.0",
"pinia": "^2.0.21",
"vue": "^3.2.38",
"vue-router": "^4.1.5"
diff --git a/src/App.vue b/src/App.vue
index 6978f94..5caa31b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -43,8 +43,6 @@ export default {
Où atterrir
-
-
@@ -61,7 +59,7 @@ export default {
:concernement="concernements[0]"
/> -->
-
diff --git a/src/assets/common.scss b/src/assets/common.scss
index 65cf69a..bd0aef6 100644
--- a/src/assets/common.scss
+++ b/src/assets/common.scss
@@ -1,7 +1,8 @@
$pad_btn: 0.5em;
@mixin btn() {
- padding: $pad_btn;
+ padding: $pad_btn/2 $pad_btn;
border-radius: 5px;
background-color: $btns_back;
cursor: pointer;
+ line-height: 1.5;
}
\ No newline at end of file
diff --git a/src/assets/layout.scss b/src/assets/layout.scss
index ee8925d..7dd4a44 100644
--- a/src/assets/layout.scss
+++ b/src/assets/layout.scss
@@ -19,12 +19,16 @@ html,body{
font-weight: normal;
- display: flex;
- flex-flow: column-reverse;
+ // display: flex;
+ // flex-flow: column-reverse;
}
#header{
- flex: 0 0 auto;
+ // flex: 0 0 auto;
+ position: absolute;
+ bottom:0;
+ left:0;
+ width: 100vw;
padding: 1rem 0;
>.row{
@include layout-row();
@@ -32,16 +36,56 @@ html,body{
}
#main-content{
- flex: 1 1 auto;
+ // flex: 1 1 auto;
+ width:100vw;
+ height:100vh;
+
overflow-x: hidden;
overflow-y: auto;
// padding: 1rem 0;
+
+ #map-backgrounds{
+ position: absolute;
+ z-index: -1;
+ top:0; left:0;
+ width:100%;
+ height:100%;
+ >canvas.map-bg-canvas{
+ position: absolute;
+ // z-index: -1;
+ top:0; left:0;
+ width:100%;
+ height:100%;
+ }
+ }
+
#map-concernements{
width:100%;
height:100%;
+ z-index: 1;
}
+
+
+ #map-nav{
+ position: absolute;
+ z-index: 2;
+ top:0; left: 0;
+ width:100vw;
+ padding:1rem 0;
+ >ul{
+ @include layout-row();
+ }
+ }
+
>.row{
@include layout-row();
}
+
+ #content{
+ position: absolute;
+ top:0; right:0;
+ height:100vh;
+ }
+
}
diff --git a/src/assets/main.scss b/src/assets/main.scss
index 2dbedd7..e9bdc1e 100644
--- a/src/assets/main.scss
+++ b/src/assets/main.scss
@@ -14,7 +14,7 @@ body{
}
#app>header#header{
- background-color: $front;
+ // background-color: $front;
.row{
display: flex;
flex-direction: row;
@@ -26,10 +26,41 @@ body{
font-family: "snap-it";
}
}
- &.bottom{
- padding:1em 0;
+ // &.bottom{
+ // padding:1em 0;
+ // }
+ }
+
+}
+
+#main-content{
+
+ #map-backgrounds{
+ .map-bg-canvas{
+ mix-blend-mode: multiply;
}
}
-}
\ No newline at end of file
+ #map-concernements{
+
+ }
+
+ #map-nav{
+ ul{
+ display: flex;
+ flex-flow: row;
+ gap: 1em;
+ li{
+ list-style: none;
+ a{
+ @include btn();
+ }
+ }
+ }
+ }
+
+ #content{
+
+ }
+}
diff --git a/src/components/MapBackground.vue b/src/components/MapBackground.vue
new file mode 100644
index 0000000..2f2daeb
--- /dev/null
+++ b/src/components/MapBackground.vue
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/MapConcernements.vue b/src/components/MapConcernements.vue
index 7ec6af6..773d3e8 100644
--- a/src/components/MapConcernements.vue
+++ b/src/components/MapConcernements.vue
@@ -1,12 +1,14 @@
+
+
+
+