diff --git a/src/App.vue b/src/App.vue
index 604905c..4f7e34a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,6 +7,7 @@ import { ConcernementsStore } from '@/stores/concernements'
import StaticMenu from '@components/block/StaticMenu.vue'
import UserBlock from '@components/block/UserBlock.vue'
+import SearchBlock from '@components/block/SearchBlock.vue'
import MapConcernements from '@components/MapConcernements.vue'
import ConcernementMapItem from '@components/ConcernementMapItem.vue'
@@ -35,7 +36,8 @@ export default {
MapConcernements,
ConcernementMapItem,
StaticMenu,
- UserBlock
+ UserBlock,
+ SearchBlock
}
}
@@ -48,6 +50,7 @@ export default {
+
diff --git a/src/assets/layout.scss b/src/assets/layout.scss
index 244dc89..e770777 100644
--- a/src/assets/layout.scss
+++ b/src/assets/layout.scss
@@ -29,7 +29,7 @@ html,body{
bottom:0;
left:0;
width: 100vw;
- padding: 1rem 0;
+ padding: 1rem 1em;
>.row{
@include layout-row();
}
diff --git a/src/assets/main.scss b/src/assets/main.scss
index 5359b79..851dd16 100644
--- a/src/assets/main.scss
+++ b/src/assets/main.scss
@@ -21,10 +21,15 @@ body{
#app>header#header{
// background-color: $front;
pointer-events: none;
+ display: flex;
+ flex-direction: row;
+ align-items: baseline;
.row{
display: flex;
flex-direction: row;
pointer-events: none;
+ margin: 0;
+ padding: 0;
>*{
margin-right: 1em;
pointer-events: all;
@@ -34,8 +39,24 @@ body{
}
h1.row{
font-family: "avara";
- span.title{
- font-size: 2em;
+ margin: 0 1em 0 0;
+ a{
+ margin: 0;
+ span.title{
+ font-size: 2em;
+ }
+
+ }
+ }
+
+ .row.top{
+ >*{
+ label,a{
+ padding: 0;
+ span{
+ display:none;
+ }
+ }
}
}
diff --git a/src/components/block/LoginBlock.vue b/src/components/block/LoginBlock.vue
index 404978e..3afb0bd 100644
--- a/src/components/block/LoginBlock.vue
+++ b/src/components/block/LoginBlock.vue
@@ -5,6 +5,10 @@ import { mapState } from 'pinia'
// import router from 'vuejs/route'
import { UserStore } from '@/stores/user'
+import SvgIcon from '@jamescoyle/vue-icon';
+import { mdiLoginVariant } from '@mdi/js';
+
+
export default {
setup() {
const userStore = UserStore()
@@ -17,7 +21,8 @@ export default {
return {
template: null,
mail: '',
- passwd: ''
+ passwd: '',
+ login_path: mdiLoginVariant
}
},
computed: {
@@ -49,13 +54,19 @@ export default {
// })
// })
}
+ },
+ components: {
+ SvgIcon
}
}
-
connexion
+