Skip to content

Commit

Permalink
Merge pull request #397 from IGNF/feat/update-icons-and-positions
Browse files Browse the repository at this point in the history
Feat/update icons and positions
  • Loading branch information
elias75015 authored Nov 29, 2024
2 parents 337c49d + b6d5d4f commit e8a84c8
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/components/carte/Controls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ const mousePositionOptions = {
@media (max-width: 576px) {
.position-container-top-right,
.position-container-top-left {
top: 210px;
top: 255px;
}
.position-container-bottom-left,
.position-container-bottom-right,
Expand Down
2 changes: 1 addition & 1 deletion src/components/carte/control/Share.vue
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ onBeforeMount(() => {
des autres boutons car n'est pas dans la grille */
@media (max-width: 576px){
#share-button-position {
top: 60px;
top: 255px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/menu/LeftMenuTool.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const tabArray = computed(() => {
const arr = [
{
componentName : "MenuCatalogue",
icon : "co-list-low-priority",
icon : "catalogIcon",
title : "Catalogue de données",
}
];
Expand Down
4 changes: 2 additions & 2 deletions src/components/menu/MenuLateralWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,13 @@ On gère donc sa position de manière absolue
En mode petit écran on le positionne tout en haut en attendant mieux */
@media (max-width: 382px) {
.menu-logo-list {
margin-top: 13px;
margin-top: 210px;
}
}
@media (max-width: 576px) and (min-width: 382px) {
.menu-logo-list {
margin-top: 13px;
margin-top: 210px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/menu/RightMenuTool.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const tabArray = computed(() => {
const arr = [
{
componentName : "MenuControl",
icon : "io-settings-sharp",
icon : "menuWidgetIcon",
title : "Catalogue d'outils",
}
];
Expand Down
6 changes: 2 additions & 4 deletions src/icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@ export {
} from 'oh-vue-icons/icons/fa/index.js'

export {
BiChevronDoubleRight
BiChevronDoubleRight,
} from 'oh-vue-icons/icons/bi/index.js'

export {
CoListLowPriority,
CoCopy
} from 'oh-vue-icons/icons/co/index.js'

export {
IoSettingsSharp,
IoClose
} from 'oh-vue-icons/icons/io/index.js'
} from 'oh-vue-icons/icons/io/index.js'
14 changes: 14 additions & 0 deletions src/iconscustom.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export let customIcons = {
catalogIcon: {
name: "catalogIcon",
width: 24,
height: 24,
raw: "<path d='M13 21V23H11V21H3C2.44772 21 2 20.5523 2 20V4C2 3.44772 2.44772 3 3 3H9C10.1947 3 11.2671 3.52375 12 4.35418C12.7329 3.52375 13.8053 3 15 3H21C21.5523 3 22 3.44772 22 4V20C22 20.5523 21.5523 21 21 21H13ZM20 19V5H15C13.8954 5 13 5.89543 13 7V19H20ZM11 19V7C11 5.89543 10.1046 5 9 5H4V19H11Z'/>",
},
menuWidgetIcon: {
name: "menuWidgetIcon",
width: 24,
height: 24,
raw: "<path d='M5.32894 3.27158C6.56203 2.8332 7.99181 3.10749 8.97878 4.09446C10.0997 5.21537 10.3014 6.90741 9.58381 8.23384L20.2925 18.9437L18.8783 20.358L8.16933 9.64875C6.84276 10.3669 5.1502 10.1654 4.02903 9.04421C3.04178 8.05696 2.76761 6.62665 3.20652 5.39332L5.44324 7.63C6.02903 8.21578 6.97878 8.21578 7.56456 7.63C8.15035 7.04421 8.15035 6.09446 7.56456 5.50868L5.32894 3.27158ZM15.6963 5.15512L18.8783 3.38735L20.2925 4.80157L18.5247 7.98355L16.7569 8.3371L14.6356 10.4585L13.2214 9.04421L15.3427 6.92289L15.6963 5.15512ZM8.97878 13.2869L10.393 14.7011L5.08969 20.0044C4.69917 20.3949 4.066 20.3949 3.67548 20.0044C3.31285 19.6418 3.28695 19.0699 3.59777 18.6774L3.67548 18.5902L8.97878 13.2869Z'/>"
}
}
2 changes: 2 additions & 0 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ import { createEulerian } from './plugins/Eulerian'
import App from './App.vue'
import router from './router/index'
import * as icons from './icons'
import { customIcons } from './iconscustom'

import './main.css'

addIcons(...Object.values(icons)) // Autoimporté grâce à ohVueIconAutoimportPreset dans vite.config.ts
addIcons(...Object.values(customIcons))

// https://vitejs.dev/guide/env-and-mode.html#node-env-and-modes
const isProduction = (import.meta.env.MODE === "production")
Expand Down

0 comments on commit e8a84c8

Please sign in to comment.