Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency @fortawesome/fontawesome-free to v6 (master) #9470

Merged
merged 9 commits into from
Oct 8, 2024
+9,143 −7,187
Merged

Update dependency @fortawesome/fontawesome-free to v6 (master) #9470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6b9ca7f
Update dependency @fortawesome/fontawesome-free to v6
renovate[bot] Sep 20, 2024
f3b622d
Import font-awesome function before to use them
ger-benjamin Oct 4, 2024
c6d7a0b
Use FontAwesome v6 names
ger-benjamin Oct 4, 2024
37400db
Use font-awesome full name classes
ger-benjamin Oct 4, 2024
a7dd379
Update srcapi/css/fontawesome.css.ts
ger-benjamin Oct 4, 2024
15ca633
Use font-awesome full name base fa classes
ger-benjamin Oct 4, 2024
70c4e47
Various fa fixes
ger-benjamin Oct 4, 2024
0596e57
Fix font FA 6 family and target fa(-solid) classes
ger-benjamin Oct 7, 2024
4a648fd
Update image-ref because of slight differences between fa 5 and fa 6
ger-benjamin Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified contribs/gmf/apps/desktop-ref.png
View file
Open in desktop
ger-benjamin marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 14 additions & 15 deletions contribs/gmf/apps/desktop/index.html.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</head>
<body ng-class="{'gmf-profile-chart-active': !!profileChartActive, 'gmf-query-grid-active': !!mainCtrl.queryGridActive}" ng-keydown="mainCtrl.onKeydown($event)" tabindex="0">
<div ng-show="mainCtrl.loading" class="loading-mask">
<i class="fa custom-spinner-loading fa-spin spinner-loading-mask"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="1em" height="1em"><circle cx="256" cy="48" r="48" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="109.17" cy="108.313" r="43" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="46.537" cy="257.328" r="38" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="108.028" cy="403.972" r="33" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="255.794" cy="463.935" r="28" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="402.894" cy="402.936" r="23" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="463.623" cy="256.106" r="18" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/></svg></i>
<i class="fa-solid custom-spinner-loading fa-spin spinner-loading-mask"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="1em" height="1em"><circle cx="256" cy="48" r="48" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="109.17" cy="108.313" r="43" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="46.537" cy="257.328" r="38" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="108.028" cy="403.972" r="33" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="255.794" cy="463.935" r="28" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="402.894" cy="402.936" r="23" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="463.623" cy="256.106" r="18" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/></svg></i>
</div>
<gmf-header gmf-header-template-url="desktop/header.html"></gmf-header>
<main>
Expand All @@ -26,7 +26,6 @@
<a href
class="btn btn-block prime dropdown-toggle"
data-toggle="dropdown">
<span class="fa fa-grid"></span>
<span ng-if="mainCtrl.gmfThemeManager.modeFlush">
<span translate>Theme:</span>
<b ng-if="mainCtrl.gmfThemeManager.isLoading()" translate>Loading...</b>
Expand Down Expand Up @@ -54,48 +53,48 @@
<div ngeo-btn-group class="btn-group-vertical" ngeo-btn-group-active="mainCtrl.toolsActive">
<button ngeo-btn class="btn btn-default" ng-model="mainCtrl.loginActive"
data-toggle="tooltip" data-placement="left" data-original-title="{{'Login'|translate}}">
<span class="fa fa-user" ng-class="mainCtrl.gmfUser.username ? 'fa-user-times' : 'fa-user'"></span>
<span class="fa-solid fa-user" ng-class="mainCtrl.gmfUser.username ? 'fa-user-xmark' : 'fa-user'"></span>
</button>
<button ngeo-btn class="btn btn-default" ng-model="mainCtrl.printPanelActive"
data-toggle="tooltip" data-placement="left" data-original-title="{{'Print'|translate}}">
<span class="fa fa-print"></span>
<span class="fa-solid fa-print"></span>
</button>
<button ngeo-btn class="btn btn-default" ng-model="mainCtrl.drawFeatureActive"
data-toggle="tooltip" data-placement="left" data-original-title="{{'Draw and Measure'|translate}}">
<span class="fa fa-paint-brush"></span>
<span class="fa-solid fa-paintbrush"></span>
</button>
<button ngeo-btn class="btn btn-default" ng-model="mainCtrl.filterSelectorActive"
data-toggle="tooltip" data-placement="left" data-original-title="{{'Filter'|translate}}">
<span
class="fa"
ng-class="mainCtrl.gmfDataSourceBeingFiltered.dataSource && mainCtrl.gmfDataSourceBeingFiltered.dataSource.filterRules ? 'fa-funnel-dollar' : 'fa-filter'"></span>
ng-class="mainCtrl.gmfDataSourceBeingFiltered.dataSource && mainCtrl.gmfDataSourceBeingFiltered.dataSource.filterRules ? 'fa-filter-circle-dollar' : 'fa-filter'"></span>
</button>
<button ngeo-btn class="btn btn-default" ng-model="mainCtrl.editFeatureActive"
data-toggle="tooltip" data-placement="left" data-original-title="{{'Editing'|translate}}"
ng-show="mainCtrl.hasEditableLayers">
<span class="fa fa-edit"></span>
<span class="fa-solid fa-pen-to-square"></span>
</button>
<button ngeo-btn class="btn btn-default" ng-model="mainCtrl.drawProfilePanelActive"
data-toggle="tooltip" data-placement="left" data-original-title="{{'Profile'|translate}}">
<span class="fa fa-chart-area"></span>
<span class="fa-solid fa-chart-area"></span>
</button>
<button ngeo-btn class="btn btn-default" ng-model="mainCtrl.queryPanelActive"
data-toggle="tooltip" data-placement="left" data-original-title="{{'Selection'|translate}}">
<span>
<i class="fa fa-mouse-pointer"></i>
<i class="fa fa-info fa-xs offset-info-icon"></i>
<i class="fa-solid fa-arrow-pointer"></i>
<i class="fa-solid fa-info fa-sm offset-info-icon"></i>
</span>
</button>
<button ngeo-btn class="btn btn-default" ng-model="mainCtrl.importDataSourceActive"
data-toggle="tooltip" data-placement="left" data-original-title="{{'Import Layer'|translate}}">
<span class="fa fa-upload"></span>
<span class="fa-solid fa-upload"></span>
</button>
</div>
<br/>
<br/>
<span data-toggle="tooltip" data-placement="left" data-original-title="{{'Share this map'|translate}}">
<button ngeo-btn class="btn btn-default" ng-model="mainCtrl.modalShareShown">
<span class="fa fa-share-alt"></span>
<span class="fa-solid fa-share-nodes"></span>
</button>
</span>
</div>
Expand Down Expand Up @@ -254,7 +253,7 @@
ngeo-geolocation-map="::mainCtrl.map"
ngeo-geolocation-loading="mainCtrl.loading"
ng-if="::mainCtrl.options.geolocalisation">
<span class="far fa-dot-circle"></span>
<span class="fa-regular fa-circle-dot"></span>
</button>
<div class="gmf-app-map-bottom-controls">
<div class="gmf-backgroundlayerbutton btn-group dropup">
Expand Down Expand Up @@ -297,8 +296,8 @@

