diff --git a/src/assets/common.scss b/src/assets/common.scss index 3f638b2..9cd3a9d 100644 --- a/src/assets/common.scss +++ b/src/assets/common.scss @@ -7,4 +7,32 @@ $pad_btn: 0.5em; // background-color: $btns_back; cursor: pointer; line-height: 1.5; +} + +span.icon{ + background-repeat: no-repeat; + background-position: middle center; + background-size: contain; + display: inline-block; + vertical-align:bottom; + width: 2em; + height:2em; + &.terraindevie{ + background-image: url('./icons/terraindevie.svg'); + } + &.proximite{ + background-image: url('./icons/proximite.svg'); + } + &.superposition{ + background-image: url('./icons/superposition.svg'); + } + &.puissancedagir{ + background-image: url('./icons/puissancedagir.svg'); + } + &.action{ + background-image: url('./icons/action.svg'); + } + &.doleancer{ + background-image: url('./icons/doleancer.svg'); + } } \ No newline at end of file diff --git a/src/assets/icons/action.svg b/src/assets/icons/action.svg new file mode 100644 index 0000000..59b5223 --- /dev/null +++ b/src/assets/icons/action.svg @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/doleancer.svg b/src/assets/icons/doleancer.svg new file mode 100644 index 0000000..e4698b7 --- /dev/null +++ b/src/assets/icons/doleancer.svg @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/proximite.svg b/src/assets/icons/proximite.svg new file mode 100644 index 0000000..f8c1818 --- /dev/null +++ b/src/assets/icons/proximite.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + diff --git a/src/assets/icons/puissancedagir.svg b/src/assets/icons/puissancedagir.svg new file mode 100644 index 0000000..7812906 --- /dev/null +++ b/src/assets/icons/puissancedagir.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + diff --git a/src/assets/icons/superposition.svg b/src/assets/icons/superposition.svg new file mode 100644 index 0000000..297bc61 --- /dev/null +++ b/src/assets/icons/superposition.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/terraindevie.svg b/src/assets/icons/terraindevie.svg new file mode 100644 index 0000000..956d7e0 --- /dev/null +++ b/src/assets/icons/terraindevie.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + diff --git a/src/assets/main.scss b/src/assets/main.scss index fba42a5..3c886d6 100644 --- a/src/assets/main.scss +++ b/src/assets/main.scss @@ -71,8 +71,11 @@ body{ li{ list-style: none; pointer-events: all; + margin-right: 1em; a{ @include btn(); + display: block; + line-height: 2.1; } } } @@ -147,7 +150,7 @@ body{ li{ list-style:none; padding:0; - margin:0; + margin:0 1em 0 0; } } } diff --git a/src/components/ConcernementMapPopup.vue b/src/components/ConcernementMapPopup.vue index 65f9e99..521d539 100644 --- a/src/components/ConcernementMapPopup.vue +++ b/src/components/ConcernementMapPopup.vue @@ -101,8 +101,11 @@ export default {

{{ concernement.title }}

diff --git a/src/components/MapConcernements.vue b/src/components/MapConcernements.vue index ad20fef..fa78859 100644 --- a/src/components/MapConcernements.vue +++ b/src/components/MapConcernements.vue @@ -95,8 +95,8 @@ export default { Matter.Bodies.rectangle(-wall_w/2, canvas_h/2, wall_w, canvas_h, { isStatic: true }), // left Matter.Bodies.rectangle(canvas_w+wall_w/2, canvas_h/2, wall_w, canvas_h, { isStatic: true }), // right // make the items never goes under menus - Matter.Bodies.rectangle(550, canvas_h-15, 900, 30, { isStatic: true }), // menu bottom - Matter.Bodies.rectangle(550, 15, 900, 30, { isStatic: true }) // menu top + Matter.Bodies.rectangle(550, 25, 900, 50, { isStatic: true }), // menu top + Matter.Bodies.rectangle(550, canvas_h-15, 900, 30, { isStatic: true }) // menu bottom ]); // add mouse control @@ -277,22 +277,22 @@ export default {