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

Upgrade to Font-Awesome 5 #810

Merged
merged 6 commits into from
Feb 9, 2018
Merged

Upgrade to Font-Awesome 5 #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c44b24c
Update to Font-Awesome 5
tmcgee Feb 5, 2018
663d874
remove console.log statement
tmcgee Feb 5, 2018
5b93d3f
Merge branch 'develop' into feature/font-awesome-5
tmcgee Feb 6, 2018
dd9ae13
Folder icons should be solid not an outline.
tmcgee Feb 6, 2018
7da8a5a
Update font for ExpandPane
tmcgee Feb 8, 2018
d357026
Fix missing dock icon.
tmcgee Feb 8, 2018
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
45 changes: 33 additions & 12 deletions viewer/css/cmv.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,23 @@ body {
.flat .dijitIcon.fa,
.flat .dijitButton .dijitButtonNode .dijitIcon.fa,
.flat .dijitDropDownButton .dijitButtonNode .dijitIcon.fa,
.flat .dijitComboButton .dijitButtonNode .dijitIcon.fa {
font-family: FontAwesome;
.flat .dijitComboButton .dijitButtonNode .dijitIcon.fa,
.flat .dijitEditorIcon.fas,
.flat .dijitIcon.fas,
.flat .dijitButton .dijitButtonNode .dijitIcon.fas,
.flat .dijitDropDownButton .dijitButtonNode .dijitIcon.fas,
.flat .dijitComboButton .dijitButtonNode .dijitIcon.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900;
}

.flat .dijitEditorIcon.far,
.flat .dijitIcon.far,
.flat .dijitButton .dijitButtonNode .dijitIcon.far,
.flat .dijitDropDownButton .dijitButtonNode .dijitIcon.far,
.flat .dijitComboButton .dijitButtonNode .dijitIcon.far {
font-family: 'Font Awesome 5 Free';
font-weight: 400;
}

.flat .dijitButton .dijitButtonNode,
Expand Down Expand Up @@ -314,7 +329,8 @@ body {
background-color: white;
color: #666666;
cursor: pointer;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-weight: 900;
font-size: 1.3em;
position: absolute;
z-index: 40;
Expand Down Expand Up @@ -370,7 +386,8 @@ body {

.cmv .sidebarCollapseButton .open:before,
.cmv .sidebarCollapseButton .close:before {
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-weight: 900;
}

.cmv .sidebarCollapseButtonHorz .button {
Expand Down Expand Up @@ -609,11 +626,12 @@ body {
border: 1px solid #666;
border-radius: 4px;
color: #666;
font-family: FontAwesome;
font-size: 20px;
height: 27px;
font-family: 'Font Awesome 5 Free';
font-weight: 400;
font-size: 18px;
height: 26px;
overflow: hidden;
padding: 6px 0 0 0;
padding: 7px 0 0 0;
text-align: center;
width: 30px;
}
Expand All @@ -628,6 +646,7 @@ body {

.cmv .cmv-ui .HomeButton .home:before {
content: '\f015';
font-weight: 900;
}

.cmv .cmv-ui .LocateButton .zoomLocateButton:before {
Expand Down Expand Up @@ -814,7 +833,8 @@ body {

.cmv .simpleDirections .esriStopsGetDirections:before {
content: '\f277';
font-family: 'FontAwesome';
font-family: 'Font Awesome 5 Free';
font-weight: 900;
margin-right: 8px;
}

Expand All @@ -824,8 +844,8 @@ body {

.cmv .simpleDirections .esriResultsPrint:before {
content: '\f02f';
font-family: 'FontAwesome';
font-size: 14px;
font-family: 'Font Awesome 5 Free';
font-weight: 900;
}

.cmv .simpleDirections .esriActivateButton {
Expand All @@ -834,7 +854,8 @@ body {

.cmv .simpleDirections .esriActivateButton:before {
content: '\f041';
font-family: 'FontAwesome';
font-family: 'Font Awesome 5 Free';
font-weight: 900;
font-size: 14px;
}

Expand Down
2 changes: 1 addition & 1 deletion viewer/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="shortcut icon" href="./favicon.png">
<title>Configurable Map Viewer</title>
<link rel="stylesheet" type="text/css" href="https://js.arcgis.com/3.23compact/esri/css/esri.css">
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="https://use.fontawesome.com/releases/v5.0.6/css/all.css">
<link rel="stylesheet" type="text/css" href="css/app.css">
</head>
<body class="cmv flat">
Expand Down
40 changes: 20 additions & 20 deletions viewer/js/config/viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ define([
id: 'toggle-clustering-menu',
topic: 'toggleClustering',
label: 'Toggle Clustering',
iconClass: 'fa fa-toggle-on'
iconClass: 'fas fa-fw fa-toggle-on'
}]
}
}, {
Expand All @@ -214,7 +214,7 @@ define([
menu: [{
topic: 'hello',
label: 'Say Hello Custom',
iconClass: 'fa fa-smile-o'
iconClass: 'far fa-fw fa-smile'
}]
}
}, {
Expand Down Expand Up @@ -266,7 +266,7 @@ define([
subLayerMenu: [{
topic: 'hello',
label: 'Say Hello',
iconClass: 'fa fa-smile-o'
iconClass: 'far fa-fw fa-smile'
}]
}
}, {
Expand Down Expand Up @@ -353,7 +353,7 @@ define([
path: 'esri/dijit/Search',
placeAt: has('phone') ? null : 'top-center',
title: i18n.viewer.widgets.search,
iconClass: 'fa-search',
iconClass: 'fas fa-search',
position: 0,
options: {
map: true,
Expand All @@ -378,7 +378,7 @@ define([
type: 'titlePane',
path: 'gis/dijit/Identify',
title: i18n.viewer.widgets.identify,
iconClass: 'fa-info-circle',
iconClass: 'fas fa-info-circle',
open: false,
preload: true,
position: 3,
Expand Down Expand Up @@ -472,7 +472,7 @@ define([
type: 'titlePane',
path: 'gis/dijit/Legend',
title: i18n.viewer.widgets.legend,
iconClass: 'fa-picture-o',
iconClass: 'far fa-fw fa-images',
open: false,
position: 1,
options: {
Expand All @@ -486,7 +486,7 @@ define([
type: 'titlePane',
path: 'gis/dijit/LayerControl',
title: i18n.viewer.widgets.layerControl,
iconClass: 'fa-th-list',
iconClass: 'fas fa-fw fa-th-list',
open: false,
position: 0,
options: {
Expand All @@ -500,7 +500,7 @@ define([
menu: {
feature: [{
topic: 'hello',
iconClass: 'fa fa-smile-o',
iconClass: 'fas fa-fw fa-smile',
label: 'Say Hello'
}]
},
Expand All @@ -509,7 +509,7 @@ define([
subLayerMenu: {
dynamic: [{
topic: 'goodbye',
iconClass: 'fa fa-frown-o',
iconClass: 'fas fa-fw fa-frown',
label: 'Say goodbye'
}]
}
Expand All @@ -521,7 +521,7 @@ define([
type: 'titlePane',
path: 'gis/dijit/Bookmarks',
title: i18n.viewer.widgets.bookmarks,
iconClass: 'fa-bookmark',
iconClass: 'fas fa-fw fa-bookmark',
open: false,
position: 2,
options: 'config/bookmarks'
Expand All @@ -533,7 +533,7 @@ define([
canFloat: true,
path: 'gis/dijit/Find',
title: i18n.viewer.widgets.find,
iconClass: 'fa-search',
iconClass: 'fas fa-fw fa-search',
open: false,
position: 3,
options: 'config/find'
Expand All @@ -545,7 +545,7 @@ define([
canFloat: true,
path: 'gis/dijit/Draw',
title: i18n.viewer.widgets.draw,
iconClass: 'fa-paint-brush',
iconClass: 'fas fa-fw fa-paint-brush',
open: false,
position: 4,
options: {
Expand All @@ -560,7 +560,7 @@ define([
canFloat: true,
path: 'gis/dijit/Measurement',
title: i18n.viewer.widgets.measure,
iconClass: 'fa-expand',
iconClass: 'fas fa-fw fa-expand',
open: false,
position: 5,
options: {
Expand All @@ -577,7 +577,7 @@ define([
canFloat: true,
path: 'gis/dijit/Print',
title: i18n.viewer.widgets.print,
iconClass: 'fa-print',
iconClass: 'fas fa-fw fa-print',
open: false,
position: 6,
options: {
Expand All @@ -596,7 +596,7 @@ define([
type: 'titlePane',
path: 'gis/dijit/Directions',
title: i18n.viewer.widgets.directions,
iconClass: 'fa-map-signs',
iconClass: 'fas fa-fw fa-map-signs',
open: false,
position: 7,
options: {
Expand All @@ -618,7 +618,7 @@ define([
type: 'titlePane',
path: 'gis/dijit/Editor',
title: i18n.viewer.widgets.editor,
iconClass: 'fa-pencil',
iconClass: 'fas fa-fw fa-pencil-alt',
open: false,
position: 8,
options: {
Expand Down Expand Up @@ -648,7 +648,7 @@ define([
position: 9,
path: 'gis/dijit/StreetView',
title: i18n.viewer.widgets.streetview,
iconClass: 'fa-street-view',
iconClass: 'fas fa-fw fa-street-view',
paneOptions: {
resizable: true,
resizeOptions: {
Expand All @@ -672,7 +672,7 @@ define([
srcNodeRef: 'geocodeDijit',
path: 'gis/dijit/Locale',
title: i18n.viewer.widgets.locale,
iconClass: 'fa-flag',
iconClass: 'fas fa-fw fa-flag',
options: {
style: has('phone') ? null : 'margin-left: 30px;'
}
Expand All @@ -683,10 +683,10 @@ define([
type: 'floating',
path: 'gis/dijit/Help',
title: i18n.viewer.widgets.help,
iconClass: 'fa-info-circle',
iconClass: 'fas fa-fw fa-info-circle',
paneOptions: {
draggable: false,
html: '<a href="#"><i class="fa fa-fw fa-info-circle"></i>link</a>'.replace('link', i18n.viewer.widgets.help),
html: '<a href="#"><i class="fas fa-fw fa-info-circle"></i>link</a>'.replace('link', i18n.viewer.widgets.help),
domTarget: 'helpDijit',
style: 'height:345px;width:450px;'
},
Expand Down
3 changes: 2 additions & 1 deletion viewer/js/gis/dijit/BasemapGallery/css/BasemapGallery.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@

.cmvBasemapGalleryWidget .dijitTitlePaneTextNode:before {
content: '\f009';
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-weight: 900;
}

.cmvBasemapGalleryWidget .dijitTitlePaneContentOuter {
Expand Down
10 changes: 6 additions & 4 deletions viewer/js/gis/dijit/Basemaps/css/Basemaps.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
.basemapWidget-menu .selectedIcon:before,
.basemapWidget-menu .emptyIcon:before,
.basemapWidget .basemapsIcon:before {
font-family: FontAwesome;
font-family: 'Font Awesome\ 5 Free';
}

.basemapWidget-menu .selectedIcon:before {
content: "\f046";
content: "\f14a";
font-weight: 400;
}

.basemapWidget-menu .emptyIcon:before {
content: "\f096";
content: "\f0c8";
font-weight: 400;
}

.basemapWidget .basemapsIcon:before {
content: "\f009";
font-weight: 900;
}


/* condense dropdown on small screens */

@media (max-width: 768px) {
Expand Down
16 changes: 8 additions & 8 deletions viewer/js/gis/dijit/Draw/templates/Draw.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,47 @@
<li>
<ul class="list-inline list-unstyled">
<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-point fa fa-fw',showLabel:false"
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-point fas fa-fw',showLabel:false"
data-dojo-attach-event="onClick:drawPoint"
class="drawButton"
title="${i18n.labels.point}">
${i18n.labels.point}
</button>
</li>
<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-circle fa fa-fw',showLabel:false,drawType:'CIRCLE'"
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-circle fas fa-fw',showLabel:false,drawType:'CIRCLE'"
data-dojo-attach-event="onClick:drawCircle"
class="drawButton"
title="${i18n.labels.circle}">
${i18n.labels.circle}
</button>
</li>
<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-polyline fa fa-fw',showLabel:false"
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-polyline fas fa-fw',showLabel:false"
data-dojo-attach-event="onClick:drawLine"
class="drawButton"
title="${i18n.labels.polyline}">
${i18n.labels.polyline}
</button>
</li>
<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-freehand-polyline fa fa-fw',showLabel:false"
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-freehand-polyline fas fa-fw',showLabel:false"
data-dojo-attach-event="onClick:drawFreehandLine"
class="drawButton"
title="${i18n.labels.freehandPolyline}">
${i18n.labels.freehandPolyline}
</button>
</li>
<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-polygon fa fa-fw',showLabel:false"
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-polygon fas fa-fw',showLabel:false"
data-dojo-attach-event="onClick:drawPolygon"
class="drawButton"
title="${i18n.labels.polygon}">
${i18n.labels.polygon}
</button>
</li>
<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-freehand-polygon fa fa-fw',showLabel:false"
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-freehand-polygon fas fa-fw',showLabel:false"
data-dojo-attach-event="onClick:drawFreehandPolygon"
class="drawButton"
title="${i18n.labels.freehandPolygon}">
Expand All @@ -54,7 +54,7 @@
<li>
<button data-dojo-type="dijit/form/Button"
data-dojo-attach-point="stopDrawingButton"
data-dojo-props="iconClass:'fa fa-stop fa-fw',showLabel:false,disabled:true"
data-dojo-props="iconClass:'fas fa-stop fa-fw',showLabel:false,disabled:true"
data-dojo-attach-event="onClick:stopDrawing"
class="drawButton"
title="${i18n.labels.stopDrawing}">
Expand All @@ -64,7 +64,7 @@
<li>
<button data-dojo-type="dijit/form/Button"
data-dojo-attach-point="eraseDrawingButton"
data-dojo-props="iconClass:'fa fa-history fa-fw',showLabel:false,disabled:true"
data-dojo-props="iconClass:'fas fa-undo fa-fw',showLabel:false,disabled:true"
data-dojo-attach-event="onClick:clearGraphics"
class="drawButton"
title="${i18n.labels.clearDrawing}">
Expand Down
Loading