Skip to content

Commit 557d48b

Browse files
FloatingActionButton - Use generic theme / built-in icons (DevExpress#8033) (DevExpress#8037)
1 parent 1a5a805 commit 557d48b

File tree

5 files changed

+18
-42
lines changed

5 files changed

+18
-42
lines changed

applications/GettingStartedWith/FloatingActionButton/HandleScreenTransitions/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<div id="action-edit"></div>
44
<div id="action-mail"></div>
55
<div id="action-copy"></div>
6-
<div id="action-facebook"></div>
6+
<div id="action-social"></div>
77
</div>

applications/GettingStartedWith/FloatingActionButton/HandleScreenTransitions/index.js

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
$("<link>", {
2-
rel: "stylesheet",
3-
href: "https://unpkg.com/[email protected]/dist/css/ionicons.min.css"
4-
}).appendTo("head");
5-
61
$(function() {
7-
const isDarkTheme = document.cookie.includes("theme=dark");
8-
DevExpress.ui.themes.current(isDarkTheme ? "material.blue.dark" : "material.blue.light")
9-
102
DevExpress.config({
113
floatingActionButtonConfig: {
12-
icon: "icon ion-md-share",
4+
icon: "share",
135
position: {
146
my: "right bottom",
157
at: "right bottom",
@@ -21,15 +13,15 @@ $(function() {
2113

2214
var editAction = $("#action-edit").dxSpeedDialAction({
2315
hint: "Edit",
24-
icon: "icon ion-md-create",
16+
icon: "edit",
2517
onClick: function() {
2618
showNotification("Edit is clicked")
2719
}
2820
}).dxSpeedDialAction("instance");
2921

3022
var copyAction = $("#action-copy").dxSpeedDialAction({
3123
hint: "Copy to clipboard",
32-
icon: "icon ion-md-copy",
24+
icon: "copy",
3325
visible: false,
3426
onClick: function() {
3527
showNotification("Copied to clipboard")
@@ -38,19 +30,19 @@ $(function() {
3830

3931
var mailAction = $("#action-mail").dxSpeedDialAction({
4032
hint: "Send by email",
41-
icon: "icon ion-md-mail",
33+
icon: "email",
4234
visible: false,
4335
onClick: function() {
4436
showNotification("Sent by email")
4537
}
4638
}).dxSpeedDialAction("instance");
4739

48-
var facebookAction = $("#action-facebook").dxSpeedDialAction({
49-
hint: "Share on Facebook",
50-
icon: "icon ion-logo-facebook",
40+
var facebookAction = $("#action-social").dxSpeedDialAction({
41+
hint: "Share on Social Media",
42+
icon: "link",
5143
visible: false,
5244
onClick: function() {
53-
showNotification("Shared on Facebook")
45+
showNotification("Shared on Social Media")
5446
}
5547
}).dxSpeedDialAction("instance");
5648

applications/GettingStartedWith/FloatingActionButton/MultipleActions/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<p>View's content</p>
33
<div id="action-mail"></div>
44
<div id="action-copy"></div>
5-
<div id="action-facebook"></div>
5+
<div id="action-social"></div>
66
</div>

applications/GettingStartedWith/FloatingActionButton/MultipleActions/index.js

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
$("<link>", {
2-
rel: "stylesheet",
3-
href: "https://unpkg.com/[email protected]/dist/css/ionicons.min.css"
4-
}).appendTo("head");
5-
61
$(function() {
7-
const isDarkTheme = document.cookie.includes("theme=dark");
8-
DevExpress.ui.themes.current(isDarkTheme ? "material.blue.dark" : "material.blue.light")
9-
102
DevExpress.config({
113
floatingActionButtonConfig: {
12-
icon: "icon ion-md-share",
4+
icon: "share",
135
position: {
146
my: "right bottom",
157
at: "right bottom",
@@ -21,25 +13,25 @@ $(function() {
2113

2214
$("#action-copy").dxSpeedDialAction({
2315
hint: "Copy to clipboard",
24-
icon: "icon ion-md-copy",
16+
icon: "copy",
2517
onClick: function() {
2618
showNotification("Copied to clipboard");
2719
}
2820
});
2921

3022
$("#action-mail").dxSpeedDialAction({
3123
hint: "Send by email",
32-
icon: "icon ion-md-mail",
24+
icon: "email",
3325
onClick: function() {
3426
showNotification("Sent by email");
3527
}
3628
});
3729

38-
$("#action-facebook").dxSpeedDialAction({
39-
hint: "Share on Facebook",
40-
icon: "icon ion-logo-facebook",
30+
$("#action-social").dxSpeedDialAction({
31+
hint: "Share on Social Media",
32+
icon: "link",
4133
onClick: function() {
42-
showNotification("Shared on Facebook");
34+
showNotification("Shared on Social Media");
4335
}
4436
});
4537

applications/GettingStartedWith/FloatingActionButton/SingleAction/index.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
$("<link>", {
2-
rel: "stylesheet",
3-
href: "https://unpkg.com/[email protected]/dist/css/ionicons.min.css"
4-
}).appendTo("head");
5-
61
$(function() {
7-
const isDarkTheme = document.cookie.includes("theme=dark");
8-
DevExpress.ui.themes.current(isDarkTheme ? "material.blue.dark" : "material.blue.light")
9-
102
DevExpress.config({
113
floatingActionButtonConfig: {
124
position: {
@@ -20,7 +12,7 @@ $(function() {
2012

2113
$("#action-edit").dxSpeedDialAction({
2214
hint: "Edit",
23-
icon: "icon ion-md-create",
15+
icon: "edit",
2416
onClick: function() {
2517
showNotification("Edit is clicked")
2618
}

0 commit comments

Comments
 (0)