<!--infobar-->
<div class="gmf-app-footer" ng-class="{'gmf-app-active': mainCtrl.options.showInfobar}">
<button class="btn fa gmf-app-map-info" ng-click="mainCtrl.options.showInfobar = !mainCtrl.options.showInfobar"
ng-class="{'fa-angle-double-up': !mainCtrl.options.showInfobar, 'fa-angle-double-down': mainCtrl.options.showInfobar}"></button>
<button class="btn fa-solid gmf-app-map-info" ng-click="mainCtrl.options.showInfobar = !mainCtrl.options.showInfobar"
ng-class="{'fa-angles-up': !mainCtrl.options.showInfobar, 'fa-angles-down': mainCtrl.options.showInfobar}"></button>

<div ngeo-scaleselector ngeo-scaleselector-map="mainCtrl.map"></div>
<div id="scaleline"></div>
Expand Down
3 changes: 2 additions & 1 deletion contribs/gmf/apps/desktop/sass/desktop.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ header {
}
}

.offset-info-icon {
.fa-info.offset-info-icon {
position: absolute;
line-height: normal;
}
Binary file modified contribs/gmf/apps/desktop_alt-ref.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 4 additions & 5 deletions contribs/gmf/apps/desktop_alt/index.html.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</head>
<body ng-keydown="mainCtrl.onKeydown($event)" tabindex="0">
<div ng-show="mainCtrl.loading" class="loading-mask">
<i class="fa custom-spinner-loading fa-spin spinner-loading-mask"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="1em" height="1em"><circle cx="256" cy="48" r="48" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="109.17" cy="108.313" r="43" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="46.537" cy="257.328" r="38" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="108.028" cy="403.972" r="33" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="255.794" cy="463.935" r="28" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="402.894" cy="402.936" r="23" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="463.623" cy="256.106" r="18" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/></svg></i>
<i class="fa-solid custom-spinner-loading fa-spin spinner-loading-mask"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="1em" height="1em"><circle cx="256" cy="48" r="48" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="109.17" cy="108.313" r="43" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="46.537" cy="257.328" r="38" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="108.028" cy="403.972" r="33" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="255.794" cy="463.935" r="28" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="402.894" cy="402.936" r="23" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="463.623" cy="256.106" r="18" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/></svg></i>
</div>
<gmf-desktop-canvas>
<div slot="header" class="logo">
Expand All @@ -28,7 +28,6 @@
<a href
class="btn btn-block prime dropdown-toggle"
data-toggle="dropdown">
<span class="fa fa-grid"></span>
<span ng-if="mainCtrl.gmfThemeManager.modeFlush">
<span translate>Theme:</span>
<b ng-if="mainCtrl.gmfThemeManager.isLoading()" translate>Loading...</b>
Expand Down Expand Up @@ -116,7 +115,7 @@
data-toggle="tooltip" data-placement="left" data-original-title="{{'Filter'|translate}}">
<span
class="fa"
ng-class="mainCtrl.gmfDataSourceBeingFiltered.dataSource && mainCtrl.gmfDataSourceBeingFiltered.dataSource.filterRules ? 'fa-funnel-dollar' : 'fa-filter'">
ng-class="mainCtrl.gmfDataSourceBeingFiltered.dataSource && mainCtrl.gmfDataSourceBeingFiltered.dataSource.filterRules ? 'fa-filter-circle-dollar' : 'fa-filter'">
</span>
</button>
</gmf-filter-button>
Expand Down Expand Up @@ -270,7 +269,7 @@
<!-- Permalink -->
<span slot="tool-button-separate">
<button ngeo-btn class="btn btn-default gmf-app-tools-bar" ng-model="mainCtrl.modalShareShown" data-toggle="tooltip" data-placement="left" data-original-title="{{'Share this map'|translate}}">
<span class="fa fa-share-alt"></span>
<span class="fa-solid fa-share-nodes"></span>
</button>
</span>

Expand Down Expand Up @@ -301,7 +300,7 @@
ngeo-geolocation-map="::mainCtrl.map"
ngeo-geolocation-loading="mainCtrl.loading"
ng-if="::mainCtrl.options.geolocalisation">
<span class="far fa-dot-circle"></span>
<span class="fa-regular fa-circle-dot"></span>
</button>
<div slot="map" class="gmf-app-map-bottom-controls">
<div class="gmf-backgroundlayerbutton btn-group dropup">
Expand Down
3 changes: 2 additions & 1 deletion contribs/gmf/apps/desktop_alt/sass/desktop_alt.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ div .ngeo-displaywindow {
top: calc($topbar-height + $app-margin + 3 * $map-tools-size);
}

.offset-info-icon {
.fa-info.offset-info-icon {
position: absolute;
line-height: normal;
}

.pointer-events-none {
Expand Down
Binary file modified contribs/gmf/apps/iframe_api-ref.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion contribs/gmf/apps/iframe_api/index.html.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</head>
<body>
<div ng-show="mainCtrl.loading" class="loading-mask">
<i class="fa custom-spinner-loading fa-spin spinner-loading-mask"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="1em" height="1em"><circle cx="256" cy="48" r="48" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="109.17" cy="108.313" r="43" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="46.537" cy="257.328" r="38" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="108.028" cy="403.972" r="33" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="255.794" cy="463.935" r="28" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="402.894" cy="402.936" r="23" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="463.623" cy="256.106" r="18" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/></svg></i>
<i class="fa-solid custom-spinner-loading fa-spin spinner-loading-mask"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="1em" height="1em"><circle cx="256" cy="48" r="48" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="109.17" cy="108.313" r="43" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="46.537" cy="257.328" r="38" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="108.028" cy="403.972" r="33" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="255.794" cy="463.935" r="28" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="402.894" cy="402.936" r="23" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><circle cx="463.623" cy="256.106" r="18" style="opacity:1;fill-opacity:1;stroke:#000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/></svg></i>
</div>
<main>
<div class="gmf-app-map-container" ng-class="{'gmf-app-infobar-active': mainCtrl.options.showInfobar}">
Expand Down
Binary file modified contribs/gmf/apps/mobile-ref.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading